diff options
| author |  James Rowe | 2017-08-22 08:09:09 -0600 |
|---|---|---|
| committer |  GitHub | 2017-08-22 08:09:09 -0600 |
| commit | a8675f42875d7ad41ef64b89ec478834042355dd (patch) | |
| tree | 8e2c67c072ad8d874d1b5685a8d084719acb90af /src/core/hw/gpu.cpp | |
| parent | Merge pull request #2894 from wwylele/motion-emu-fix (diff) | |
| parent | GPU/Warnings: Explicitly cast the screen refresh ticks to u64. (diff) | |
| download | yuzu-a8675f42875d7ad41ef64b89ec478834042355dd.tar.gz yuzu-a8675f42875d7ad41ef64b89ec478834042355dd.tar.xz yuzu-a8675f42875d7ad41ef64b89ec478834042355dd.zip | |
Merge pull request #2888 from Subv/warnings
Fixed some warnings in the core project.
Diffstat (limited to 'src/core/hw/gpu.cpp')
| -rw-r--r-- | src/core/hw/gpu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp index 6838e449c..83ad9d898 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 | ||