From 77a7bab5ae86871d756522affa3e4e899999da4c Mon Sep 17 00:00:00 2001 From: Tony Wasserka Date: Mon, 10 Mar 2014 16:15:40 +0100 Subject: BPMemory: Use the new BitField class in two selected structures. --- Source/Core/VideoCommon/BPMemory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoCommon/BPMemory.cpp') diff --git a/Source/Core/VideoCommon/BPMemory.cpp b/Source/Core/VideoCommon/BPMemory.cpp index 7902bf70a6..6f49e12c08 100644 --- a/Source/Core/VideoCommon/BPMemory.cpp +++ b/Source/Core/VideoCommon/BPMemory.cpp @@ -158,7 +158,7 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size no_yes[copy.half_scale], no_yes[copy.scale_invert], no_yes[copy.clear], - copy.frame_to_field, + (u32)copy.frame_to_field, no_yes[copy.copy_to_xfb], no_yes[copy.intensity_fmt], no_yes[copy.auto_conv]); -- cgit v1.2.3 From 8941f19cdb01bbe8c40851240d02019ed6e13a32 Mon Sep 17 00:00:00 2001 From: Tony Wasserka Date: Sun, 23 Mar 2014 21:44:23 +0100 Subject: BPMemory: Expose the pixel_format and zformat fields in PE_CONTROL as enumerations. --- Source/Core/VideoCommon/BPMemory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoCommon/BPMemory.cpp') diff --git a/Source/Core/VideoCommon/BPMemory.cpp b/Source/Core/VideoCommon/BPMemory.cpp index 6f49e12c08..356ee6c133 100644 --- a/Source/Core/VideoCommon/BPMemory.cpp +++ b/Source/Core/VideoCommon/BPMemory.cpp @@ -92,7 +92,7 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size case BPMEM_ZCOMPARE: { SetRegName(BPMEM_ZCOMPARE); - PE_CONTROL config; config.hex = cmddata; + PEControl config; config.hex = cmddata; const char* pixel_formats[] = { "RGB8_Z24", "RGBA6_Z24", "RGB565_Z16", "Z24", "Y8", "U8", "V8", "YUV420" }; const char* zformats[] = { "linear", "compressed (near)", "compressed (mid)", "compressed (far)", "inv linear", "compressed (inv near)", "compressed (inv mid)", "compressed (inv far)" }; snprintf(desc, desc_size, "EFB pixel format: %s\n" -- cgit v1.2.3 From 16105db7092707bc130a345ed1e630e2ef1f7747 Mon Sep 17 00:00:00 2001 From: Tony Wasserka Date: Mon, 24 Mar 2014 20:21:34 +0100 Subject: BPMemory: Make use of BitField in a number of structures. --- Source/Core/VideoCommon/BPMemory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoCommon/BPMemory.cpp') diff --git a/Source/Core/VideoCommon/BPMemory.cpp b/Source/Core/VideoCommon/BPMemory.cpp index 356ee6c133..1f74d8d36d 100644 --- a/Source/Core/VideoCommon/BPMemory.cpp +++ b/Source/Core/VideoCommon/BPMemory.cpp @@ -292,7 +292,7 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size snprintf(desc, desc_size, "test 1: %s (ref: %#02x)\n" "test 2: %s (ref: %#02x)\n" "logic: %s\n", - functions[test.comp0], test.ref0, functions[test.comp1], test.ref1, logic[test.logic]); + functions[test.comp0], (int)test.ref0, functions[test.comp1], (int)test.ref1, logic[test.logic]); break; } -- cgit v1.2.3