sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

cairo: backport fix for compatibility with OpenGL ES 2.0 

To maintain compatibility with OpenGL ES 2.0, the matrix in
_cairo_gl_shader_bind_matrix() should be manually transposed,
and GL_FALSE passed as the transpose argument to the
glUniformMatrix3fv() call as it is the only valid value for
that parameter in OpenGL ES 2.0.

  http://lists.cairographics.org/archives/cairo/2015-May/026253.html
  http://cgit.freedesktop.org/cairo/commit/?id=f52f0e2feb1ad0a4de23c475a8c020d41a1764a8

(From OE-Core rev: 18358a04930722ffec856cab359ed32f061ba555)

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Andre McCurdy 2015-10-20 20:20:35 -07:00 committed by Richard Purdie
parent 64b5e3e0a2
commit 0d69a171d9
2 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
meta/recipes-graphics/cairo/cairo/Manually-transpose-the-matrix-in-_cairo_gl_shader_bi.patch Normal file
View File

@ -0,0 +1,49 @@
Upstream-Status: Backport
http://lists.cairographics.org/archives/cairo/2015-May/026253.html
http://cgit.freedesktop.org/cairo/commit/?id=f52f0e2feb1ad0a4de23c475a8c020d41a1764a8
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
From f52f0e2feb1ad0a4de23c475a8c020d41a1764a8 Mon Sep 17 00:00:00 2001
From: Zan Dobersek <zdobersek@igalia.com>
Date: Fri, 8 May 2015 01:50:25 -0700
Subject: [PATCH] Manually transpose the matrix in _cairo_gl_shader_bind_matrix()
To maintain compatibility with OpenGL ES 2.0, the matrix in
_cairo_gl_shader_bind_matrix() should be manually transposed,
and GL_FALSE passed as the transpose argument to the
glUniformMatrix3fv() call as it is the only valid value for
that parameter in OpenGL ES 2.0.
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Acked-by: "Henry (Yu) Song" <henry.song@samsung.com>
---
src/cairo-gl-shaders.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/cairo-gl-shaders.c b/src/cairo-gl-shaders.c
index 2710606..fe975d2 100644
--- a/src/cairo-gl-shaders.c
+++ b/src/cairo-gl-shaders.c
@@ -973,12 +973,12 @@ _cairo_gl_shader_bind_matrix (cairo_gl_context_t *ctx,
{
cairo_gl_dispatch_t *dispatch = &ctx->dispatch;
float gl_m[9] = {
- m->xx, m->xy, m->x0,
- m->yx, m->yy, m->y0,
- 0, 0, 1
+ m->xx, m->yx, 0,
+ m->xy, m->yy, 0,
+ m->x0, m->y0, 1
};
assert (location != -1);
- dispatch->UniformMatrix3fv (location, 1, GL_TRUE, gl_m);
+ dispatch->UniformMatrix3fv (location, 1, GL_FALSE, gl_m);
}
void
--
1.9.1

1
meta/recipes-graphics/cairo/cairo_1.14.2.bb
View File

@ -3,6 +3,7 @@ require cairo.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz"
SRC_URI += "file://Manually-transpose-the-matrix-in-_cairo_gl_shader_bi.patch"
SRC_URI[md5sum] = "e1cdfaf1c6c995c4d4c54e07215b0118"
SRC_URI[sha256sum] = "c919d999ddb1bbbecd4bbe65299ca2abd2079c7e13d224577895afa7005ecceb"