diff options
| author |  bunnei | 2014-06-14 12:13:16 -0400 |
|---|---|---|
| committer | bunnei | 2014-06-14 12:13:16 -0400 |
| commit | 004df767953a949817da89bddcd5d1379240f769 (patch) | |
| tree | b2d54928dcbf3cb4dde0cd5d3277afe7999b7bd9 /src/core/hw/gpu.h | |
| parent | GPU debugger: Const correctness and build fix. (diff) | |
| parent | Kernel: Removed unnecessary "#pragma once". (diff) | |
| download | yuzu-004df767953a949817da89bddcd5d1379240f769.tar.gz yuzu-004df767953a949817da89bddcd5d1379240f769.tar.xz yuzu-004df767953a949817da89bddcd5d1379240f769.zip | |
Merge branch 'threading' of https://github.com/bunnei/citra
Conflicts:
src/core/hle/function_wrappers.h
src/core/hle/service/gsp.cpp
Diffstat (limited to 'src/core/hw/gpu.h')
| -rw-r--r-- | src/core/hw/gpu.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/hw/gpu.h b/src/core/hw/gpu.h index f26f25e98..3314ba989 100644 --- a/src/core/hw/gpu.h +++ b/src/core/hw/gpu.h | |||
| @@ -8,6 +8,9 @@ | |||
| 8 | 8 | ||
| 9 | namespace GPU { | 9 | namespace GPU { |
| 10 | 10 | ||
| 11 | static const u32 kFrameCycles = 268123480 / 60; ///< 268MHz / 60 frames per second | ||
| 12 | static const u32 kFrameTicks = kFrameCycles / 3; ///< Approximate number of instructions/frame | ||
| 13 | |||
| 11 | struct Registers { | 14 | struct Registers { |
| 12 | enum Id : u32 { | 15 | enum Id : u32 { |
| 13 | FramebufferTopLeft1 = 0x1EF00468, // Main LCD, first framebuffer for 3D left | 16 | FramebufferTopLeft1 = 0x1EF00468, // Main LCD, first framebuffer for 3D left |