From 22edf232693cf3540ee902af96a10e3b02f932a1 Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Mon, 2 Dec 2024 17:24:18 +1000
Subject: [PATCH] GPU: Fix parameter logging of some commands

---
 src/core/gpu.cpp          | 19 +++++++++----------
 src/core/gpu_commands.cpp |  4 ++--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/core/gpu.cpp b/src/core/gpu.cpp
index 1108d9599..6b0e03c14 100644
--- a/src/core/gpu.cpp
+++ b/src/core/gpu.cpp
@@ -1585,32 +1585,31 @@ void GPU::HandleGetGPUInfoCommand(u32 value)
 
     case 0x02: // Get Texture Window
     {
-      DEBUG_LOG("Get texture window");
       m_GPUREAD_latch = m_draw_mode.texture_window_value;
+      DEBUG_LOG("Get texture window => 0x{:08X}", m_GPUREAD_latch);
     }
     break;
 
     case 0x03: // Get Draw Area Top Left
     {
-      DEBUG_LOG("Get drawing area top left");
-      m_GPUREAD_latch =
-        ((m_drawing_area.left & UINT32_C(0b1111111111)) | ((m_drawing_area.top & UINT32_C(0b1111111111)) << 10));
+      m_GPUREAD_latch = (m_drawing_area.left | (m_drawing_area.top << 10));
+      DEBUG_LOG("Get drawing area top left: ({}, {}) => 0x{:08X}", m_drawing_area.left, m_drawing_area.top,
+                m_GPUREAD_latch);
     }
     break;
 
     case 0x04: // Get Draw Area Bottom Right
     {
-      DEBUG_LOG("Get drawing area bottom right");
-      m_GPUREAD_latch =
-        ((m_drawing_area.right & UINT32_C(0b1111111111)) | ((m_drawing_area.bottom & UINT32_C(0b1111111111)) << 10));
+      m_GPUREAD_latch = (m_drawing_area.right | (m_drawing_area.bottom << 10));
+      DEBUG_LOG("Get drawing area bottom right: ({}, {}) => 0x{:08X}", m_drawing_area.bottom, m_drawing_area.right,
+                m_GPUREAD_latch);
     }
     break;
 
     case 0x05: // Get Drawing Offset
     {
-      DEBUG_LOG("Get drawing offset");
-      m_GPUREAD_latch =
-        ((m_drawing_offset.x & INT32_C(0b11111111111)) | ((m_drawing_offset.y & INT32_C(0b11111111111)) << 11));
+      m_GPUREAD_latch = (m_drawing_offset.x & 0x7FF) | ((m_drawing_offset.y & 0x7FF) << 11);
+      DEBUG_LOG("Get drawing offset: ({}, {}) => 0x{:08X}", m_drawing_offset.x, m_drawing_offset.y, m_GPUREAD_latch);
     }
     break;
 
diff --git a/src/core/gpu_commands.cpp b/src/core/gpu_commands.cpp
index 73c4a9d21..890cfa632 100644
--- a/src/core/gpu_commands.cpp
+++ b/src/core/gpu_commands.cpp
@@ -267,7 +267,7 @@ bool GPU::HandleSetDrawingAreaBottomRightCommand()
 
   const u32 right = param & DRAWING_AREA_COORD_MASK;
   const u32 bottom = (param >> 10) & DRAWING_AREA_COORD_MASK;
-  DEBUG_LOG("Set drawing area bottom-right: ({}, {})", m_drawing_area.right, m_drawing_area.bottom);
+  DEBUG_LOG("Set drawing area bottom-right: ({}, {})", right, bottom);
   if (m_drawing_area.right != right || m_drawing_area.bottom != bottom)
   {
     FlushRender();
@@ -288,7 +288,7 @@ bool GPU::HandleSetDrawingOffsetCommand()
   const u32 param = FifoPop() & 0x00FFFFFFu;
   const s32 x = SignExtendN<11, s32>(param & 0x7FFu);
   const s32 y = SignExtendN<11, s32>((param >> 11) & 0x7FFu);
-  DEBUG_LOG("Set drawing offset ({}, {})", m_drawing_offset.x, m_drawing_offset.y);
+  DEBUG_LOG("Set drawing offset ({}, {})", x, y);
   if (m_drawing_offset.x != x || m_drawing_offset.y != y)
   {
     FlushRender();