Title: [268992] trunk/Source/WebCore
- Revision
- 268992
- Author
- [email protected]
- Date
- 2020-10-26 12:57:35 -0700 (Mon, 26 Oct 2020)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (268991 => 268992)
--- trunk/Source/WebCore/ChangeLog 2020-10-26 19:54:45 UTC (rev 268991)
+++ trunk/Source/WebCore/ChangeLog 2020-10-26 19:57:35 UTC (rev 268992)
@@ -1,3 +1,17 @@
+2020-10-26 Fujii Hironori <[email protected]>
+
+ [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 <[email protected]>
JSC special function forward declarations (e.g. JSC_DECLARE_HOST_FUNCTION) that are internal to a cpp file should be declared with static to avoid external linkage
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp (268991 => 268992)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp 2020-10-26 19:54:45 UTC (rev 268991)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp 2020-10-26 19:57:35 UTC (rev 268992)
@@ -225,6 +225,17 @@
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
static const char* fragmentTemplateCommon =
@@ -576,6 +587,7 @@
// Append the appropriate input/output variable definitions.
#if USE(OPENGL_ES)
fragmentShaderBuilder.append(fragmentTemplateLT320Vars);
+ fragmentShaderBuilder.append(fragmentTemplateES);
#else
if (glVersion >= 320)
fragmentShaderBuilder.append(fragmentTemplateGE320Vars);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
