Merge pull request #16242 from unknownbrackets/logic-op

GPU: Replace logic ops with blend for simple cases
hrydgard · Oct 17, 2022 · c5bdc61 · c5bdc61
2 parents 51c359c + 162b27e
commit c5bdc61
Showing 1 changed file with 25 additions and 1 deletion.
diff --git a/GPU/Common/GPUStateUtils.cpp b/GPU/Common/GPUStateUtils.cpp
@@ -858,9 +858,12 @@ static inline bool blendColorSimilar(uint32_t a, uint32_t b, int margin = 25) {
 // The shader might also need modification, the below function SimulateLogicOpShaderTypeIfNeeded
 // takes care of that.
 static bool SimulateLogicOpIfNeeded(BlendFactor &srcBlend, BlendFactor &dstBlend, BlendEq &blendEq) {
+	if (!gstate.isLogicOpEnabled())
+		return false;
+
 	// Note: our shader solution applies logic ops BEFORE blending, not correctly after.
 	// This is however fine for the most common ones, like CLEAR/NOOP/SET, etc.
-	if (!gstate_c.Supports(GPU_SUPPORTS_LOGIC_OP) && gstate.isLogicOpEnabled()) {
+	if (!gstate_c.Supports(GPU_SUPPORTS_LOGIC_OP)) {
 		switch (gstate.getLogicOp()) {
 		case GE_LOGIC_CLEAR:
 			srcBlend = BlendFactor::ZERO;
@@ -916,6 +919,25 @@ static bool SimulateLogicOpIfNeeded(BlendFactor &srcBlend, BlendFactor &dstBlend
 			WARN_LOG_REPORT_ONCE(d3dLogicOpSet, G3D, "Attempted set for logic op: %x", gstate.getLogicOp());
 			return true;
 		}
+	} else {
+		// Even if we support hardware logic ops, alpha is handled wrong.
+		// It's better to override blending for the simple cases.
+		switch (gstate.getLogicOp()) {
+		case GE_LOGIC_CLEAR:
+			srcBlend = BlendFactor::ZERO;
+			dstBlend = BlendFactor::ZERO;
+			blendEq = BlendEq::ADD;
+			return true;
+		case GE_LOGIC_NOOP:
+			srcBlend = BlendFactor::ZERO;
+			dstBlend = BlendFactor::ONE;
+			blendEq = BlendEq::ADD;
+			return true;
+
+		default:
+			// Let's hope hardware gets it right.
+			return false;
+		}
 	}
 	return false;
 }
@@ -1598,5 +1620,7 @@ void GenericLogicState::ApplyToBlendState(GenericBlendState &blendState) {
 			blendState.dstAlpha = BlendFactor::ZERO;
 			blendState.eqAlpha = BlendEq::ADD;
 		}
+		logicOpEnabled = false;
+		logicOp = GE_LOGIC_COPY;
 	}
 }