Changeset 269040 in webkit

Timestamp:

Oct 27, 2020 8:34:01 AM (3 years ago)

Author:

magomez@igalia.com

Message:

[WPE] REGRESSION(r268992) Redefinition of min() inside TextureMapperShaderProgram for GLES > 3.0
​https://bugs.webkit.org/show_bug.cgi?id=218231

Reviewed by Sergio Villar Senin.

Remove the definition of the min() function and replace its usage with an if. This works for
every GLSL version.

• platform/graphics/texmap/TextureMapperShaderProgram.cpp:

(WebCore::TextureMapperShaderProgram::create):
(WebCore::STRINGIFY): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/texmap/TextureMapperShaderProgram.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-27  Miguel Gomez  <magomez@igalia.com>
+
+        [WPE] REGRESSION(r268992) Redefinition of min() inside TextureMapperShaderProgram for GLES > 3.0
+        https://bugs.webkit.org/show_bug.cgi?id=218231
+
+        Reviewed by Sergio Villar Senin.
+
+        Remove the definition of the min() function and replace its usage with an if. This works for
+        every GLSL version.
+
+        * platform/graphics/texmap/TextureMapperShaderProgram.cpp:
+        (WebCore::TextureMapperShaderProgram::create):
+        (WebCore::STRINGIFY): Deleted.
+
 2020-10-27  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp

@@ -225 +225 @@
         in vec2 v_transformedTexCoord;
         in vec4 v_nonProjectedPosition;
-    );
-#else
-// min(genIType) isn't supported for GLSL ES < 3.0.
-static const char* fragmentTemplateES =
-    STRINGIFY(
-        int min(int x, int y)
-        {
-            if (x < y)
-                return x;
-            return y;
-        }
     );
 #endif
@@ -478 +467 @@
             // and the projection screws the Z component. We need the real 3D position that comes from
             // the nonProjectedPosition variable.
-            int nRects = min(ROUNDED_RECT_MAX_RECTS, u_roundedRectNumber);
+            int nRects = u_roundedRectNumber;
+            if (nRects > ROUNDED_RECT_MAX_RECTS)
+                nRects = ROUNDED_RECT_MAX_RECTS;
+
             for (int rectIndex = 0; rectIndex < nRects; rectIndex++) {
                 vec4 fragCoord = u_roundedRectInverseTransformMatrix[rectIndex] * v_nonProjectedPosition;
@@ -588 +580 @@
 #if USE(OPENGL_ES)
     fragmentShaderBuilder.append(fragmentTemplateLT320Vars);
-    fragmentShaderBuilder.append(fragmentTemplateES);
 #else
     if (glVersion >= 320)