summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/cairo/cairo/Manually-transpose-the-matrix-in-_cairo_gl_shader_bi.patch49
-rw-r--r--meta/recipes-graphics/cairo/cairo_1.14.4.bb (renamed from meta/recipes-graphics/cairo/cairo_1.14.2.bb)5
2 files changed, 2 insertions, 52 deletions
diff --git a/meta/recipes-graphics/cairo/cairo/Manually-transpose-the-matrix-in-_cairo_gl_shader_bi.patch b/meta/recipes-graphics/cairo/cairo/Manually-transpose-the-matrix-in-_cairo_gl_shader_bi.patch
deleted file mode 100644
index 955b7d4ef5..0000000000
--- a/meta/recipes-graphics/cairo/cairo/Manually-transpose-the-matrix-in-_cairo_gl_shader_bi.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1Upstream-Status: Backport
2
3 http://lists.cairographics.org/archives/cairo/2015-May/026253.html
4 http://cgit.freedesktop.org/cairo/commit/?id=f52f0e2feb1ad0a4de23c475a8c020d41a1764a8
5
6Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
7
8
9From f52f0e2feb1ad0a4de23c475a8c020d41a1764a8 Mon Sep 17 00:00:00 2001
10From: Zan Dobersek <zdobersek@igalia.com>
11Date: Fri, 8 May 2015 01:50:25 -0700
12Subject: [PATCH] Manually transpose the matrix in _cairo_gl_shader_bind_matrix()
13
14To maintain compatibility with OpenGL ES 2.0, the matrix in
15_cairo_gl_shader_bind_matrix() should be manually transposed,
16and GL_FALSE passed as the transpose argument to the
17glUniformMatrix3fv() call as it is the only valid value for
18that parameter in OpenGL ES 2.0.
19
20Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
21Acked-by: "Henry (Yu) Song" <henry.song@samsung.com>
22---
23 src/cairo-gl-shaders.c | 8 ++++----
24 1 file changed, 4 insertions(+), 4 deletions(-)
25
26diff --git a/src/cairo-gl-shaders.c b/src/cairo-gl-shaders.c
27index 2710606..fe975d2 100644
28--- a/src/cairo-gl-shaders.c
29+++ b/src/cairo-gl-shaders.c
30@@ -973,12 +973,12 @@ _cairo_gl_shader_bind_matrix (cairo_gl_context_t *ctx,
31 {
32 cairo_gl_dispatch_t *dispatch = &ctx->dispatch;
33 float gl_m[9] = {
34- m->xx, m->xy, m->x0,
35- m->yx, m->yy, m->y0,
36- 0, 0, 1
37+ m->xx, m->yx, 0,
38+ m->xy, m->yy, 0,
39+ m->x0, m->y0, 1
40 };
41 assert (location != -1);
42- dispatch->UniformMatrix3fv (location, 1, GL_TRUE, gl_m);
43+ dispatch->UniformMatrix3fv (location, 1, GL_FALSE, gl_m);
44 }
45
46 void
47--
481.9.1
49
diff --git a/meta/recipes-graphics/cairo/cairo_1.14.2.bb b/meta/recipes-graphics/cairo/cairo_1.14.4.bb
index 75cde0ad7c..17ea851c9f 100644
--- a/meta/recipes-graphics/cairo/cairo_1.14.2.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.14.4.bb
@@ -3,10 +3,9 @@ require cairo.inc
3LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" 3LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
4 4
5SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz" 5SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz"
6SRC_URI += "file://Manually-transpose-the-matrix-in-_cairo_gl_shader_bi.patch"
7 6
8SRC_URI[md5sum] = "e1cdfaf1c6c995c4d4c54e07215b0118" 7SRC_URI[md5sum] = "90a929e8fe66fb5d19b5adaaea1e9a12"
9SRC_URI[sha256sum] = "c919d999ddb1bbbecd4bbe65299ca2abd2079c7e13d224577895afa7005ecceb" 8SRC_URI[sha256sum] = "f6ec9c7c844db9ec011f0d66b57ef590c45adf55393d1fc249003512522ee716"
10 9
11PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils" 10PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils"
12 11