From 5eb24a51cfa57ad4bbdc6b9ccc77af4a4f2b289e Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Thu, 5 Jan 2012 17:49:46 +0100 Subject: FifoPlayer: Add a description label for the currently selected object command. Requires adding such descriptions for all BP/CP/XF registers. For now, I added descriptions for EFB copy related BP registers. --- Source/Core/VideoCommon/Src/BPMemory.cpp | 110 +++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) (limited to 'Source/Core/VideoCommon/Src/BPMemory.cpp') diff --git a/Source/Core/VideoCommon/Src/BPMemory.cpp b/Source/Core/VideoCommon/Src/BPMemory.cpp index da09893f35..95e801a433 100644 --- a/Source/Core/VideoCommon/Src/BPMemory.cpp +++ b/Source/Core/VideoCommon/Src/BPMemory.cpp @@ -66,3 +66,113 @@ void BPReload() } } } + + +void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size_t desc_size) +{ + const char* yes_no[2] = { "Yes", "No" }; + + u32 cmddata = Common::swap32(*(u32*)data) & 0xFFFFFF; + switch (data[0]) + { + // Macro to set the register name and make sure it was written correctly via compile time assertion + #define SetRegName(reg) \ + snprintf(name, name_size, #reg); \ + (void)(reg); + + case BPMEM_DISPLAYCOPYFILER: // 0x01 + // TODO: This is actually the sample pattern used for copies from an antialiased EFB + SetRegName(BPMEM_DISPLAYCOPYFILER); + // TODO: Description + break; + + case 0x02: // 0x02 + case 0x03: // 0x03 + case 0x04: // 0x04 + // TODO: same as BPMEM_DISPLAYCOPYFILER + break; + + case BPMEM_EFB_TL: // 0x49 + { + SetRegName(BPMEM_EFB_TL); + X10Y10 left_top; left_top.hex = cmddata; + snprintf(desc, desc_size, "Left: %d\nTop: %d", left_top.x, left_top.y); + } + break; + + case BPMEM_EFB_BR: // 0x4A + { + // TODO: Misleading name, should be BPMEM_EFB_WH instead + SetRegName(BPMEM_EFB_BR); + X10Y10 width_height; width_height.hex = cmddata; + snprintf(desc, desc_size, "Width: %d\nHeight: %d", width_height.x+1, width_height.y+1); + } + break; + + case BPMEM_EFB_ADDR: // 0x4B + SetRegName(BPMEM_EFB_ADDR); + snprintf(desc, desc_size, "Target address (32 byte aligned): %06x", cmddata << 5); + break; + + case BPMEM_COPYYSCALE: // 0x4E + SetRegName(BPMEM_COPYYSCALE); + snprintf(desc, desc_size, "Scaling factor (XFB copy only): 0x%X (%f or inverted %f)", cmddata, (float)cmddata/256.f, 256.f/(float)cmddata); + break; + + case BPMEM_CLEAR_AR: // 0x4F + SetRegName(BPMEM_CLEAR_AR); + snprintf(desc, desc_size, "Alpha: %02X\nRed: %02x", (cmddata&0xFF00)>>8, cmddata&0xFF); + break; + + case BPMEM_CLEAR_GB: // 0x50 + SetRegName(BPMEM_CLEAR_GB); + snprintf(desc, desc_size, "Green: %02X\nBlue: %02x", (cmddata&0xFF00)>>8, cmddata&0xFF); + break; + + case BPMEM_CLEAR_Z: // 0x51 + SetRegName(BPMEM_CLEAR_Z); + snprintf(desc, desc_size, "Z value: %06X", cmddata); + break; + + case BPMEM_TRIGGER_EFB_COPY: // 0x52 + { + SetRegName(BPMEM_TRIGGER_EFB_COPY); + UPE_Copy copy; copy.Hex = cmddata; + snprintf(desc, desc_size, "Clamping: %s\n" + "Converting from RGB to YUV: %s\n" + "Target pixel format: 0x%X\n" + "Gamma correction: %s\n" + "Mipmap filter: %s\n" + "Vertical scaling: %s\n" + "Clear: %s\n" + "Frame to field: 0x%01X\n" + "Copy to XFB: %s\n" + "Intensity format: %s\n" + "Automatic color conversion: %s\n", + (copy.clamp0 && copy.clamp1) ? "Top and Bottom" : (copy.clamp0) ? "Top only" : (copy.clamp1) ? "Bottom only" : "None", + yes_no[copy.yuv], + copy.tp_realFormat(), + (copy.gamma==0)?"1.0":(copy.gamma==1)?"1.7":(copy.gamma==2)?"2.2":"Invalid value 0x3?", + yes_no[copy.half_scale], + yes_no[copy.scale_invert], + yes_no[copy.clear], + copy.frame_to_field, + yes_no[copy.copy_to_xfb], + yes_no[copy.intensity_fmt], + yes_no[copy.auto_conv]); + } + break; + + case BPMEM_COPYFILTER0: // 0x53 + SetRegName(BPMEM_COPYFILTER0); + // TODO: Description + break; + + case BPMEM_COPYFILTER1: // 0x54 + SetRegName(BPMEM_COPYFILTER1); + // TODO: Description + break; + +#undef SET_REG_NAME + } +} -- cgit v1.2.3 From ecb616f7fff1a3e01452367af9204f0a547d24cd Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 7 Jan 2012 17:38:00 +0100 Subject: FifoPlayer: Make sure that we actually display "Yes" if some variable is true... FifoPlayer: More consistency of output (display "0x" in front of hex numbers, write hex numbers in capital letters) --- Source/Core/VideoCommon/Src/BPMemory.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'Source/Core/VideoCommon/Src/BPMemory.cpp') diff --git a/Source/Core/VideoCommon/Src/BPMemory.cpp b/Source/Core/VideoCommon/Src/BPMemory.cpp index 95e801a433..3f21e1acb0 100644 --- a/Source/Core/VideoCommon/Src/BPMemory.cpp +++ b/Source/Core/VideoCommon/Src/BPMemory.cpp @@ -70,7 +70,7 @@ void BPReload() void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size_t desc_size) { - const char* yes_no[2] = { "Yes", "No" }; + const char* no_yes[2] = { "No", "Yes" }; u32 cmddata = Common::swap32(*(u32*)data) & 0xFFFFFF; switch (data[0]) @@ -111,7 +111,7 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size case BPMEM_EFB_ADDR: // 0x4B SetRegName(BPMEM_EFB_ADDR); - snprintf(desc, desc_size, "Target address (32 byte aligned): %06x", cmddata << 5); + snprintf(desc, desc_size, "Target address (32 byte aligned): 0x%06X", cmddata << 5); break; case BPMEM_COPYYSCALE: // 0x4E @@ -121,17 +121,17 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size case BPMEM_CLEAR_AR: // 0x4F SetRegName(BPMEM_CLEAR_AR); - snprintf(desc, desc_size, "Alpha: %02X\nRed: %02x", (cmddata&0xFF00)>>8, cmddata&0xFF); + snprintf(desc, desc_size, "Alpha: 0x%02X\nRed: 0x%02X", (cmddata&0xFF00)>>8, cmddata&0xFF); break; case BPMEM_CLEAR_GB: // 0x50 SetRegName(BPMEM_CLEAR_GB); - snprintf(desc, desc_size, "Green: %02X\nBlue: %02x", (cmddata&0xFF00)>>8, cmddata&0xFF); + snprintf(desc, desc_size, "Green: 0x%02X\nBlue: 0x%02X", (cmddata&0xFF00)>>8, cmddata&0xFF); break; case BPMEM_CLEAR_Z: // 0x51 SetRegName(BPMEM_CLEAR_Z); - snprintf(desc, desc_size, "Z value: %06X", cmddata); + snprintf(desc, desc_size, "Z value: 0x%06X", cmddata); break; case BPMEM_TRIGGER_EFB_COPY: // 0x52 @@ -150,16 +150,16 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size "Intensity format: %s\n" "Automatic color conversion: %s\n", (copy.clamp0 && copy.clamp1) ? "Top and Bottom" : (copy.clamp0) ? "Top only" : (copy.clamp1) ? "Bottom only" : "None", - yes_no[copy.yuv], + no_yes[copy.yuv], copy.tp_realFormat(), (copy.gamma==0)?"1.0":(copy.gamma==1)?"1.7":(copy.gamma==2)?"2.2":"Invalid value 0x3?", - yes_no[copy.half_scale], - yes_no[copy.scale_invert], - yes_no[copy.clear], + no_yes[copy.half_scale], + no_yes[copy.scale_invert], + no_yes[copy.clear], copy.frame_to_field, - yes_no[copy.copy_to_xfb], - yes_no[copy.intensity_fmt], - yes_no[copy.auto_conv]); + no_yes[copy.copy_to_xfb], + no_yes[copy.intensity_fmt], + no_yes[copy.auto_conv]); } break; -- cgit v1.2.3 From ad1a4d7ce318232acf2086bc59c44d66d83e6180 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 21 Jan 2012 13:40:14 +0100 Subject: FifoPlayer: Add a search function for the analyzer tab. Also some tiny fixes. --- Source/Core/VideoCommon/Src/BPMemory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoCommon/Src/BPMemory.cpp') diff --git a/Source/Core/VideoCommon/Src/BPMemory.cpp b/Source/Core/VideoCommon/Src/BPMemory.cpp index 3f21e1acb0..43a4facacf 100644 --- a/Source/Core/VideoCommon/Src/BPMemory.cpp +++ b/Source/Core/VideoCommon/Src/BPMemory.cpp @@ -148,7 +148,7 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size "Frame to field: 0x%01X\n" "Copy to XFB: %s\n" "Intensity format: %s\n" - "Automatic color conversion: %s\n", + "Automatic color conversion: %s", (copy.clamp0 && copy.clamp1) ? "Top and Bottom" : (copy.clamp0) ? "Top only" : (copy.clamp1) ? "Bottom only" : "None", no_yes[copy.yuv], copy.tp_realFormat(), -- cgit v1.2.3