Merge pull request hrydgard#1614 from unknownbrackets/gpu-minor

Improve blending with two fixed colors
igorcalabria · May 1, 2013 · 74b55cc · 74b55cc
2 parents 29651c0 + 4009a37
commit 74b55cc
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/GPU/GLES/StateMapping.cpp b/GPU/GLES/StateMapping.cpp
@@ -178,8 +178,19 @@ void TransformDrawEngine::ApplyDrawState(int prim) {
 					didReportBlend = true;
 
 					DEBUG_LOG(HLE, "ERROR INVALID blendcolorstate: FixA=%06x FixB=%06x FuncA=%i FuncB=%i", gstate.getFixA(), gstate.getFixB(), gstate.getBlendFuncA(), gstate.getBlendFuncB());
-					glBlendFuncA = GL_ONE;
-					glBlendFuncB = GL_ONE;
+					// Let's approximate, at least.
+					int blendSumA = (fixA & 0xFF) + ((fixA >> 8) & 0xFF) +  ((fixA >> 16) & 0xFF);
+					int blendSumB = (fixB & 0xFF) + ((fixB >> 8) & 0xFF) +  ((fixB >> 16) & 0xFF);
+					if (blendSumA < 64 * 3 && blendSumB > 192 * 3) {
+						glBlendFuncA = GL_ZERO;
+						glBlendFuncB = GL_ONE;
+					} else if (blendSumA > 192 * 3 && blendSumB < 64 * 3) {
+						glBlendFuncA = GL_ONE;
+						glBlendFuncB = GL_ZERO;
+					} else {
+						glBlendFuncA = GL_ONE;
+						glBlendFuncB = GL_ONE;
+					}
 				}
 			}
 			// At this point, through all paths above, glBlendFuncA and glBlendFuncB will be set somehow.