summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Tony Wasserka2015-03-09 23:12:30 +0100
committerGravatar Tony Wasserka2015-03-09 23:12:30 +0100
commite3a697b9f9db68f0d310fb4ab2003629ec6dc8f3 (patch)
tree31e4a7ad7a7dee8599923dc470bfcea4eb7ddc81 /src
parentMerge pull request #589 from kevinhartman/config-errors (diff)
parentGPU: Corrected the 24 bit memory fills component order (diff)
downloadyuzu-e3a697b9f9db68f0d310fb4ab2003629ec6dc8f3.tar.gz
yuzu-e3a697b9f9db68f0d310fb4ab2003629ec6dc8f3.tar.xz
yuzu-e3a697b9f9db68f0d310fb4ab2003629ec6dc8f3.zip
Merge pull request #646 from Subv/24bit_fills
GPU: Corrected the 24 bit memory fills component order
Diffstat (limited to 'src')
-rw-r--r--src/core/hw/gpu.cpp4
-rw-r--r--src/core/hw/gpu.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp
index 424ce2ca7..b7102b874 100644
--- a/src/core/hw/gpu.cpp
+++ b/src/core/hw/gpu.cpp
@@ -81,9 +81,9 @@ inline void Write(u32 addr, const T data) {
81 if (config.fill_24bit) { 81 if (config.fill_24bit) {
82 // fill with 24-bit values 82 // fill with 24-bit values
83 for (u8* ptr = start; ptr < end; ptr += 3) { 83 for (u8* ptr = start; ptr < end; ptr += 3) {
84 ptr[0] = config.value_24bit_b; 84 ptr[0] = config.value_24bit_r;
85 ptr[1] = config.value_24bit_g; 85 ptr[1] = config.value_24bit_g;
86 ptr[2] = config.value_24bit_r; 86 ptr[2] = config.value_24bit_b;
87 } 87 }
88 } else if (config.fill_32bit) { 88 } else if (config.fill_32bit) {
89 // fill with 32-bit values 89 // fill with 32-bit values
diff --git a/src/core/hw/gpu.h b/src/core/hw/gpu.h
index 737b1e968..5ca4a5450 100644
--- a/src/core/hw/gpu.h
+++ b/src/core/hw/gpu.h
@@ -100,10 +100,10 @@ struct Regs {
100 // Set to 1 upon completion. 100 // Set to 1 upon completion.
101 BitField<0, 1, u32> finished; 101 BitField<0, 1, u32> finished;
102 102
103 // 0: fill with 16- or 32-bit wide values; 1: fill with 24-bit wide values 103 // If both of these bits are unset, then it will fill the memory with a 16 bit value
104 // 1: fill with 24-bit wide values
104 BitField<8, 1, u32> fill_24bit; 105 BitField<8, 1, u32> fill_24bit;
105 106 // 1: fill with 32-bit wide values
106 // 0: fill with 16-bit wide values; 1: fill with 32-bit wide values
107 BitField<9, 1, u32> fill_32bit; 107 BitField<9, 1, u32> fill_32bit;
108 }; 108 };
109 109