diff --git a/Source/Core/VideoCommon/BPFunctions.cpp b/Source/Core/VideoCommon/BPFunctions.cpp index b4257fc044..6120ca7778 100644 --- a/Source/Core/VideoCommon/BPFunctions.cpp +++ b/Source/Core/VideoCommon/BPFunctions.cpp @@ -75,16 +75,6 @@ void SetBlendMode() g_renderer->SetBlendMode(false); } -void SetLogicOpMode() -{ - g_renderer->SetLogicOpMode(); -} - -void SetColorMask() -{ - g_renderer->SetColorMask(); -} - /* Explanation of the magic behind ClearScreen: There's numerous possible formats for the pixel data in the EFB. However, in the HW accelerated backends we're always using RGBA8 diff --git a/Source/Core/VideoCommon/BPFunctions.h b/Source/Core/VideoCommon/BPFunctions.h index 45afe32e85..b89c02340e 100644 --- a/Source/Core/VideoCommon/BPFunctions.h +++ b/Source/Core/VideoCommon/BPFunctions.h @@ -19,8 +19,6 @@ void SetGenerationMode(); void SetScissor(); void SetDepthMode(); void SetBlendMode(); -void SetLogicOpMode(); -void SetColorMask(); void ClearScreen(const EFBRectangle& rc); void OnPixelFormatChange(); void SetInterlacingMode(const BPCmd& bp); diff --git a/Source/Core/VideoCommon/BPStructs.cpp b/Source/Core/VideoCommon/BPStructs.cpp index 9706347618..5605284092 100644 --- a/Source/Core/VideoCommon/BPStructs.cpp +++ b/Source/Core/VideoCommon/BPStructs.cpp @@ -148,17 +148,7 @@ static void BPWritten(const BPCmd& bp) bpmem.blendmode.dstfactor.Value(), bpmem.blendmode.srcfactor.Value(), bpmem.blendmode.subtract.Value(), bpmem.blendmode.logicmode.Value()); - // Set Blending Mode - if (bp.changes) - SetBlendMode(); - - // Set LogicOp Blending Mode - if (bp.changes & 0xF002) // logicopenable | logicmode - SetLogicOpMode(); - - // Set Color Mask - if (bp.changes & 0x18) // colorupdate | alphaupdate - SetColorMask(); + SetBlendMode(); // Dither if (bp.changes & 0x04) @@ -331,7 +321,6 @@ static void BPWritten(const BPCmd& bp) if (bp.changes) { PixelShaderManager::SetAlphaTestChanged(); - g_renderer->SetColorMask(); SetBlendMode(); } return; @@ -420,11 +409,7 @@ static void BPWritten(const BPCmd& bp) case BPMEM_ZCOMPARE: // Set the Z-Compare and EFB pixel format OnPixelFormatChange(); if (bp.changes & 7) - { SetBlendMode(); // dual source could be activated by changing to PIXELFMT_RGBA6_Z24 - g_renderer->SetColorMask(); // alpha writing needs to be disabled if the new pixel format - // doesn't have an alpha channel - } PixelShaderManager::SetZModeControl(); return; @@ -1414,8 +1399,6 @@ void BPReload() SetGenerationMode(); SetScissor(); SetDepthMode(); - SetLogicOpMode(); SetBlendMode(); - SetColorMask(); OnPixelFormatChange(); } diff --git a/Source/Core/VideoCommon/RenderBase.h b/Source/Core/VideoCommon/RenderBase.h index 296d97bf94..9dcd685510 100644 --- a/Source/Core/VideoCommon/RenderBase.h +++ b/Source/Core/VideoCommon/RenderBase.h @@ -63,12 +63,10 @@ public: PP_EFB_COPY_CLOCKS }; - virtual void SetColorMask() {} virtual void SetBlendMode(bool forceUpdate) {} virtual void SetScissorRect(const EFBRectangle& rc) {} virtual void SetGenerationMode() {} virtual void SetDepthMode() {} - virtual void SetLogicOpMode() {} virtual void SetSamplerState(int stage, int texindex, bool custom_tex) {} virtual void SetInterlacingMode() {} virtual void SetViewport() {}