Changeset 268992 in webkit

Timestamp:

Oct 26, 2020 12:57:35 PM (3 years ago)

Author:

Fujii Hironori

Message:

[TextureMapper] min(genIType) isn't supported for GLSL ES < 3.0
​https://bugs.webkit.org/show_bug.cgi?id=218164

Reviewed by Don Olmstead.

Nothing is drawn in AC mode of WinCairo port since r268923.
r268923 added a shader code of using min of int type which is
supported since GLSL ES 3.0.

• platform/graphics/texmap/TextureMapperShaderProgram.cpp: Added fragmentTemplateES to define int type of min.

(WebCore::TextureMapperShaderProgram::create):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-26  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [TextureMapper] min(genIType) isn't supported for GLSL ES < 3.0
+        https://bugs.webkit.org/show_bug.cgi?id=218164
+
+        Reviewed by Don Olmstead.
+
+        Nothing is drawn in AC mode of WinCairo port since r268923.
+        r268923 added a shader code of using min of int type which is
+        supported since GLSL ES 3.0.
+
+        * platform/graphics/texmap/TextureMapperShaderProgram.cpp: Added fragmentTemplateES to define int type of min.
+        (WebCore::TextureMapperShaderProgram::create):
+
 2020-10-26  Sam Weinig  <weinig@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
@@ -577 +588 @@
 #if USE(OPENGL_ES)
     fragmentShaderBuilder.append(fragmentTemplateLT320Vars);
+    fragmentShaderBuilder.append(fragmentTemplateES);
 #else
     if (glVersion >= 320)