Changeset 225800 in webkit

Timestamp:

Dec 12, 2017 1:11:11 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

WebGL TextureMapperShaderProgram shaders don't compile in MSVC
​https://bugs.webkit.org/show_bug.cgi?id=180709

Patch by Christopher Reid <​chris.reid@sony.com> on 2017-12-12
Reviewed by Myles C. Maxfield.

No new tests, no change in behavior.

Vertex and Fragment shaders were not compiling because TextureMapperShaderProgram.cpp was
stringifying "#if USE(OPENGL_ES_2) ... #endif" into the shaders rather than evaluating these
preprocessor directives before the STRINGIFY expansion.

Moved these #if conditions outside of STRINGIFY to remove compiler ambiguity.

• platform/graphics/texmap/TextureMapperShaderProgram.cpp:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-12-12  Christopher Reid  <chris.reid@sony.com>
+
+        WebGL TextureMapperShaderProgram shaders don't compile in MSVC
+        https://bugs.webkit.org/show_bug.cgi?id=180709
+
+        Reviewed by Myles C. Maxfield.
+
+        No new tests, no change in behavior.
+
+        Vertex and Fragment shaders were not compiling because TextureMapperShaderProgram.cpp was
+        stringifying "#if USE(OPENGL_ES_2) ... #endif" into the shaders rather than evaluating these
+        preprocessor directives before the STRINGIFY expansion.
+
+        Moved these #if conditions outside of STRINGIFY to remove compiler ambiguity.
+
+        * platform/graphics/texmap/TextureMapperShaderProgram.cpp:
+
 2017-12-12  Zach Li  <zachli@apple.com>
         [WK2] Expose image via WKBundleHitTestResult API.

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

@@ -59 +59 @@
     TEXTURE_SPACE_MATRIX_PRECISION_DIRECTIVE
 #endif
-    STRINGIFY(
-#if USE(OPENGL_ES_2)
+#if USE(OPENGL_ES_2)
+    STRINGIFY(
         precision TextureSpaceMatrixPrecision float;
-#endif
+    )
+#endif
+    STRINGIFY(
         attribute vec4 a_vertex;
         varying vec2 v_texCoord;
@@ -169 +171 @@
     TEXTURE_SPACE_MATRIX_PRECISION_DIRECTIVE
 #endif
-    STRINGIFY(
-#if USE(OPENGL_ES_2)
+#if USE(OPENGL_ES_2)
+    STRINGIFY(
         precision TextureSpaceMatrixPrecision float;
-#endif
+    )
+#endif
+    STRINGIFY(
         uniform mat4 u_textureSpaceMatrix;
         uniform mat4 u_textureColorSpaceMatrix;
-#if USE(OPENGL_ES_2)
+    )
+#if USE(OPENGL_ES_2)
+    STRINGIFY(
         precision mediump float;
-#endif
-    );
+    )
+#endif
+    ;
 
 // Input/output variables definition for both GLES and OpenGL < 3.2.