Patchwork qtwebkit2: Patch the proposed fix in the current QTWebkit

login
register
mail settings
Submitter Prabhu Sundararaj
Date May 12, 2014, 4:23 p.m.
Message ID <1399911835-1878-1-git-send-email-prabhu.sundararaj@freescale.com>
Download mbox | patch
Permalink /patch/72003/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Prabhu Sundararaj - May 12, 2014, 4:23 p.m.
QTWebkit generates shader which is not complaint to specification
causing error with Vivante shader compiler.

https://bugs.webkit.org/show_bug.cgi?id=124653#c9

Apply this patch till it get fixed in mainline.

Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>
---
 ...h-the-uniform-precision-qualifiers-in-ver.patch | 42 ++++++++++++++++++++++
 qt5-layer/recipes-qt/qt5/qtwebkit_%.bbappend       |  4 +++
 2 files changed, 46 insertions(+)
 create mode 100644 qt5-layer/recipes-qt/qt5/qtwebkit/0001-Fix-to-match-the-uniform-precision-qualifiers-in-ver.patch
 create mode 100644 qt5-layer/recipes-qt/qt5/qtwebkit_%.bbappend
Otavio Salvador - May 12, 2014, 4:43 p.m.
On Mon, May 12, 2014 at 1:23 PM, Prabhu Sundararaj
<prabhu.sundararaj@freescale.com> wrote:
> QTWebkit generates shader which is not complaint to specification
> causing error with Vivante shader compiler.
>
> https://bugs.webkit.org/show_bug.cgi?id=124653#c9
>
> Apply this patch till it get fixed in mainline.
>
> Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>

The only change I did before apply it locally for test was the commit log:

commit 3336ef362109eef14f9e73cdededb43caefedb2f
Author: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>
Date:   Mon May 12 11:23:55 2014 -0500

    qtwebkit: Fix shader generation to be compliant to the specification

    QTWebkit generates shader which is not complaint to specification
    causing error with Vivante shader compiler.

    https://bugs.webkit.org/show_bug.cgi?id=124653#c9

    Apply this patch till it get fixed in mainline.

    Change-Id: I85cf1a2fcb7457807f43a763b011e0b5ad11e8e9
    Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>
    Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

Is it fine for you?
Prabhu Sundararaj - May 12, 2014, 4:44 p.m.
yes

Best Regards,
Prabhu

-----Original Message-----
From: otavio.salvador@gmail.com [mailto:otavio.salvador@gmail.com] On Behalf Of Otavio Salvador
Sent: Monday, May 12, 2014 11:43 AM
To: Sundararaj Prabhu-B36876
Cc: meta-freescale@yoctoproject.org
Subject: Re: [meta-freescale] [PATCH] qtwebkit2: Patch the proposed fix in the current QTWebkit

On Mon, May 12, 2014 at 1:23 PM, Prabhu Sundararaj <prabhu.sundararaj@freescale.com> wrote:
> QTWebkit generates shader which is not complaint to specification 
> causing error with Vivante shader compiler.
>
> https://bugs.webkit.org/show_bug.cgi?id=124653#c9
>
> Apply this patch till it get fixed in mainline.
>
> Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>

The only change I did before apply it locally for test was the commit log:

commit 3336ef362109eef14f9e73cdededb43caefedb2f
Author: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>
Date:   Mon May 12 11:23:55 2014 -0500

    qtwebkit: Fix shader generation to be compliant to the specification

    QTWebkit generates shader which is not complaint to specification
    causing error with Vivante shader compiler.

    https://bugs.webkit.org/show_bug.cgi?id=124653#c9

    Apply this patch till it get fixed in mainline.

    Change-Id: I85cf1a2fcb7457807f43a763b011e0b5ad11e8e9
    Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>
    Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

Is it fine for you?
Erik Botö - May 13, 2014, 6:23 a.m.
Many thanks for tracing this one down!

Cheers,
Erik

