[webkit-changes] [225409] trunk/Source/WebCore

Fri, 01 Dec 2017 13:51:06 -0800

Title: [225409] trunk/Source/WebCore
Revision
225409
Author
[email protected]
Date
2017-12-01 13:50:37 -0800 (Fri, 01 Dec 2017)

Log Message

Attempted build fix.

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


Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (225408 => 225409)


--- trunk/Source/WebCore/ChangeLog	2017-12-01 21:44:48 UTC (rev 225408)
+++ trunk/Source/WebCore/ChangeLog	2017-12-01 21:50:37 UTC (rev 225409)
@@ -1,5 +1,15 @@
 2017-12-01  Dean Jackson  <[email protected]>
 
+        Attempted build fix.
+
+        * platform/graphics/ANGLEWebKitBridge.cpp:
+        (WebCore::ANGLEWebKitBridge::compileShaderSource):
+        * platform/graphics/ANGLEWebKitBridge.h:
+        * platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
+        (WebCore::Extensions3DOpenGLCommon::getTranslatedShaderSourceANGLE):
+
+2017-12-01  Dean Jackson  <[email protected]>
+
         Use SH_INITIALIZE_UNINITIALIZED_LOCALS now that ANGLE has been updated
         https://bugs.webkit.org/show_bug.cgi?id=177929
         <rdar://problem/34866210>

Modified: trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp (225408 => 225409)


--- trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp	2017-12-01 21:44:48 UTC (rev 225408)
+++ trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp	2017-12-01 21:50:37 UTC (rev 225409)
@@ -160,7 +160,7 @@
     m_resources = resources;
 }
 
-bool ANGLEWebKitBridge::compileShaderSource(const char* shaderSource, ANGLEShaderType shaderType, String& translatedShaderSource, String& shaderValidationLog, Vector<std::pair<ANGLEShaderSymbolType, sh::ShaderVariable>>& symbols, long extraCompileOptions)
+bool ANGLEWebKitBridge::compileShaderSource(const char* shaderSource, ANGLEShaderType shaderType, String& translatedShaderSource, String& shaderValidationLog, Vector<std::pair<ANGLEShaderSymbolType, sh::ShaderVariable>>& symbols, unsigned long extraCompileOptions)
 {
     if (!builtCompilers) {
         m_fragmentCompiler = sh::ConstructCompiler(GL_FRAGMENT_SHADER, m_shaderSpec, m_shaderOutput, &m_resources);

Modified: trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h (225408 => 225409)


--- trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h	2017-12-01 21:44:48 UTC (rev 225408)
+++ trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h	2017-12-01 21:50:37 UTC (rev 225409)
@@ -73,7 +73,7 @@
     const ShBuiltInResources& getResources() { return m_resources; }
     void setResources(const ShBuiltInResources&);
     
-    bool compileShaderSource(const char* shaderSource, ANGLEShaderType, String& translatedShaderSource, String& shaderValidationLog, Vector<std::pair<ANGLEShaderSymbolType, sh::ShaderVariable>>& symbols, long extraCompileOptions = 0);
+    bool compileShaderSource(const char* shaderSource, ANGLEShaderType, String& translatedShaderSource, String& shaderValidationLog, Vector<std::pair<ANGLEShaderSymbolType, sh::ShaderVariable>>& symbols, unsigned long extraCompileOptions = 0);
 
 private:

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


--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp	2017-12-01 21:44:48 UTC (rev 225408)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp	2017-12-01 21:50:37 UTC (rev 225409)
@@ -186,7 +186,7 @@
 
     String translatedShaderSource;
     String shaderInfoLog;
-    long extraCompileOptions = SH_CLAMP_INDIRECT_ARRAY_BOUNDS | SH_UNFOLD_SHORT_CIRCUIT | SH_INIT_OUTPUT_VARIABLES | SH_ENFORCE_PACKING_RESTRICTIONS | SH_LIMIT_EXPRESSION_COMPLEXITY | SH_LIMIT_CALL_STACK_DEPTH | SH_INITIALIZE_UNINITIALIZED_LOCALS;
+    unsigned long extraCompileOptions = SH_CLAMP_INDIRECT_ARRAY_BOUNDS | SH_UNFOLD_SHORT_CIRCUIT | SH_INIT_OUTPUT_VARIABLES | SH_ENFORCE_PACKING_RESTRICTIONS | SH_LIMIT_EXPRESSION_COMPLEXITY | SH_LIMIT_CALL_STACK_DEPTH | SH_INITIALIZE_UNINITIALIZED_LOCALS;
 
     if (m_requiresBuiltInFunctionEmulation)
         extraCompileOptions |= SH_EMULATE_ABS_INT_FUNCTION;

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to