From 7151848406ac6e5a559a3a098b84557bd2789146 Mon Sep 17 00:00:00 2001 From: lightningterror <18107717+lightningterror@users.noreply.github.com> Date: Fri, 18 Feb 2022 12:24:32 +0100 Subject: [PATCH] GS-hw: Rename alpha_clamp to blend_mix. --- bin/resources/shaders/dx11/tfx.fx | 4 ++-- bin/resources/shaders/opengl/tfx_fs.glsl | 2 +- bin/resources/shaders/vulkan/tfx.glsl | 2 +- pcsx2/GS/Renderers/Common/GSDevice.h | 2 +- pcsx2/GS/Renderers/DX11/GSTextureFX11.cpp | 2 +- pcsx2/GS/Renderers/HW/GSRendererNew.cpp | 2 +- pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.cpp | 2 +- pcsx2/GS/Renderers/Vulkan/GSDeviceVK.cpp | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bin/resources/shaders/dx11/tfx.fx b/bin/resources/shaders/dx11/tfx.fx index 08a1cdc22a..527bbb2ea3 100644 --- a/bin/resources/shaders/dx11/tfx.fx +++ b/bin/resources/shaders/dx11/tfx.fx @@ -49,7 +49,7 @@ #define PS_BLEND_B 0 #define PS_BLEND_C 0 #define PS_BLEND_D 0 -#define PS_ALPHA_CLAMP 0 +#define PS_BLEND_MIX 0 #define PS_PABE 0 #define PS_DITHER 0 #define PS_ZCLAMP 0 @@ -749,7 +749,7 @@ void ps_blend(inout float4 Color, float As, float2 pos_xy) float3 D = (PS_BLEND_D == 0) ? Cs : ((PS_BLEND_D == 1) ? Cd : (float3)0.0f); // As/Af clamp alpha for Blend mix - if (PS_ALPHA_CLAMP) + if (PS_BLEND_MIX) C = min(C, (float)1.0f); Color.rgb = (PS_BLEND_A == PS_BLEND_B) ? D : trunc(((A - B) * C) + D); diff --git a/bin/resources/shaders/opengl/tfx_fs.glsl b/bin/resources/shaders/opengl/tfx_fs.glsl index b9e09f867b..33017d91cb 100644 --- a/bin/resources/shaders/opengl/tfx_fs.glsl +++ b/bin/resources/shaders/opengl/tfx_fs.glsl @@ -706,7 +706,7 @@ void ps_blend(inout vec4 Color, float As) #endif // As/Af clamp alpha for Blend mix -#if PS_ALPHA_CLAMP +#if PS_BLEND_MIX C = min(C, float(1.0f)); #endif diff --git a/bin/resources/shaders/vulkan/tfx.glsl b/bin/resources/shaders/vulkan/tfx.glsl index 754568fa7b..2602939a66 100644 --- a/bin/resources/shaders/vulkan/tfx.glsl +++ b/bin/resources/shaders/vulkan/tfx.glsl @@ -1046,7 +1046,7 @@ void ps_blend(inout vec4 Color, float As) #endif // As/Af clamp alpha for Blend mix - #if PS_ALPHA_CLAMP + #if PS_BLEND_MIX C = min(C, 1.0f); #endif diff --git a/pcsx2/GS/Renderers/Common/GSDevice.h b/pcsx2/GS/Renderers/Common/GSDevice.h index ec54721c45..2296ea68a7 100644 --- a/pcsx2/GS/Renderers/Common/GSDevice.h +++ b/pcsx2/GS/Renderers/Common/GSDevice.h @@ -231,7 +231,7 @@ struct alignas(16) GSHWDrawConfig u32 clr_hw : 3; u32 hdr : 1; u32 colclip : 1; - u32 alpha_clamp : 1; + u32 blend_mix : 1; u32 pabe : 1; // Others ways to fetch the texture diff --git a/pcsx2/GS/Renderers/DX11/GSTextureFX11.cpp b/pcsx2/GS/Renderers/DX11/GSTextureFX11.cpp index dd6c133307..1110451aa8 100644 --- a/pcsx2/GS/Renderers/DX11/GSTextureFX11.cpp +++ b/pcsx2/GS/Renderers/DX11/GSTextureFX11.cpp @@ -187,7 +187,7 @@ void GSDevice11::SetupPS(PSSelector sel, const GSHWDrawConfig::PSConstantBuffer* sm.AddMacro("PS_BLEND_B", sel.blend_b); sm.AddMacro("PS_BLEND_C", sel.blend_c); sm.AddMacro("PS_BLEND_D", sel.blend_d); - sm.AddMacro("PS_ALPHA_CLAMP", sel.alpha_clamp); + sm.AddMacro("PS_BLEND_MIX", sel.blend_mix); sm.AddMacro("PS_PABE", sel.pabe); sm.AddMacro("PS_DITHER", sel.dither); sm.AddMacro("PS_ZCLAMP", sel.zclamp); diff --git a/pcsx2/GS/Renderers/HW/GSRendererNew.cpp b/pcsx2/GS/Renderers/HW/GSRendererNew.cpp index c21bc01a91..7364054d3b 100644 --- a/pcsx2/GS/Renderers/HW/GSRendererNew.cpp +++ b/pcsx2/GS/Renderers/HW/GSRendererNew.cpp @@ -796,7 +796,7 @@ void GSRendererNew::EmulateBlending(bool& DATE_PRIMID, bool& DATE_BARRIER) else if (blend_mix) { m_conf.blend = {blend_index, ALPHA.FIX, ALPHA.C == 2, false, true}; - m_conf.ps.alpha_clamp = 1; + m_conf.ps.blend_mix = 1; if (blend_mix1) { diff --git a/pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.cpp b/pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.cpp index 458094a9cc..923ee196c7 100644 --- a/pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.cpp +++ b/pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.cpp @@ -1111,7 +1111,7 @@ std::string GSDeviceOGL::GetPSSource(PSSelector sel) + format("#define PS_HDR %d\n", sel.hdr) + format("#define PS_DITHER %d\n", sel.dither) + format("#define PS_ZCLAMP %d\n", sel.zclamp) - + format("#define PS_ALPHA_CLAMP %d\n", sel.alpha_clamp) + + format("#define PS_BLEND_MIX %d\n", sel.blend_mix) + format("#define PS_PABE %d\n", sel.pabe) + format("#define PS_SCANMSK %d\n", sel.scanmsk) + format("#define PS_SCALE_FACTOR %d\n", GSConfig.UpscaleMultiplier) diff --git a/pcsx2/GS/Renderers/Vulkan/GSDeviceVK.cpp b/pcsx2/GS/Renderers/Vulkan/GSDeviceVK.cpp index 640d3c7de4..2083f4f09a 100644 --- a/pcsx2/GS/Renderers/Vulkan/GSDeviceVK.cpp +++ b/pcsx2/GS/Renderers/Vulkan/GSDeviceVK.cpp @@ -1802,7 +1802,7 @@ VkShaderModule GSDeviceVK::GetTFXFragmentShader(GSHWDrawConfig::PSSelector sel) AddMacro(ss, "PS_BLEND_B", sel.blend_b); AddMacro(ss, "PS_BLEND_C", sel.blend_c); AddMacro(ss, "PS_BLEND_D", sel.blend_d); - AddMacro(ss, "PS_ALPHA_CLAMP", sel.alpha_clamp); + AddMacro(ss, "PS_BLEND_MIX", sel.blend_mix); AddMacro(ss, "PS_IIP", sel.iip); AddMacro(ss, "PS_SHUFFLE", sel.shuffle); AddMacro(ss, "PS_READ_BA", sel.read_ba);