Title: [159590] trunk/Source/WebCore
Revision
159590
Author
[email protected]
Date
2013-11-20 16:05:31 -0800 (Wed, 20 Nov 2013)

Log Message

Use compile flag SH_UNFOLD_SHORT_CIRCUIT when compiling shaders.
https://bugs.webkit.org/show_bug.cgi?id=124684.

Reviewed by Brent Fulgham.

Existing test webgl/1.0.2/conformance/glsl/misc/shader-with-short-circuiting-operators.html

* platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
(WebCore::Extensions3DOpenGLCommon::getTranslatedShaderSourceANGLE):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (159589 => 159590)


--- trunk/Source/WebCore/ChangeLog	2013-11-20 23:55:08 UTC (rev 159589)
+++ trunk/Source/WebCore/ChangeLog	2013-11-21 00:05:31 UTC (rev 159590)
@@ -1,3 +1,15 @@
+2013-11-20  Roger Fong  <[email protected]>
+
+        Use compile flag SH_UNFOLD_SHORT_CIRCUIT when compiling shaders.
+        https://bugs.webkit.org/show_bug.cgi?id=124684.
+
+        Reviewed by Brent Fulgham.
+
+        Existing test webgl/1.0.2/conformance/glsl/misc/shader-with-short-circuiting-operators.html
+
+        * platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
+        (WebCore::Extensions3DOpenGLCommon::getTranslatedShaderSourceANGLE):
+
 2013-11-20  Robert Sipka  <[email protected]>
 
         [curl] Improve detecting and handling of SSL related errors

Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp (159589 => 159590)


--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp	2013-11-20 23:55:08 UTC (rev 159589)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp	2013-11-21 00:05:31 UTC (rev 159590)
@@ -170,7 +170,7 @@
 
     String translatedShaderSource;
     String shaderInfoLog;
-    int extraCompileOptions = SH_MAP_LONG_VARIABLE_NAMES | SH_CLAMP_INDIRECT_ARRAY_BOUNDS;
+    int extraCompileOptions = SH_MAP_LONG_VARIABLE_NAMES | SH_CLAMP_INDIRECT_ARRAY_BOUNDS | SH_UNFOLD_SHORT_CIRCUIT;
 
     if (m_requiresBuiltInFunctionEmulation)
         extraCompileOptions |= SH_EMULATE_BUILT_IN_FUNCTIONS;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to