Title: [225410] trunk/Source/WebCore/platform/graphics
- Revision
- 225410
- Author
- [email protected]
- Date
- 2017-12-01 13:58:10 -0800 (Fri, 01 Dec 2017)
Log Message
Another attempt to fix 32-bit, this time with a bit more thought!
* 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/platform/graphics/ANGLEWebKitBridge.cpp (225409 => 225410)
--- trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp 2017-12-01 21:50:37 UTC (rev 225409)
+++ trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp 2017-12-01 21:58:10 UTC (rev 225410)
@@ -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, unsigned long extraCompileOptions)
+bool ANGLEWebKitBridge::compileShaderSource(const char* shaderSource, ANGLEShaderType shaderType, String& translatedShaderSource, String& shaderValidationLog, Vector<std::pair<ANGLEShaderSymbolType, sh::ShaderVariable>>& symbols, uint64_t extraCompileOptions)
{
if (!builtCompilers) {
m_fragmentCompiler = sh::ConstructCompiler(GL_FRAGMENT_SHADER, m_shaderSpec, m_shaderOutput, &m_resources);
Modified: trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h (225409 => 225410)
--- trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h 2017-12-01 21:50:37 UTC (rev 225409)
+++ trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h 2017-12-01 21:58:10 UTC (rev 225410)
@@ -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, unsigned long extraCompileOptions = 0);
+ bool compileShaderSource(const char* shaderSource, ANGLEShaderType, String& translatedShaderSource, String& shaderValidationLog, Vector<std::pair<ANGLEShaderSymbolType, sh::ShaderVariable>>& symbols, uint64_t extraCompileOptions = 0);
private:
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp (225409 => 225410)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2017-12-01 21:50:37 UTC (rev 225409)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2017-12-01 21:58:10 UTC (rev 225410)
@@ -186,7 +186,7 @@
String translatedShaderSource;
String shaderInfoLog;
- 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;
+ uint64_t 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
