Attachment 145764 Details for Bug 87718 – patch

[patch] patch

2012_06_05_ANGLE_N9.diff (text/plain), 4.18 KB, created by Roland Takacs on 2012-06-05 05:16:20 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Takacs

Created: 2012-06-05 05:16:20 PDT

Size: 4.18 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 31a7abc..559a443 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,22 @@
>+2012-06-05  Roland Takacs  <takacs.roland@stud.u-szeged.hu>
>+
>+        Shader compiler unprepared to make ESSL output when GLES is used
>+        https://bugs.webkit.org/show_bug.cgi?id=87718
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Defined a new method to initialize shader compilers by the parameter value.
>+        This parameter specifies what type of output must be generated. It must be
>+        called before calling 'validateShaderSource' method.
>+
>+        * platform/graphics/ANGLEWebKitBridge.cpp:
>+        (WebCore::ANGLEWebKitBridge::initializeShaderCompilers):
>+        (WebCore::ANGLEWebKitBridge::validateShaderSource):
>+        * platform/graphics/ANGLEWebKitBridge.h:
>+        (ANGLEWebKitBridge):
>+        * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
>+        (WebCore::GraphicsContext3D::compileShader):
>+
> 2012-06-04  Kinuko Yasuda  <kinuko@chromium.org>
> 
>         Chromium tests: "Add support for the Blob constructor" [r115582] regressed blob layout tests
>diff --git a/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp b/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp
>index 73848bd..d4ba5e6 100644
>--- a/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp
>+++ b/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp
>@@ -66,11 +66,11 @@ void ANGLEWebKitBridge::setResources(ShBuiltInResources resources)
>     m_resources = resources;
> }
> 
>-bool ANGLEWebKitBridge::validateShaderSource(const char* shaderSource, ANGLEShaderType shaderType, String& translatedShaderSource, String& shaderValidationLog)
>+bool ANGLEWebKitBridge::initializeShaderCompilers(ShShaderOutput shaderOutput)
> {
>     if (!builtCompilers) {
>-        m_fragmentCompiler = ShConstructCompiler(SH_FRAGMENT_SHADER, SH_WEBGL_SPEC, SH_GLSL_OUTPUT, &m_resources);
>-        m_vertexCompiler = ShConstructCompiler(SH_VERTEX_SHADER, SH_WEBGL_SPEC, SH_GLSL_OUTPUT, &m_resources);
>+        m_fragmentCompiler = ShConstructCompiler(SH_FRAGMENT_SHADER, SH_WEBGL_SPEC, shaderOutput, &m_resources);
>+        m_vertexCompiler = ShConstructCompiler(SH_VERTEX_SHADER, SH_WEBGL_SPEC, shaderOutput, &m_resources);
>         if (!m_fragmentCompiler || !m_vertexCompiler) {
>             cleanupCompilers();
>             return false;
>@@ -78,7 +78,11 @@ bool ANGLEWebKitBridge::validateShaderSource(const char* shaderSource, ANGLEShad
> 
>         builtCompilers = true;
>     }
>-    
>+
>+    return true;
>+}
>+bool ANGLEWebKitBridge::validateShaderSource(const char* shaderSource, ANGLEShaderType shaderType, String& translatedShaderSource, String& shaderValidationLog)
>+{
>     ShHandle compiler;
> 
>     if (shaderType == SHADER_TYPE_VERTEX)
>diff --git a/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h b/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h
>index c638bc0..1226a37 100644
>--- a/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h
>+++ b/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h
>@@ -53,6 +53,7 @@ public:
>     ShBuiltInResources getResources() { return m_resources; }
>     void setResources(ShBuiltInResources);
>     
>+    bool initializeShaderCompilers(ShShaderOutput);
>     bool validateShaderSource(const char* shaderSource, ANGLEShaderType shaderType, String& translatedShaderSource, String& shaderValidationLog);
> 
> private:
>diff --git a/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp b/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
>index 8c1e7e5..e3ac0e7 100644
>--- a/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
>+++ b/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
>@@ -467,6 +467,9 @@ void GraphicsContext3D::compileShader(Platform3DObject shader)
>     String translatedShaderSource;
>     String shaderInfoLog;
> 
>+    if (!m_compiler.initializeShaderCompilers(isGLES2Compliant() ? SH_ESSL_OUTPUT : SH_GLSL_OUTPUT))
>+        return; // Error at initialization of shader compilers
>+
>     bool isValid = m_compiler.validateShaderSource(entry.source.utf8().data(), shaderType, translatedShaderSource, shaderInfoLog);
> 
>     entry.log = shaderInfoLog;

Actions: View | Formatted Diff | Diff

Attachments on bug 87718: 144534 | 144790 | 145581 | 145764 | 145957 | 146128 | 149280 | 149322 | 149474