commit 4882e9a43d4a3b1cb896187e3ec109318d25dbac
author Brian Osman <brianosman@google.com> Mon Feb 22 17:17:46 2021 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Feb 23 15:45:55 2021 +0000
tree 6bc1d1d2b6930dc58987abcf0f18ea9022974444
parent 2b3d1f2086964639ff6f6eadcb7803403e3c2cef

Remove specific blend mode layout qualifiers

These were unused - we always enable the advanced blend equation
extension using "blend_support_all_equations" (if enabling the
extension is required at all).

Change-Id: I95fd6483ec54dfaf983290de95629fe0e86c22e8
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/373877
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>
Reviewed-by: Chris Dalton <csmartdalton@google.com>

src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp

diff --git a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
index fe12fbd..bb9741d 100644
--- a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
+++ b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
@@ -15,48 +15,6 @@
 
 const char* GrGLSLFragmentShaderBuilder::kDstColorName = "_dstColor";
 
-static const char* specific_layout_qualifier_name(GrBlendEquation equation) {
-    SkASSERT(GrBlendEquationIsAdvanced(equation));
-
-    static const char* kLayoutQualifierNames[] = {
-        "blend_support_screen",
-        "blend_support_overlay",
-        "blend_support_darken",
-        "blend_support_lighten",
-        "blend_support_colordodge",
-        "blend_support_colorburn",
-        "blend_support_hardlight",
-        "blend_support_softlight",
-        "blend_support_difference",
-        "blend_support_exclusion",
-        "blend_support_multiply",
-        "blend_support_hsl_hue",
-        "blend_support_hsl_saturation",
-        "blend_support_hsl_color",
-        "blend_support_hsl_luminosity"
-    };
-    return kLayoutQualifierNames[equation - kFirstAdvancedGrBlendEquation];
-
-    static_assert(0 == kScreen_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    static_assert(1 == kOverlay_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    static_assert(2 == kDarken_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    static_assert(3 == kLighten_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    static_assert(4 == kColorDodge_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    static_assert(5 == kColorBurn_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    static_assert(6 == kHardLight_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    static_assert(7 == kSoftLight_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    static_assert(8 == kDifference_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    static_assert(9 == kExclusion_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    static_assert(10 == kMultiply_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    static_assert(11 == kHSLHue_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    static_assert(12 == kHSLSaturation_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    static_assert(13 == kHSLColor_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    static_assert(14 == kHSLLuminosity_GrBlendEquation - kFirstAdvancedGrBlendEquation);
-    // There's an illegal GrBlendEquation at the end there, hence the -1.
-    static_assert(SK_ARRAY_COUNT(kLayoutQualifierNames) ==
-                  kGrBlendEquationCnt - kFirstAdvancedGrBlendEquation - 1);
-}
-
 uint8_t GrGLSLFragmentShaderBuilder::KeyForSurfaceOrigin(GrSurfaceOrigin origin) {
     SkASSERT(kTopLeft_GrSurfaceOrigin == origin || kBottomLeft_GrSurfaceOrigin == origin);
     return origin + 1;
@@ -223,16 +181,9 @@
 void GrGLSLFragmentShaderBuilder::enableAdvancedBlendEquationIfNeeded(GrBlendEquation equation) {
     SkASSERT(GrBlendEquationIsAdvanced(equation));
 
-    const GrShaderCaps& caps = *fProgramBuilder->shaderCaps();
-    if (!caps.mustEnableAdvBlendEqs()) {
-        return;
-    }
-
-    this->addFeature(1 << kBlendEquationAdvanced_GLSLPrivateFeature,
-                     "GL_KHR_blend_equation_advanced");
-    if (caps.mustEnableSpecificAdvBlendEqs()) {
-        this->addLayoutQualifier(specific_layout_qualifier_name(equation), kOut_InterfaceQualifier);
-    } else {
+    if (fProgramBuilder->shaderCaps()->mustEnableAdvBlendEqs()) {
+        this->addFeature(1 << kBlendEquationAdvanced_GLSLPrivateFeature,
+                         "GL_KHR_blend_equation_advanced");
         this->addLayoutQualifier("blend_support_all_equations", kOut_InterfaceQualifier);
     }
 }