summaryrefslogtreecommitdiffstats
path: root/src/core/hw
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2014-09-14 04:55:41 +0200
committerLioncash <mathew1800@gmail.com>2014-09-14 04:55:41 +0200
commit6cc7c73b8088d415c2eeae4ecacb7659cd2fd430 (patch)
tree6ec44474be0d41b8dbf37ef91e1ad2f13c679ec2 /src/core/hw
parentMerge pull request #105 from kevinhartman/hid (diff)
downloadyuzu-6cc7c73b8088d415c2eeae4ecacb7659cd2fd430.tar
yuzu-6cc7c73b8088d415c2eeae4ecacb7659cd2fd430.tar.gz
yuzu-6cc7c73b8088d415c2eeae4ecacb7659cd2fd430.tar.bz2
yuzu-6cc7c73b8088d415c2eeae4ecacb7659cd2fd430.tar.lz
yuzu-6cc7c73b8088d415c2eeae4ecacb7659cd2fd430.tar.xz
yuzu-6cc7c73b8088d415c2eeae4ecacb7659cd2fd430.tar.zst
yuzu-6cc7c73b8088d415c2eeae4ecacb7659cd2fd430.zip
Diffstat (limited to 'src/core/hw')
-rw-r--r--src/core/hw/gpu.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp
index 2e0943776..7afb00d6c 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) {
return;
}
- g_regs[index] = data;
+ g_regs[index] = static_cast<u32>(data);
switch (index) {
@@ -81,9 +81,9 @@ inline void Write(u32 addr, const T data) {
u8* source_pointer = Memory::GetPointer(Memory::PhysicalToVirtualAddress(config.GetPhysicalInputAddress()));
u8* dest_pointer = Memory::GetPointer(Memory::PhysicalToVirtualAddress(config.GetPhysicalOutputAddress()));
- for (int y = 0; y < config.output_height; ++y) {
+ for (u32 y = 0; y < config.output_height; ++y) {
// TODO: Why does the register seem to hold twice the framebuffer width?
- for (int x = 0; x < config.output_width; ++x) {
+ for (u32 x = 0; x < config.output_width; ++x) {
struct {
int r, g, b, a;
} source_color = { 0, 0, 0, 0 };
@@ -134,10 +134,10 @@ inline void Write(u32 addr, const T data) {
}
}
- DEBUG_LOG(GPU, "DisplayTriggerTransfer: 0x%08x bytes from 0x%08x(%dx%d)-> 0x%08x(%dx%d), dst format %x",
+ 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(), (int)config.input_width, (int)config.input_height,
- config.GetPhysicalOutputAddress(), (int)config.output_width, (int)config.output_height,
+ config.GetPhysicalInputAddress(), config.input_width, config.input_height,
+ config.GetPhysicalOutputAddress(), config.output_width, config.output_height,
config.output_format.Value());
}
break;