diff options
author | Michael Bruning <michael.bruning@digia.com> | 2014-03-05 18:09:38 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-06 11:34:59 +0100 |
commit | 7a2d420d6675e08dfeff2388ce579dc54d4aa88a (patch) | |
tree | d5e9330fd30210ec0aa5a2bb5be7a7bc0521cfd6 | |
parent | 4cb8afd91bfbe845e9bc2e1eff94e33ad8f8865a (diff) | |
download | qtwebkit-7a2d420d6675e08dfeff2388ce579dc54d4aa88a.tar.gz |
Fix rendering of WebKit2 QML WebView with ANGLE.
The WebKit2 QML WebView was not rendered on ANGLE builds
due to a precision mismatch for a uniform matrix used in
in both vertex and fragment shaders which made the ANGLE
compiler bail out on linking the shader program.
This was fixed by overriding the precision to highp in
both shaders.
Task-number: QTBUG-37043
Change-Id: I79f331e84448f537daef15a4490bb5df40113f89
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
-rw-r--r-- | Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp b/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp index f4b9a7e98..999d52f31 100644 --- a/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp +++ b/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp @@ -124,7 +124,7 @@ static const char* vertexTemplate = attribute vec4 a_vertex; uniform mat4 u_modelViewMatrix; uniform mat4 u_projectionMatrix; - uniform mat4 u_textureSpaceMatrix; + uniform highp mat4 u_textureSpaceMatrix; varying vec2 v_texCoord; varying vec2 v_transformedTexCoord; @@ -220,7 +220,7 @@ static const char* fragmentTemplate = uniform vec2 u_shadowOffset; uniform vec4 u_color; uniform float u_gaussianKernel[GAUSSIAN_KERNEL_HALF_WIDTH]; - uniform mat4 u_textureSpaceMatrix; + uniform highp mat4 u_textureSpaceMatrix; void noop(inout vec4 dummyParameter) { } void noop(inout vec4 dummyParameter, vec2 texCoord) { } |