diff options
Diffstat (limited to 'src/core/hw')
| -rw-r--r-- | src/core/hw/gpu.cpp | 20 | ||||
| -rw-r--r-- | src/core/hw/gpu.h | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp index 6838e449c..d1bfe51e6 100644 --- a/src/core/hw/gpu.cpp +++ b/src/core/hw/gpu.cpp | |||
| @@ -29,7 +29,7 @@ namespace GPU { | |||
| 29 | Regs g_regs; | 29 | Regs g_regs; |
| 30 | 30 | ||
| 31 | /// 268MHz CPU clocks / 60Hz frames per second | 31 | /// 268MHz CPU clocks / 60Hz frames per second |
| 32 | const u64 frame_ticks = BASE_CLOCK_RATE_ARM11 / SCREEN_REFRESH_RATE; | 32 | const u64 frame_ticks = static_cast<u64>(BASE_CLOCK_RATE_ARM11 / SCREEN_REFRESH_RATE); |
| 33 | /// Event id for CoreTiming | 33 | /// Event id for CoreTiming |
| 34 | static int vblank_event; | 34 | static int vblank_event; |
| 35 | 35 | ||
| @@ -515,15 +515,15 @@ template void Write<u8>(u32 addr, const u8 data); | |||
| 515 | 515 | ||
| 516 | /// Update hardware | 516 | /// Update hardware |
| 517 | static void VBlankCallback(u64 userdata, int cycles_late) { | 517 | static void VBlankCallback(u64 userdata, int cycles_late) { |
| 518 | VideoCore::g_renderer->SwapBuffers(); | 518 | //VideoCore::g_renderer->SwapBuffers(); |
| 519 | 519 | ||
| 520 | // Signal to GSP that GPU interrupt has occurred | 520 | //// Signal to GSP that GPU interrupt has occurred |
| 521 | // TODO(yuriks): hwtest to determine if PDC0 is for the Top screen and PDC1 for the Sub | 521 | //// TODO(yuriks): hwtest to determine if PDC0 is for the Top screen and PDC1 for the Sub |
| 522 | // screen, or if both use the same interrupts and these two instead determine the | 522 | //// screen, or if both use the same interrupts and these two instead determine the |
| 523 | // beginning and end of the VBlank period. If needed, split the interrupt firing into | 523 | //// beginning and end of the VBlank period. If needed, split the interrupt firing into |
| 524 | // two different intervals. | 524 | //// two different intervals. |
| 525 | Service::GSP::SignalInterrupt(Service::GSP::InterruptId::PDC0); | 525 | //Service::GSP::SignalInterrupt(Service::GSP::InterruptId::PDC0); |
| 526 | Service::GSP::SignalInterrupt(Service::GSP::InterruptId::PDC1); | 526 | //Service::GSP::SignalInterrupt(Service::GSP::InterruptId::PDC1); |
| 527 | 527 | ||
| 528 | // Reschedule recurrent event | 528 | // Reschedule recurrent event |
| 529 | CoreTiming::ScheduleEvent(frame_ticks - cycles_late, vblank_event); | 529 | CoreTiming::ScheduleEvent(frame_ticks - cycles_late, vblank_event); |
diff --git a/src/core/hw/gpu.h b/src/core/hw/gpu.h index 21b127fee..e3d0a0e08 100644 --- a/src/core/hw/gpu.h +++ b/src/core/hw/gpu.h | |||
| @@ -74,9 +74,9 @@ struct Regs { | |||
| 74 | case PixelFormat::RGB5A1: | 74 | case PixelFormat::RGB5A1: |
| 75 | case PixelFormat::RGBA4: | 75 | case PixelFormat::RGBA4: |
| 76 | return 2; | 76 | return 2; |
| 77 | default: | ||
| 78 | UNIMPLEMENTED(); | ||
| 79 | } | 77 | } |
| 78 | |||
| 79 | UNREACHABLE(); | ||
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | INSERT_PADDING_WORDS(0x4); | 82 | INSERT_PADDING_WORDS(0x4); |