Merge pull request #15948 from hrydgard/remove-setting-slow-framebuf-effects

Remove setting: Slow framebuf effects

Core/Config.cpp

@@ -934,7 +934,6 @@ static ConfigSetting graphicsSettings[] = {
 	ConfigSetting("ShaderChainRequires60FPS", &g_Config.bShaderChainRequires60FPS, false, true, true),
 
 	ReportedConfigSetting("MemBlockTransferGPU", &g_Config.bBlockTransferGPU, true, true, true),
-	ReportedConfigSetting("DisableSlowFramebufEffects", &g_Config.bDisableShaderBlending, false, true, true),
 	ReportedConfigSetting("FragmentTestCache", &g_Config.bFragmentTestCache, true, true, true),
 
 	ConfigSetting("GfxDebugOutput", &g_Config.bGfxDebugOutput, false, false, false),

Core/Config.h

@@ -232,7 +232,6 @@ public:
 	float fGameListScrollPosition;
 	int iBloomHack; //0 = off, 1 = safe, 2 = balanced, 3 = aggressive
 	bool bBlockTransferGPU;
-	bool bDisableShaderBlending;
 	bool bFragmentTestCache;
 	int iSplineBezierQuality; // 0 = low , 1 = Intermediate , 2 = High
 	bool bHardwareTessellation;

GPU/Common/GPUStateUtils.cpp

@@ -257,7 +257,7 @@ StencilValueType ReplaceAlphaWithStencilType() {
 	return STENCIL_VALUE_KEEP;
 }
 
-ReplaceBlendType ReplaceBlendWithShader(bool allowFramebufferRead, GEBufferFormat bufferFormat) {
+ReplaceBlendType ReplaceBlendWithShader(GEBufferFormat bufferFormat) {
 	if (gstate_c.blueToAlpha) {
 		return REPLACE_BLEND_BLUE_TO_ALPHA;
 	}
@@ -270,14 +270,14 @@ ReplaceBlendType ReplaceBlendWithShader(bool allowFramebufferRead, GEBufferForma
 	// Let's get the non-factor modes out of the way first.
 	switch (eq) {
 	case GE_BLENDMODE_ABSDIFF:
-		return !allowFramebufferRead ? REPLACE_BLEND_STANDARD : REPLACE_BLEND_READ_FRAMEBUFFER;
+		return REPLACE_BLEND_READ_FRAMEBUFFER;
 
 	case GE_BLENDMODE_MIN:
 	case GE_BLENDMODE_MAX:
 		if (gstate_c.Supports(GPU_SUPPORTS_BLEND_MINMAX)) {
 			return REPLACE_BLEND_STANDARD;
 		} else {
-			return !allowFramebufferRead ? REPLACE_BLEND_STANDARD : REPLACE_BLEND_READ_FRAMEBUFFER;
+			return REPLACE_BLEND_READ_FRAMEBUFFER;
 		}
 
 	default:
@@ -300,19 +300,19 @@ ReplaceBlendType ReplaceBlendWithShader(bool allowFramebufferRead, GEBufferForma
 				return REPLACE_BLEND_2X_ALPHA;
 			// Can't double, we need the source color to be correct.
 			// Doubling only alpha would clamp the src alpha incorrectly.
-			return !allowFramebufferRead ? REPLACE_BLEND_2X_ALPHA : REPLACE_BLEND_READ_FRAMEBUFFER;
+			return REPLACE_BLEND_READ_FRAMEBUFFER;
 
 		case GE_DSTBLEND_DOUBLEDSTALPHA:
 		case GE_DSTBLEND_DOUBLEINVDSTALPHA:
 			if (bufferFormat == GE_FORMAT_565)
 				return REPLACE_BLEND_2X_ALPHA;
-			return !allowFramebufferRead ? REPLACE_BLEND_2X_ALPHA : REPLACE_BLEND_READ_FRAMEBUFFER;
+			return REPLACE_BLEND_READ_FRAMEBUFFER;
 
 		case GE_DSTBLEND_DOUBLESRCALPHA:
 			// We can't technically do this correctly (due to clamping) without reading the dst color.
 			// Using a copy isn't accurate either, though, when there's overlap.
 			if (gstate_c.Supports(GPU_SUPPORTS_ANY_FRAMEBUFFER_FETCH))
-				return !allowFramebufferRead ? REPLACE_BLEND_PRE_SRC_2X_ALPHA : REPLACE_BLEND_READ_FRAMEBUFFER;
+				return REPLACE_BLEND_READ_FRAMEBUFFER;
 			return REPLACE_BLEND_PRE_SRC_2X_ALPHA;
 
 		case GE_DSTBLEND_DOUBLEINVSRCALPHA:
@@ -339,7 +339,7 @@ ReplaceBlendType ReplaceBlendWithShader(bool allowFramebufferRead, GEBufferForma
 				return REPLACE_BLEND_STANDARD;
 			}
 			// Can't double, we need the source color to be correct.
-			return !allowFramebufferRead ? REPLACE_BLEND_STANDARD : REPLACE_BLEND_READ_FRAMEBUFFER;
+			return REPLACE_BLEND_READ_FRAMEBUFFER;
 
 		case GE_DSTBLEND_DOUBLEDSTALPHA:
 		case GE_DSTBLEND_DOUBLEINVDSTALPHA:
@@ -348,7 +348,7 @@ ReplaceBlendType ReplaceBlendWithShader(bool allowFramebufferRead, GEBufferForma
 				// Doubling will have no effect here.
 				return REPLACE_BLEND_STANDARD;
 			}
-			return !allowFramebufferRead ? REPLACE_BLEND_2X_SRC : REPLACE_BLEND_READ_FRAMEBUFFER;
+			return REPLACE_BLEND_READ_FRAMEBUFFER;
 
 		case GE_DSTBLEND_DOUBLESRCALPHA:
 		case GE_DSTBLEND_DOUBLEINVSRCALPHA:
@@ -357,7 +357,7 @@ ReplaceBlendType ReplaceBlendWithShader(bool allowFramebufferRead, GEBufferForma
 			}
 			// Double both src (for dst alpha) and alpha (for dst factor.)
 			// But to be accurate (clamping), we need to read the dst color.
-			return !allowFramebufferRead ? REPLACE_BLEND_PRE_SRC_2X_ALPHA : REPLACE_BLEND_READ_FRAMEBUFFER;
+			return REPLACE_BLEND_READ_FRAMEBUFFER;
 
 		case GE_DSTBLEND_SRCALPHA:
 		case GE_DSTBLEND_INVSRCALPHA:
@@ -369,7 +369,7 @@ ReplaceBlendType ReplaceBlendWithShader(bool allowFramebufferRead, GEBufferForma
 				return REPLACE_BLEND_STANDARD;
 			}
 			// We can't technically do this correctly (due to clamping) without reading the dst alpha.
-			return !allowFramebufferRead ? REPLACE_BLEND_2X_SRC : REPLACE_BLEND_READ_FRAMEBUFFER;
+			return REPLACE_BLEND_READ_FRAMEBUFFER;
 		}
 
 	case GE_SRCBLEND_DOUBLEINVDSTALPHA:
@@ -383,14 +383,14 @@ ReplaceBlendType ReplaceBlendWithShader(bool allowFramebufferRead, GEBufferForma
 			if (bufferFormat == GE_FORMAT_565) {
 				return REPLACE_BLEND_STANDARD;
 			}
-			return !allowFramebufferRead ? REPLACE_BLEND_STANDARD : REPLACE_BLEND_READ_FRAMEBUFFER;
+			return REPLACE_BLEND_READ_FRAMEBUFFER;
 
 		case GE_DSTBLEND_DOUBLESRCALPHA:
 		case GE_DSTBLEND_DOUBLEINVSRCALPHA:
 			if (bufferFormat == GE_FORMAT_565) {
 				return REPLACE_BLEND_2X_ALPHA;
 			}
-			return !allowFramebufferRead ? REPLACE_BLEND_2X_ALPHA : REPLACE_BLEND_READ_FRAMEBUFFER;
+			return REPLACE_BLEND_READ_FRAMEBUFFER;
 
 		case GE_DSTBLEND_SRCALPHA:
 		case GE_DSTBLEND_INVSRCALPHA:
@@ -401,7 +401,7 @@ ReplaceBlendType ReplaceBlendWithShader(bool allowFramebufferRead, GEBufferForma
 			if (bufferFormat == GE_FORMAT_565) {
 				return REPLACE_BLEND_STANDARD;
 			}
-			return !allowFramebufferRead ? REPLACE_BLEND_STANDARD : REPLACE_BLEND_READ_FRAMEBUFFER;
+			return REPLACE_BLEND_READ_FRAMEBUFFER;
 		}
 
 	case GE_SRCBLEND_FIXA:
@@ -409,7 +409,7 @@ ReplaceBlendType ReplaceBlendWithShader(bool allowFramebufferRead, GEBufferForma
 		switch (funcB) {
 		case GE_DSTBLEND_DOUBLESRCALPHA:
 			// Can't safely double alpha, will clamp.
-			return !allowFramebufferRead ? REPLACE_BLEND_2X_ALPHA : REPLACE_BLEND_READ_FRAMEBUFFER;
+			return REPLACE_BLEND_READ_FRAMEBUFFER;
 
 		case GE_DSTBLEND_DOUBLEINVSRCALPHA:
 			// Doubling alpha is safe for the inverse, will clamp to zero either way.
@@ -420,7 +420,7 @@ ReplaceBlendType ReplaceBlendWithShader(bool allowFramebufferRead, GEBufferForma
 			if (bufferFormat == GE_FORMAT_565) {
 				return REPLACE_BLEND_STANDARD;
 			}
-			return !allowFramebufferRead ? REPLACE_BLEND_STANDARD : REPLACE_BLEND_READ_FRAMEBUFFER;
+			return REPLACE_BLEND_READ_FRAMEBUFFER;
 
 		case GE_DSTBLEND_FIXB:
 		default:
@@ -454,14 +454,14 @@ ReplaceBlendType ReplaceBlendWithShader(bool allowFramebufferRead, GEBufferForma
 			if (funcA == GE_SRCBLEND_SRCALPHA || funcA == GE_SRCBLEND_INVSRCALPHA) {
 				// Can't safely double alpha, will clamp.  However, a copy may easily be worse due to overlap.
 				if (gstate_c.Supports(GPU_SUPPORTS_ANY_FRAMEBUFFER_FETCH))
-					return !allowFramebufferRead ? REPLACE_BLEND_PRE_SRC_2X_ALPHA : REPLACE_BLEND_READ_FRAMEBUFFER;
+					return REPLACE_BLEND_READ_FRAMEBUFFER;
 				return REPLACE_BLEND_PRE_SRC_2X_ALPHA;
 			} else {
 				// This means dst alpha/color is used in the src factor.
 				// Unfortunately, copying here causes overlap problems in Silent Hill games (it seems?)
 				// We will just hope that doubling alpha for the dst factor will not clamp too badly.
 				if (gstate_c.Supports(GPU_SUPPORTS_ANY_FRAMEBUFFER_FETCH))
-					return !allowFramebufferRead ? REPLACE_BLEND_2X_ALPHA : REPLACE_BLEND_READ_FRAMEBUFFER;
+					return REPLACE_BLEND_READ_FRAMEBUFFER;
 				return REPLACE_BLEND_2X_ALPHA;
 			}
 
@@ -478,7 +478,7 @@ ReplaceBlendType ReplaceBlendWithShader(bool allowFramebufferRead, GEBufferForma
 			if (bufferFormat == GE_FORMAT_565) {
 				return REPLACE_BLEND_STANDARD;
 			}
-			return !allowFramebufferRead ? REPLACE_BLEND_STANDARD : REPLACE_BLEND_READ_FRAMEBUFFER;
+			return REPLACE_BLEND_READ_FRAMEBUFFER;
 
 		default:
 			return REPLACE_BLEND_STANDARD;
@@ -988,41 +988,13 @@ void ApplyStencilReplaceAndLogicOpIgnoreBlend(ReplaceAlphaType replaceAlphaWithS
 	}
 }
 
-bool IsColorWriteMaskComplex(bool allowFramebufferRead) {
-	// Restrict to Outrun temporarily (by uglily reusing the ReinterpretFramebuffers flag)
-	// This check must match the one in ConvertMaskState.
-	if (!allowFramebufferRead || !PSP_CoreParameter().compat.flags().ShaderColorBitmask) {
-		// Don't have a choice - we'll make do but it won't always be right.
-		return false;
-	}
-
-	if (gstate_c.blueToAlpha) {
-		// We'll generate a simple ___A mask.
-		return false;
-	}
-
-	uint32_t colorMask = (gstate.pmskc & 0xFFFFFF) | (gstate.pmska << 24);
-
-	for (int i = 0; i < 4; i++) {
-		switch (colorMask & 0xFF) {
-		case 0x0:
-		case 0xFF:
-			break;
-		default:
-			return true;
-		}
-		colorMask >>= 8;
-	}
-	return false;
-}
-
 // If we can we emulate the colorMask by simply toggling the full R G B A masks offered
 // by modern hardware, we do that. This is 99.9% of the time.
 // When that's not enough, we fall back on a technique similar to shader blending,
 // we read from the framebuffer (or a copy of it).
 // We also prepare uniformMask so that if doing this in the shader gets forced-on,
 // we have the right mask already.
-void ConvertMaskState(GenericMaskState &maskState, bool allowFramebufferRead) {
+void ConvertMaskState(GenericMaskState &maskState) {
 	if (gstate_c.blueToAlpha) {
 		maskState.applyFramebufferRead = false;
 		maskState.uniformMask = 0xFF000000;
@@ -1048,15 +1020,9 @@ void ConvertMaskState(GenericMaskState &maskState, bool allowFramebufferRead) {
 			maskState.maskRGBA[i] = true;
 			break;
 		default:
-			if (allowFramebufferRead) {
-				// Instead of just 'true', restrict shader bitmasks to Outrun temporarily.
-				// TODO: This check must match the one in IsColorWriteMaskComplex.
 			maskState.applyFramebufferRead = PSP_CoreParameter().compat.flags().ShaderColorBitmask;
 			maskState.maskRGBA[i] = true;
-			} else {
+			break;
-				// Use the old heuristic.
-				maskState.maskRGBA[i] = channelMask >= 128;
-			}
 		}
 		colorMask >>= 8;
 	}
@@ -1071,7 +1037,7 @@ void ConvertMaskState(GenericMaskState &maskState, bool allowFramebufferRead) {
 }
 
 // Called even if AlphaBlendEnable == false - it also deals with stencil-related blend state.
-void ConvertBlendState(GenericBlendState &blendState, bool allowFramebufferRead, bool forceReplaceBlend) {
+void ConvertBlendState(GenericBlendState &blendState, bool forceReplaceBlend) {
 	// Blending is a bit complex to emulate.  This is due to several reasons:
 	//
 	//  * Doubled blend modes (src, dst, inversed) aren't supported in OpenGL.
@@ -1086,7 +1052,7 @@ void ConvertBlendState(GenericBlendState &blendState, bool allowFramebufferRead,
 	blendState.dirtyShaderBlendFixValues = false;
 	blendState.useBlendColor = false;
 
-	ReplaceBlendType replaceBlend = ReplaceBlendWithShader(allowFramebufferRead, gstate_c.framebufFormat);
+	ReplaceBlendType replaceBlend = ReplaceBlendWithShader(gstate_c.framebufFormat);
 	if (forceReplaceBlend) {
 		replaceBlend = REPLACE_BLEND_READ_FRAMEBUFFER;
 	}

GPU/Common/GPUStateUtils.h

@@ -60,7 +60,7 @@ bool IsStencilTestOutputDisabled();
 
 StencilValueType ReplaceAlphaWithStencilType();
 ReplaceAlphaType ReplaceAlphaWithStencil(ReplaceBlendType replaceBlend);
-ReplaceBlendType ReplaceBlendWithShader(bool allowShaderBlend, GEBufferFormat bufferFormat);
+ReplaceBlendType ReplaceBlendWithShader(GEBufferFormat bufferFormat);
 
 LogicOpReplaceType ReplaceLogicOpType();
 
@@ -181,7 +181,7 @@ struct GenericBlendState {
 	}
 };
 
-void ConvertBlendState(GenericBlendState &blendState, bool allowShaderBlend, bool forceReplaceBlend);
+void ConvertBlendState(GenericBlendState &blendState, bool forceReplaceBlend);
 void ApplyStencilReplaceAndLogicOpIgnoreBlend(ReplaceAlphaType replaceAlphaWithStencil, GenericBlendState &blendState);
 
 struct GenericMaskState {
@@ -190,8 +190,7 @@ struct GenericMaskState {
 	bool maskRGBA[4];  // true = draw, false = don't draw this channel
 };
 
-void ConvertMaskState(GenericMaskState &maskState, bool allowFramebufferRead);
+void ConvertMaskState(GenericMaskState &maskState);
-bool IsColorWriteMaskComplex(bool allowFramebufferRead);
 
 struct GenericStencilFuncState {
 	bool enabled;

GPU/Common/ShaderId.cpp

@@ -269,8 +269,8 @@ void ComputeFragmentShaderID(FShaderID *id_out, const ComputedPipelineState &pip
 		ReplaceAlphaType stencilToAlpha = pipelineState.blendState.replaceAlphaWithStencil;
 
 		// For debugging, can probably delete soon.
-		// _assert_(colorWriteMask == IsColorWriteMaskComplex(gstate_c.allowFramebufferRead));
+		// _assert_(colorWriteMask == IsColorWriteMaskComplex());
-		// _assert_(replaceBlend == ReplaceBlendWithShader(gstate_c.allowFramebufferRead, gstate_c.framebufFormat);
+		// _assert_(replaceBlend == ReplaceBlendWithShader(gstate_c.framebufFormat);
 		// _assert_(stencilToAlpha == ReplaceAlphaWithStencil(replaceBlend));
 
 		// All texfuncs except replace are the same for RGB as for RGBA with full alpha.

GPU/D3D11/StateMappingD3D11.cpp

@@ -142,7 +142,6 @@ void DrawEngineD3D11::ApplyDrawState(int prim) {
 	bool useBufferedRendering = framebufferManager_->UseBufferedRendering();
 	// Blend
 	if (gstate_c.IsDirty(DIRTY_BLEND_STATE)) {
-		gstate_c.SetAllowFramebufferRead(!g_Config.bDisableShaderBlending);
 		if (gstate.isModeClear()) {
 			keys_.blend.value = 0;  // full wipe
 			keys_.blend.blendEnable = false;
@@ -156,8 +155,8 @@ void DrawEngineD3D11::ApplyDrawState(int prim) {
 
 			GenericMaskState &maskState = pipelineState_.maskState;
 			GenericBlendState &blendState = pipelineState_.blendState;
-			ConvertMaskState(maskState, gstate_c.allowFramebufferRead);
+			ConvertMaskState(maskState);
-			ConvertBlendState(blendState, gstate_c.allowFramebufferRead, maskState.applyFramebufferRead);
+			ConvertBlendState(blendState, maskState.applyFramebufferRead);
 
 			if (blendState.applyFramebufferRead || maskState.applyFramebufferRead) {
 				ApplyFramebufferRead(&fboTexNeedsBind_);

GPU/Directx9/StateMappingDX9.cpp

@@ -119,7 +119,6 @@ void DrawEngineDX9::ApplyDrawState(int prim) {
 	bool useBufferedRendering = framebufferManager_->UseBufferedRendering();
 
 	if (gstate_c.IsDirty(DIRTY_BLEND_STATE)) {
-		gstate_c.SetAllowFramebufferRead(!g_Config.bDisableShaderBlending);
 		if (gstate.isModeClear()) {
 			dxstate.blend.disable();
 			// Color Mask
@@ -134,8 +133,8 @@ void DrawEngineDX9::ApplyDrawState(int prim) {
 		} else {
 			GenericMaskState &maskState = pipelineState_.maskState;
 			GenericBlendState &blendState = pipelineState_.blendState;
-			ConvertMaskState(maskState, gstate_c.allowFramebufferRead);
+			ConvertMaskState(maskState);
-			ConvertBlendState(blendState, gstate_c.allowFramebufferRead, maskState.applyFramebufferRead);
+			ConvertBlendState(blendState, maskState.applyFramebufferRead);
 
 			if (blendState.applyFramebufferRead || maskState.applyFramebufferRead) {
 				ApplyFramebufferRead(&fboTexNeedsBind_);

GPU/GLES/StateMappingGLES.cpp

@@ -145,8 +145,6 @@ void DrawEngineGLES::ApplyDrawState(int prim) {
 	bool useBufferedRendering = framebufferManager_->UseBufferedRendering();
 
 	if (gstate_c.IsDirty(DIRTY_BLEND_STATE)) {
-		gstate_c.SetAllowFramebufferRead(!g_Config.bDisableShaderBlending);
-
 		if (gstate.isModeClear()) {
 			// Color Test
 			bool colorMask = gstate.isClearModeColorMask();
@@ -155,8 +153,8 @@ void DrawEngineGLES::ApplyDrawState(int prim) {
 		} else {
 			GenericMaskState &maskState = pipelineState_.maskState;
 			GenericBlendState &blendState = pipelineState_.blendState;
-			ConvertMaskState(maskState, gstate_c.allowFramebufferRead);
+			ConvertMaskState(maskState);
-			ConvertBlendState(blendState, gstate_c.allowFramebufferRead, maskState.applyFramebufferRead);
+			ConvertBlendState(blendState, maskState.applyFramebufferRead);
 
 			if (blendState.applyFramebufferRead || maskState.applyFramebufferRead) {
 				ApplyFramebufferRead(&fboTexNeedsBind_);

GPU/GPUState.h

@@ -550,12 +550,6 @@ struct GPUStateCache {
 				Dirty(DIRTY_TEXCLAMP);
 		}
 	}
-	void SetAllowFramebufferRead(bool allow) {
-		if (allowFramebufferRead != allow) {
-			allowFramebufferRead = allow;
-			Dirty(DIRTY_FRAGMENTSHADER_STATE);
-		}
-	}
 	void SetTextureIs3D(bool is3D) {
 		if (is3D != curTextureIs3D) {
 			curTextureIs3D = is3D;
@@ -583,7 +577,6 @@ struct GPUStateCache {
 
 	bool bgraTexture;
 	bool needShaderTexClamp;
-	bool allowFramebufferRead;
 
 	float morphWeights[8];
 	u32 deferredVertTypeDirty;

GPU/Vulkan/StateMappingVulkan.cpp

@@ -135,7 +135,6 @@ void DrawEngineVulkan::ConvertStateToVulkanKey(FramebufferManagerVulkan &fbManag
 	bool useBufferedRendering = framebufferManager_->UseBufferedRendering();
 
 	if (gstate_c.IsDirty(DIRTY_BLEND_STATE)) {
-		gstate_c.SetAllowFramebufferRead(!g_Config.bDisableShaderBlending);
 		if (gstate.isModeClear()) {
 			key.logicOpEnable = false;
 			key.logicOp = VK_LOGIC_OP_CLEAR;
@@ -163,8 +162,8 @@ void DrawEngineVulkan::ConvertStateToVulkanKey(FramebufferManagerVulkan &fbManag
 
 			GenericMaskState &maskState = pipelineState_.maskState;
 			GenericBlendState &blendState = pipelineState_.blendState;
-			ConvertMaskState(maskState, gstate_c.allowFramebufferRead);
+			ConvertMaskState(maskState);
-			ConvertBlendState(blendState, gstate_c.allowFramebufferRead, maskState.applyFramebufferRead);
+			ConvertBlendState(blendState, maskState.applyFramebufferRead);
 
 			if (blendState.applyFramebufferRead || maskState.applyFramebufferRead) {
 				ApplyFramebufferRead(&fboTexNeedsBind_);

UI/GameSettingsScreen.cpp

@@ -507,9 +507,6 @@ void GameSettingsScreen::CreateViews() {
 	});
 	texSecondary_->SetDisabledPtr(&g_Config.bSoftwareRendering);
 
-	CheckBox *framebufferSlowEffects = graphicsSettings->Add(new CheckBox(&g_Config.bDisableShaderBlending, gr->T("Disable slower effects (speedup)")));
-	framebufferSlowEffects->SetDisabledPtr(&g_Config.bSoftwareRendering);
-
 	// Seems solid, so we hide the setting.
 	/*CheckBox *vtxJit = graphicsSettings->Add(new CheckBox(&g_Config.bVertexDecoderJit, gr->T("Vertex Decoder JIT")));
 

assets/lang/ar_AE.ini

@@ -498,7 +498,6 @@ Deposterize Tip = Fixes visual banding glitches in upscaled textures
 Device = Device
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Disable slower effects (speedup)
 Disabled = Disabled
 Display layout editor = Display layout editor
 Display Resolution (HW scaler) = Display resolution (HW scaler)

assets/lang/az_AZ.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Fixes visual banding glitches in upscaled textures
 Device = Device
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Disable slower effects (speedup)
 Disabled = Disabled
 Display layout editor = Display layout editor
 Display Resolution (HW scaler) = Display resolution (HW scaler)

assets/lang/bg_BG.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Fixes visual banding glitches in upscaled textures
 Device = Device
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Disable slower effects (speedup)
 Disabled = Disabled
 Display layout editor = Display layout editor
 Display Resolution (HW scaler) = Display resolution (HW scaler)

assets/lang/ca_ES.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Fixes visual banding glitches in upscaled textures
 Device = Device
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Disable slower effects (speedup)
 Disabled = Disabled
 Display layout editor = Display layout editor
 Display Resolution (HW scaler) = Display resolution (HW scaler)

assets/lang/cz_CZ.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Fixes visual banding glitches in upscaled textures
 Device = Device
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Zakázat pomalejší efekty (zrychlení)
 Disabled = Disabled
 Display layout editor = Zobrazit editor rozvržení
 Display Resolution (HW scaler) = Rozlišení obrazovky (Hardwarové zvětšení)

assets/lang/da_DK.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Retter visuel banding fejl in opskalerede textures
 Device = Device
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Deaktiver langsommere effekter (hurtigere)
 Disabled = Disabled
 Display layout editor = Display layout editor
 Display Resolution (HW scaler) = Skærmopløsning (HW scaler)

assets/lang/de_DE.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Behebt visuelle Artifakte von hochskalierten Texturen
 Device = Gerät
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Deaktiviere langsame Effekte (schneller)
 Disabled = Deaktiviert
 Display layout editor = Bildschirmlayout Editor
 Display Resolution (HW scaler) = Bildschirmauflösung (HW Skalierung)

assets/lang/dr_ID.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Fixes visual banding glitches in upscaled textures
 Device = Device
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Disable slower effects (speedup)
 Disabled = Disabled
 Display layout editor = Display layout editor
 Display Resolution (HW scaler) = Display resolution (HW scaler)

assets/lang/en_US.ini

@@ -514,7 +514,6 @@ Deposterize Tip = Fixes visual banding glitches in upscaled textures
 Device = Device
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Disable slower effects (speedup)
 Disabled = Disabled
 Display layout editor = Display layout editor
 Display Resolution (HW scaler) = Display resolution (HW scaler)

assets/lang/es_ES.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Arregla pequeños errores en las texturas causadas por el esca
 Device = Dispositivo
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Desactivar efectos más lentos (rápido)
 Disabled = Desactivado
 Display layout editor = Editor del área de pantalla
 Display Resolution (HW scaler) = Resolución de pantalla (escalado por hardware)

assets/lang/es_LA.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Arregla glitches de banda visual en texturas causadas por el e
 Device = Dispositivo
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Desactivar efectos más lentos (rápido)
 Disabled = Apagado
 Display layout editor = Editor del área de pantalla
 Display Resolution (HW scaler) = Resolución de pantalla (escalado por HW)

assets/lang/fa_IR.ini

@@ -490,7 +490,6 @@ Deposterize Tip = ‎مشکل نواری شدن در تکسچر های تغیی
 Device = Device
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = ‎غیر فعال کردن افکت های کند (افزایش سرعت)
 Disabled = Disabled
 Display layout editor = ‎ویرایشگر چیدمان صفحه
 Display Resolution (HW scaler) = ‎رزولوشن صفحه

assets/lang/fi_FI.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Fixes visual banding glitches in upscaled textures
 Device = Device
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Disable slower effects (speedup)
 Disabled = Disabled
 Display layout editor = Display layout editor
 Display Resolution (HW scaler) = Display resolution (HW scaler)

assets/lang/fr_FR.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Corrige le bug graphique qui fait apparaître des bandes dans
 Device = Appareil
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Désactiver les effets les plus lourds (gain de vitesse)
 Disabled = Désactivé
 Display layout editor = Éditeur d'affichage
 Display Resolution (HW scaler) = Définition d'affichage (mise à l'échelle matérielle)

assets/lang/gl_ES.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Fixes visual banding glitches in upscaled textures
 Device = Device
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Desactivar efectos máis lentos (rápido)
 Disabled = Disabled
 Display layout editor = Display layout editor
 Display Resolution (HW scaler) = Resolución de pantalla (escalado por hardware)

assets/lang/gr_EL.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Διορθώνει μικρές ατέλειες υφών με
 Device = Device
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Απενεργοποίηση χρονοβόρων εφέ (άυξηση ταχύτητας)
 Disabled = Απενεργοποιημένο
 Display layout editor = Επεξεργασία διάταξης οθόνης
 Display Resolution (HW scaler) = Ανάλυση οθόνης (Κλιμακοτής hardware)

assets/lang/he_IL.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Fixes visual banding glitches in upscaled textures
 Device = Device
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Disable slower effects (speedup)
 Disabled = Disabled
 Display layout editor = Display layout editor
 Display Resolution (HW scaler) = Display resolution (HW scaler)

assets/lang/he_IL_invert.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Fixes visual banding glitches in upscaled textures
 Device = Device
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Disable slower effects (speedup)
 Disabled = Disabled
 Display layout editor = Display layout editor
 Display Resolution (HW scaler) = Display resolution (HW scaler)

assets/lang/hr_HR.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Popravlja vizualne banding glitcheve u podignutim teksturama
 Device = Uređaj
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Isključite sporije efekte (ubrzava)
 Disabled = Isključeno
 Display layout editor = Prikaz layout uređivača
 Display Resolution (HW scaler) = Prikaz rezolucije (HW mjeritelj)

assets/lang/hu_HU.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Skálázásból eredő kisebb textúra hibák megszüntetése.
 Device = Eszköz
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Lassú effektek letiltása (gyorsítás)
 Disabled = Letiltva
 Display layout editor = Elrendezés szerkesztő
 Display Resolution (HW scaler) = Megjelenítési felbontás (HW skálázó)

assets/lang/id_ID.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Memperbaiki gangguan pita visual pada tekstur yang ditingkatka
 Device = Perangkat
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Matikan efek lambat (mempercepat)
 Disabled = Nonaktif
 Display layout editor = Penyesuaian tata letak tampilan
 Display Resolution (HW scaler) = Resolusi tampilan (penskala HW)

assets/lang/it_IT.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Sistema i possibili problemi visivi nelle texture upscalate
 Device = Dispositivo
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Disattiva gli effetti più lenti (veloce)
 Disabled = Disabilitato
 Display layout editor = Editor Display
 Display Resolution (HW scaler) = Risoluzione Display (scaler HW)

assets/lang/ja_JP.ini

@@ -490,7 +490,6 @@ Deposterize Tip = アップスケールされたテクスチャのバンディ
 Device = デバイス
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = 重いエフェクトを無効にする (高速化)
 Disabled = 無効
 Display layout editor = 画面のレイアウトを編集する
 Display Resolution (HW scaler) = 画面解像度 (HWスケーラー)

assets/lang/jv_ID.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Fixes visual banding glitches in upscaled textures
 Device = Device
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Mateni efek alon (luwih cepet)
 Disabled = Disabled
 Display layout editor = Tata letak Tampilan editor
 Display Resolution (HW scaler) = Resolusi tampilan (HW scaler)

assets/lang/ko_KR.ini

@@ -490,7 +490,6 @@ Deposterize Tip = 업스케일링된 텍스처의 시각적 밴딩 결함 수정
 Device = 장치
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = 느린 효과 비활성화 (속도 향상)
 Disabled = 비활성화
 Display layout editor = 화면 레이아웃 편집기
 Display Resolution (HW scaler) = 화면 해상도(HW 스케일러)

assets/lang/lo_LA.ini

@@ -490,7 +490,6 @@ Deposterize Tip = ແກ້ໄຂການສະແດງຜົນຜິດພ
 Device = Device
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = ປິດເອັບເຟກທີ່ເຮັດໃຫ້ເກມຊ້າ (ໄວຂຶ້ນ)
 Disabled = Disabled
 Display layout editor = ແກ້ໄຂຮູບແບບໜ້າຈໍ
 Display Resolution (HW scaler) = ຄວາມລະອຽດໜ້າຈໍ (ຕາມຮາດແວຣ໌)

assets/lang/lt-LT.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Fixes visual banding glitches in upscaled textures
 Device = Device
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Išjungti lėtesnius efektus (greičio didintojas)
 Disabled = Disabled
 Display layout editor = Display layout editor
 Display Resolution (HW scaler) = Ekrano rezoliucija ("HW" ištiesinimas)

assets/lang/ms_MY.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Fixes visual banding glitches in upscaled textures
 Device = Device
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Disable slower effects (speedup)
 Disabled = Disabled
 Display layout editor = Display layout editor
 Display Resolution (HW scaler) = Display resolution (HW scaler)

assets/lang/nl_NL.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Verhelpt visuele streepglitches in opgeschaalde textures
 Device = Device
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Tragere effecten uitschakelen (sneller)
 Disabled = Disabled
 Display layout editor = Schermweergave bewerken
 Display Resolution (HW scaler) = Schermresolutie (hardware)

assets/lang/no_NO.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Fixes visual banding glitches in upscaled textures
 Device = Device
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Disable slower effects (speedup)
 Disabled = Disabled
 Display layout editor = Display layout editor
 Display Resolution (HW scaler) = Display resolution (HW scaler)

assets/lang/pl_PL.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Poprawia banding koloru na przeskalowanych teksturach
 Device = Urządzenie
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Wył. wolniejsze efekty (przyśpieszenie)
 Disabled = Wył.
 Display layout editor = Edytor położenia obrazu
 Display Resolution (HW scaler) = Rozdzielczość ekranu (skaler sprz.)

assets/lang/pt_BR.ini

@@ -514,7 +514,6 @@ Deposterize Tip = Conserta erros gráficos visuais das faixas nas texturas ampli
 Device = Dispositivo
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Desativa efeitos mais lentos (mais rápido)
 Disabled = Desativado
 Display layout editor = Exibe o editor dos esquemas
 Display Resolution (HW scaler) = Resolução da tela (Dimensionador do hardware)

assets/lang/pt_PT.ini

@@ -514,7 +514,6 @@ Deposterize Tip = Conserta erros gráficos visuais das faixas nas texturas ampli
 Device = Dispositivo
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Desativa efeitos mais lentos (mais rápido)
 Disabled = Desativado
 Display layout editor = Mostrar o editor dos esquemas
 Display Resolution (HW scaler) = Resolução da tela (Dimensionador do hardware)

assets/lang/ro_RO.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Fixes visual banding glitches in upscaled textures
 Device = Device
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Dezactivare efecte lente (mărire viteză)
 Disabled = Disabled
 Display layout editor = Display layout editor
 Display Resolution (HW scaler) = Rezoluție ecran (scalare HW)

assets/lang/ru_RU.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Исправляет полосатость в масштаб
 Device = Устройство
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Отключить медленные эффекты (быстрее)
 Disabled = Отключено
 Display layout editor = Редактор расположения экрана
 Display Resolution (HW scaler) = Разрешение экрана (аппаратное)

assets/lang/sv_SE.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Fixes visual banding glitches in upscaled textures
 Device = Enhet
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Stäng av långsamma effects (speedup)
 Disabled = Avstängd
 Display layout editor = Skärmlayouteditor
 Display Resolution (HW scaler) = Skärmupplösning (HW scaler)

assets/lang/tg_PH.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Fixes visual banding glitches in upscaled textures
 Device = Device
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Wag paganahin ang slower effects (pampa-bilis)
 Disabled = Disabled
 Display layout editor = Display layout editor
 Display Resolution (HW scaler) = Display resolution (HW scaler)

assets/lang/th_TH.ini

@@ -490,7 +490,6 @@ Deposterize Tip = แก้ไขขอบภาพเบลอ หรือภ
 Device = การ์ดจอ
 Direct3D 9 = ไดเร็คท์ 3D 9
 Direct3D 11 = ไดเร็คท์ 3D 11
-Disable slower effects (speedup) = ปิดเอฟเฟ็คท์ที่ทำให้เกมช้า (เร่งความเร็ว)
 Disabled = ปิดการใช้งาน
 Display layout editor = แก้ไขรูปแบบของหน้าจอ
 Display Resolution (HW scaler) = ความละเอียดหน้าจอ (ตามฮาร์ดแวร์)

assets/lang/tr_TR.ini

@@ -492,7 +492,6 @@ Deposterize Tip = Yeniden ölçeklenen dokulardaki görsel şerit hatalarını d
 Device = Cihaz
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Daha yavaş efektleri kapatın (daha hızlı)
 Disabled = Devre dışı
 Display layout editor = Görüntü Düzeni Düzenleyicisi
 Display Resolution (HW scaler) = Görüntü Çözünürlüğü (HW scaler)

assets/lang/uk_UA.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Виправляє візуальні глюки в масшт
 Device = Пристрій
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Вимкнути повільні ефекти (прискорення)
 Disabled = Вимкнено
 Display layout editor = Редактор розташування екрану
 Display Resolution (HW scaler) = Розширення екрану (HW масштабування)

assets/lang/vi_VN.ini

@@ -490,7 +490,6 @@ Deposterize Tip = Sửa lỗi trục trặc hình ảnh trong textures
 Device = Thiết bị
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = Tắt hiệu ứng làm chậm (tăng tốc)
 Disabled = Vô hiệu hóa
 Display layout editor = Chỉnh bố trí hiển thị
 Display Resolution (HW scaler) = Độ phân giải màn hình (HW scaler)

assets/lang/zh_CN.ini

@@ -490,7 +490,6 @@ Deposterize Tip = 修复纹理被放大时可见的带状错误
 Device = 设备
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = 停用较慢的渲染效果(提速)
 Disabled = 禁用
 Display layout editor = 显示布局编辑器
 Display Resolution (HW scaler) = 显示分辨率(硬件缩放)

assets/lang/zh_TW.ini

@@ -494,7 +494,6 @@ Deposterize Tip = 修復在紋理被放大時可能發生的小紋理內部毛
 Device = 設備
 Direct3D 9 = Direct3D 9
 Direct3D 11 = Direct3D 11
-Disable slower effects (speedup) = 停用較慢的效果(提升速度)
 Disabled = 已禁用
 Display layout editor = 自訂版面
 Display Resolution (HW scaler) = 顯示解析度(硬體縮放)

libretro/libretro.cpp

@@ -563,7 +563,6 @@ static RetroOption<bool> ppsspp_lazy_texture_caching("ppsspp_lazy_texture_cachin
 static RetroOption<bool> ppsspp_retain_changed_textures("ppsspp_retain_changed_textures", "Retain changed textures (Speedup, mem hog)", false);
 static RetroOption<bool> ppsspp_force_lag_sync("ppsspp_force_lag_sync", "Force real clock sync (Slower, less lag)", false);
 static RetroOption<int> ppsspp_spline_quality("ppsspp_spline_quality", "Spline/Bezier curves quality", { {"Low", 0}, {"Medium", 1}, {"High", 2} });
-static RetroOption<bool> ppsspp_disable_shader_blending("ppsspp_disable_slow_framebuffer_effects", "Disable shader blending (speedup)", false);
 static RetroOption<bool> ppsspp_enable_wlan("ppsspp_enable_wlan", "Enable Networking/WLAN (beta, may break games)", false);
 static RetroOption<std::string> ppsspp_change_mac_address[] = {
     {"ppsspp_change_mac_address01", "MAC address Pt  1: X-:--:--:--:--:--", MAC_INITIALIZER_LIST},
@@ -699,7 +698,6 @@ void retro_set_environment(retro_environment_t cb)
    vars.push_back(ppsspp_lazy_texture_caching.GetOptions());
    vars.push_back(ppsspp_retain_changed_textures.GetOptions());
    vars.push_back(ppsspp_force_lag_sync.GetOptions());
-   vars.push_back(ppsspp_disable_shader_blending.GetOptions());
    vars.push_back(ppsspp_lower_resolution_for_effects.GetOptions());
    vars.push_back(ppsspp_texture_scaling_level.GetOptions());
    vars.push_back(ppsspp_texture_scaling_type.GetOptions());
@@ -831,7 +829,6 @@ static void check_variables(CoreParameter &coreParam)
    ppsspp_retain_changed_textures.Update(&g_Config.bTextureSecondaryCache);
    ppsspp_force_lag_sync.Update(&g_Config.bForceLagSync);
    ppsspp_spline_quality.Update(&g_Config.iSplineBezierQuality);
-   ppsspp_disable_shader_blending.Update(&g_Config.bDisableShaderBlending);
    ppsspp_inflight_frames.Update(&g_Config.iInflightFrames);
    const bool do_scaling_type_update = ppsspp_texture_scaling_type.Update(&g_Config.iTexScalingType);
    const bool do_scaling_level_update = ppsspp_texture_scaling_level.Update(&g_Config.iTexScalingLevel);