On Mon, May 12, 2014 at 6:44 PM, Prabhu.Sundararaj@freescale.com
<Prabhu.Sundararaj@freescale.com> wrote:
> yes
>
> Best Regards,
> Prabhu
>
> -----Original Message-----
> From: otavio.salvador@gmail.com [mailto:otavio.salvador@gmail.com] On Behalf Of Otavio Salvador
> Sent: Monday, May 12, 2014 11:43 AM
> To: Sundararaj Prabhu-B36876
> Cc: meta-freescale@yoctoproject.org
> Subject: Re: [meta-freescale] [PATCH] qtwebkit2: Patch the proposed fix in the current QTWebkit
>
> On Mon, May 12, 2014 at 1:23 PM, Prabhu Sundararaj <prabhu.sundararaj@freescale.com> wrote:
>> QTWebkit generates shader which is not complaint to specification
>> causing error with Vivante shader compiler.
>>
>> https://bugs.webkit.org/show_bug.cgi?id=124653#c9
>>
>> Apply this patch till it get fixed in mainline.
>>
>> Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>
>
> The only change I did before apply it locally for test was the commit log:
>
> commit 3336ef362109eef14f9e73cdededb43caefedb2f
> Author: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>
> Date:   Mon May 12 11:23:55 2014 -0500
>
>     qtwebkit: Fix shader generation to be compliant to the specification
>
>     QTWebkit generates shader which is not complaint to specification
>     causing error with Vivante shader compiler.
>
>     https://bugs.webkit.org/show_bug.cgi?id=124653#c9
>
>     Apply this patch till it get fixed in mainline.
>
>     Change-Id: I85cf1a2fcb7457807f43a763b011e0b5ad11e8e9
>     Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>
>     Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>
> Is it fine for you?
>
>
> --
> Otavio Salvador                             O.S. Systems
> http://www.ossystems.com.br        http://code.ossystems.com.br
> Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
> --
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale

Patch

diff --git a/qt5-layer/recipes-qt/qt5/qtwebkit/0001-Fix-to-match-the-uniform-precision-qualifiers-in-ver.patch b/qt5-layer/recipes-qt/qt5/qtwebkit/0001-Fix-to-match-the-uniform-precision-qualifiers-in-ver.patch
new file mode 100644
index 0000000..80e55c7
--- /dev/null
+++ b/qt5-layer/recipes-qt/qt5/qtwebkit/0001-Fix-to-match-the-uniform-precision-qualifiers-in-ver.patch
@@ -0,0 +1,42 @@ 
+From 66dab98c3f42eb70a4c6761a8694e374b8578e99 Mon Sep 17 00:00:00 2001
+From: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>
+Date: Thu, 8 May 2014 09:27:04 -0700
+Subject: [PATCH] Fix to match the uniform precision qualifiers in vertex and
+ fragment shaders
+
+When the vertex and fragment shaders are linked together, then they will
+share a single global uniform name space. Hence, types and precisions of
+uniforms with the same name must match across all shaders that are linked
+into a single executable.
+
+As per GLSL_ES_Specification_3.00.3.pdf
+Page 124 12.3 Numeric Precision
+The fragment language has no default precision qualifier for floating point types.
+Hence for float, floating point vector and matrix variable declarations, either
+the declaration must include a precision qualifier or the default float
+precision must have been previously declared.
+
+Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=124653#c9]
+
+Change-Id: I4eb3363b3bca8bc3c839212ec7c966201a3e65e2
+Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>
+---
+ Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp b/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp
+index f4b9a7e..7e991bf 100644
+--- a/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp
++++ b/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp
+@@ -208,7 +208,7 @@ static const char* fragmentTemplate =
+     ANTIALIASING_TEX_COORD_DIRECTIVE
+     BLUR_CONSTANTS
+     STRINGIFY(
+-        precision mediump float;
++        precision highp float;
+         uniform SamplerType s_sampler;
+         uniform sampler2D s_contentTexture;
+         uniform float u_opacity;
+-- 
+1.9.1
+
diff --git a/qt5-layer/recipes-qt/qt5/qtwebkit_%.bbappend b/qt5-layer/recipes-qt/qt5/qtwebkit_%.bbappend
new file mode 100644
index 0000000..5d961e6
--- /dev/null
+++ b/qt5-layer/recipes-qt/qt5/qtwebkit_%.bbappend
@@ -0,0 +1,4 @@ 
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://0001-Fix-to-match-the-uniform-precision-qualifiers-in-ver.patch"
+