summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Core/VideoCommon/Src/PixelShaderManager.cpp')
-rw-r--r--Source/Core/VideoCommon/Src/PixelShaderManager.cpp21
1 files changed, 12 insertions, 9 deletions
diff --git a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
index c8b8be412e..2521f80500 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
@@ -340,17 +340,20 @@ void PixelShaderManager::SetPSTextureDims(int texid)
// This one is high in profiles (0.5%). TODO: Move conversion out, only store the raw color value
// and update it when the shader constant is set, only.
-void PixelShaderManager::SetColorChanged(int type, int num)
+void PixelShaderManager::SetColorChanged(int type, int num, bool high)
{
- int r = bpmem.tevregs[num].low.a;
- int a = bpmem.tevregs[num].low.b;
- int b = bpmem.tevregs[num].high.a;
- int g = bpmem.tevregs[num].high.b;
float *pf = &lastRGBAfull[type][num][0];
- pf[0] = (float)r * (1.0f / 255.0f);
- pf[1] = (float)g * (1.0f / 255.0f);
- pf[2] = (float)b * (1.0f / 255.0f);
- pf[3] = (float)a * (1.0f / 255.0f);
+ if (!high) {
+ int r = bpmem.tevregs[num].low.a;
+ int a = bpmem.tevregs[num].low.b;
+ pf[0] = (float)r * (1.0f / 255.0f);
+ pf[3] = (float)a * (1.0f / 255.0f);
+ } else {
+ int b = bpmem.tevregs[num].high.a;
+ int g = bpmem.tevregs[num].high.b;
+ pf[1] = (float)g * (1.0f / 255.0f);
+ pf[2] = (float)b * (1.0f / 255.0f);
+ }
s_nColorsChanged[type] |= 1 << num;
PRIM_LOG("pixel %scolor%d: %f %f %f %f\n", type?"k":"", num, pf[0], pf[1], pf[2], pf[3]);
}