diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2018-08-28 15:45:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-28 15:45:43 +0200 |
| commit | 3d560630f5c149b4eff85ad43a73d7f53dab083a (patch) | |
| tree | 43dddf9b806675c3fe037c5d4e1bd2e0c885f7a1 /Source/Core/VideoCommon/UberShaderPixel.cpp | |
| parent | 8206e4862c172e065967ce5d18cac55bbd78279e (diff) | |
| parent | 3ad7812b53fd4faab44b1c36b198de126b8a18ed (diff) | |
Merge pull request #7379 from stenzek/drop-vulkan-index-decoration-workaround
ShaderGen: Drop broken fragment shader index workaround for Vulkan
Diffstat (limited to 'Source/Core/VideoCommon/UberShaderPixel.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/UberShaderPixel.cpp | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/Source/Core/VideoCommon/UberShaderPixel.cpp b/Source/Core/VideoCommon/UberShaderPixel.cpp index 9c9630886a..cd188d4de9 100644 --- a/Source/Core/VideoCommon/UberShaderPixel.cpp +++ b/Source/Core/VideoCommon/UberShaderPixel.cpp @@ -69,16 +69,8 @@ ShaderCode GenPixelShader(APIType ApiType, const ShaderHostConfig& host_config, { if (use_dual_source) { - if (DriverDetails::HasBug(DriverDetails::BUG_BROKEN_FRAGMENT_SHADER_INDEX_DECORATION)) - { - out.Write("FRAGMENT_OUTPUT_LOCATION(0) out vec4 ocol0;\n"); - out.Write("FRAGMENT_OUTPUT_LOCATION(1) out vec4 ocol1;\n"); - } - else - { - out.Write("FRAGMENT_OUTPUT_LOCATION_INDEXED(0, 0) out vec4 ocol0;\n"); - out.Write("FRAGMENT_OUTPUT_LOCATION_INDEXED(0, 1) out vec4 ocol1;\n"); - } + out.Write("FRAGMENT_OUTPUT_LOCATION_INDEXED(0, 0) out vec4 ocol0;\n"); + out.Write("FRAGMENT_OUTPUT_LOCATION_INDEXED(0, 1) out vec4 ocol1;\n"); } else if (use_shader_blend) { @@ -86,14 +78,7 @@ ShaderCode GenPixelShader(APIType ApiType, const ShaderHostConfig& host_config, // 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"); - } + out.Write("FRAGMENT_OUTPUT_LOCATION_INDEXED(0, 0) FRAGMENT_INOUT vec4 real_ocol0;\n"); } else { |