diff --git a/Source/Core/VideoCommon/UberShaderPixel.cpp b/Source/Core/VideoCommon/UberShaderPixel.cpp index 62979e3fee..97bab4385b 100644 --- a/Source/Core/VideoCommon/UberShaderPixel.cpp +++ b/Source/Core/VideoCommon/UberShaderPixel.cpp @@ -56,11 +56,7 @@ ShaderCode GenPixelShader(APIType api_type, const ShaderHostConfig& host_config, const bool use_dual_source = host_config.backend_dual_source_blend; const bool use_shader_blend = !use_dual_source && host_config.backend_shader_framebuffer_fetch; const bool use_shader_logic_op = -#ifdef __APPLE__ !host_config.backend_logic_op && host_config.backend_shader_framebuffer_fetch; -#else - false; -#endif const bool use_framebuffer_fetch = use_shader_blend || use_shader_logic_op; const bool early_depth = uid_data->early_depth != 0; const bool per_pixel_depth = uid_data->per_pixel_depth != 0; @@ -105,40 +101,24 @@ ShaderCode GenPixelShader(APIType api_type, const ShaderHostConfig& host_config, out.Write("INPUT_ATTACHMENT_BINDING(0, 0, 0) uniform subpassInput in_ocol0;\n"); } } - else if (use_dual_source) -#else - if (use_dual_source) + else #endif { - if (DriverDetails::HasBug(DriverDetails::BUG_BROKEN_FRAGMENT_SHADER_INDEX_DECORATION)) + bool has_broken_decoration = + DriverDetails::HasBug(DriverDetails::BUG_BROKEN_FRAGMENT_SHADER_INDEX_DECORATION); + + out.Write("{} {} vec4 {};\n", + has_broken_decoration ? "FRAGMENT_OUTPUT_LOCATION(0)" : + "FRAGMENT_OUTPUT_LOCATION_INDEXED(0, 0)", + use_framebuffer_fetch ? "FRAGMENT_INOUT" : "out", + use_shader_blend ? "real_ocol0" : "ocol0"); + + if (use_dual_source) { - out.Write("FRAGMENT_OUTPUT_LOCATION(0) out vec4 ocol0;\n" - "FRAGMENT_OUTPUT_LOCATION(1) out vec4 ocol1;\n"); + out.Write("{} out vec4 ocol1;\n", has_broken_decoration ? + "FRAGMENT_OUTPUT_LOCATION(1)" : + "FRAGMENT_OUTPUT_LOCATION_INDEXED(0, 1)"); } - else - { - out.Write("FRAGMENT_OUTPUT_LOCATION_INDEXED(0, 0) out vec4 ocol0;\n" - "FRAGMENT_OUTPUT_LOCATION_INDEXED(0, 1) out vec4 ocol1;\n"); - } - } - else if (use_shader_blend) - { - // QComm's Adreno driver doesn't seem to like using the framebuffer_fetch value as an - // intermediate value with multiple reads & modifications, so pull out the "real" output value - // and use a temporary for calculations, then set the output value once at the end of the - // shader - if (DriverDetails::HasBug(DriverDetails::BUG_BROKEN_FRAGMENT_SHADER_INDEX_DECORATION)) - { - out.Write("FRAGMENT_OUTPUT_LOCATION(0) FRAGMENT_INOUT vec4 real_ocol0;\n"); - } - else - { - out.Write("FRAGMENT_OUTPUT_LOCATION_INDEXED(0, 0) FRAGMENT_INOUT vec4 real_ocol0;\n"); - } - } - else - { - out.Write("FRAGMENT_OUTPUT_LOCATION(0) out vec4 ocol0;\n"); } if (per_pixel_depth) @@ -719,12 +699,24 @@ ShaderCode GenPixelShader(APIType api_type, const ShaderHostConfig& host_config, if (use_framebuffer_fetch) { - // Store off a copy of the initial fb value for blending - out.Write(" float4 initial_ocol0 = FB_FETCH_VALUE;\n"); + // Store off a copy of the initial framebuffer value. + // + // If FB_FETCH_VALUE isn't defined (i.e. no special keyword for fetching from the + // framebuffer), we read from real_ocol0 or ocol0, depending if shader blending is enabled. + out.Write("#ifdef FB_FETCH_VALUE\n" + " float4 initial_ocol0 = FB_FETCH_VALUE;\n" + "#else\n" + " float4 initial_ocol0 = {};\n" + "#endif\n", + use_shader_blend ? "real_ocol0" : "ocol0"); } if (use_shader_blend) { + // QComm's Adreno driver doesn't seem to like using the framebuffer_fetch value as an + // intermediate value with multiple reads & modifications, so we pull out the "real" output + // value above and use a temporary for calculations, then set the output value once at the + // end of the shader if we are using shader blending. out.Write(" float4 ocol0;\n" " float4 ocol1;\n"); }