diff options
author | bunnei <bunneidev@gmail.com> | 2014-11-29 05:08:18 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2014-11-29 05:08:18 +0100 |
commit | 83c3d37cd01e6f8f63b5bc27ba5754fa6ed70360 (patch) | |
tree | eb02a8d87c8b4ee109e23efa4f9e1ab92cfdb13c /src/core/hw | |
parent | Merge pull request #223 from linkmauve/remove-thread (diff) | |
parent | Fixed formatting and switch statement warnings (diff) | |
download | yuzu-83c3d37cd01e6f8f63b5bc27ba5754fa6ed70360.tar yuzu-83c3d37cd01e6f8f63b5bc27ba5754fa6ed70360.tar.gz yuzu-83c3d37cd01e6f8f63b5bc27ba5754fa6ed70360.tar.bz2 yuzu-83c3d37cd01e6f8f63b5bc27ba5754fa6ed70360.tar.lz yuzu-83c3d37cd01e6f8f63b5bc27ba5754fa6ed70360.tar.xz yuzu-83c3d37cd01e6f8f63b5bc27ba5754fa6ed70360.tar.zst yuzu-83c3d37cd01e6f8f63b5bc27ba5754fa6ed70360.zip |
Diffstat (limited to 'src/core/hw')
-rw-r--r-- | src/core/hw/gpu.cpp | 6 | ||||
-rw-r--r-- | src/core/hw/hw.cpp | 2 | ||||
-rw-r--r-- | src/core/hw/ndma.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp index 3ad801c63..af5e1b39b 100644 --- a/src/core/hw/gpu.cpp +++ b/src/core/hw/gpu.cpp @@ -49,7 +49,7 @@ inline void Write(u32 addr, const T data) { // Writes other than u32 are untested, so I'd rather have them abort than silently fail if (index >= Regs::NumIds() || !std::is_same<T,u32>::value) { - ERROR_LOG(GPU, "unknown Write%lu 0x%08X @ 0x%08X", sizeof(data) * 8, data, addr); + ERROR_LOG(GPU, "unknown Write%lu 0x%08X @ 0x%08X", sizeof(data) * 8, (u32)data, addr); return; } @@ -140,8 +140,8 @@ inline void Write(u32 addr, const T data) { DEBUG_LOG(GPU, "DisplayTriggerTransfer: 0x%08x bytes from 0x%08x(%ux%u)-> 0x%08x(%ux%u), dst format %x", config.output_height * config.output_width * 4, - config.GetPhysicalInputAddress(), config.input_width, config.input_height, - config.GetPhysicalOutputAddress(), config.output_width, config.output_height, + config.GetPhysicalInputAddress(), (u32)config.input_width, (u32)config.input_height, + config.GetPhysicalOutputAddress(), (u32)config.output_width, (u32)config.output_height, config.output_format.Value()); } break; diff --git a/src/core/hw/hw.cpp b/src/core/hw/hw.cpp index 4d0719263..ea001673a 100644 --- a/src/core/hw/hw.cpp +++ b/src/core/hw/hw.cpp @@ -68,7 +68,7 @@ inline void Write(u32 addr, const T data) { break; default: - ERROR_LOG(HW, "unknown Write%lu 0x%08X @ 0x%08X", sizeof(data) * 8, data, addr); + ERROR_LOG(HW, "unknown Write%lu 0x%08X @ 0x%08X", sizeof(data) * 8, (u32)data, addr); } } diff --git a/src/core/hw/ndma.cpp b/src/core/hw/ndma.cpp index e29a773f1..593e5de30 100644 --- a/src/core/hw/ndma.cpp +++ b/src/core/hw/ndma.cpp @@ -15,7 +15,7 @@ inline void Read(T &var, const u32 addr) { template <typename T> inline void Write(u32 addr, const T data) { - ERROR_LOG(NDMA, "unknown Write%lu 0x%08X @ 0x%08X", sizeof(data) * 8, data, addr); + ERROR_LOG(NDMA, "unknown Write%lu 0x%08X @ 0x%08X", sizeof(data) * 8, (u32)data, addr); } // Explicitly instantiate template functions because we aren't defining this in the header: |