diff options
| author |  bunnei | 2014-10-08 23:06:28 -0400 |
|---|---|---|
| committer | bunnei | 2014-10-08 23:06:28 -0400 |
| commit | 8fb064cd62d3091b88bb2660a0264997f5cb163d (patch) | |
| tree | a7f2983c43d910b15fe42396e074f5b26cab5ff8 /src/core/hw/gpu.cpp | |
| parent | Merge pull request #128 from purpasmart96/master (diff) | |
| parent | Fix warnings in video_core (diff) | |
| download | yuzu-8fb064cd62d3091b88bb2660a0264997f5cb163d.tar.gz yuzu-8fb064cd62d3091b88bb2660a0264997f5cb163d.tar.xz yuzu-8fb064cd62d3091b88bb2660a0264997f5cb163d.zip | |
Merge pull request #119 from lioncash/warn
Fix warnings in video_core
Diffstat (limited to 'src/core/hw/gpu.cpp')
| -rw-r--r-- | src/core/hw/gpu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp index 7afb00d6c..9c7192313 100644 --- a/src/core/hw/gpu.cpp +++ b/src/core/hw/gpu.cpp | |||
| @@ -27,7 +27,7 @@ u64 g_last_frame_ticks = 0; ///< CPU tick count from last frame | |||
| 27 | template <typename T> | 27 | template <typename T> |
| 28 | inline void Read(T &var, const u32 raw_addr) { | 28 | inline void Read(T &var, const u32 raw_addr) { |
| 29 | u32 addr = raw_addr - 0x1EF00000; | 29 | u32 addr = raw_addr - 0x1EF00000; |
| 30 | int index = addr / 4; | 30 | u32 index = addr / 4; |
| 31 | 31 | ||
| 32 | // Reads other than u32 are untested, so I'd rather have them abort than silently fail | 32 | // Reads other than u32 are untested, so I'd rather have them abort than silently fail |
| 33 | if (index >= Regs::NumIds() || !std::is_same<T,u32>::value) { | 33 | if (index >= Regs::NumIds() || !std::is_same<T,u32>::value) { |
| @@ -41,7 +41,7 @@ inline void Read(T &var, const u32 raw_addr) { | |||
| 41 | template <typename T> | 41 | template <typename T> |
| 42 | inline void Write(u32 addr, const T data) { | 42 | inline void Write(u32 addr, const T data) { |
| 43 | addr -= 0x1EF00000; | 43 | addr -= 0x1EF00000; |
| 44 | int index = addr / 4; | 44 | u32 index = addr / 4; |
| 45 | 45 | ||
| 46 | // Writes other than u32 are untested, so I'd rather have them abort than silently fail | 46 | // Writes other than u32 are untested, so I'd rather have them abort than silently fail |
| 47 | if (index >= Regs::NumIds() || !std::is_same<T,u32>::value) { | 47 | if (index >= Regs::NumIds() || !std::is_same<T,u32>::value) { |