summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2015-11-25 16:11:51 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-08 10:20:48 +0000
commit148c95331d30c44a6a5b5559088cf88d46905bc2 (patch)
treebfe66f8397224b1e6e6d9f51a8a20b087708bade
parentf54d4e4f480c70d584de8862382292e7c5ff7990 (diff)
downloadpoky-148c95331d30c44a6a5b5559088cf88d46905bc2.tar.gz
cogl-1.0: Upgrade 1.20.0 -> 1.22.0
Remove patch that is no longer necessary. (From OE-Core rev: 4781de242473bb53876380d784b00cbdb6700517) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0/cogl-framebuffer-gl-Work-again-on-GLESv2.patch41
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0_1.20.0.bb8
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0_1.22.0.bb5
3 files changed, 5 insertions, 49 deletions
diff --git a/meta/recipes-graphics/cogl/cogl-1.0/cogl-framebuffer-gl-Work-again-on-GLESv2.patch b/meta/recipes-graphics/cogl/cogl-1.0/cogl-framebuffer-gl-Work-again-on-GLESv2.patch
deleted file mode 100644
index 8e839579fe..0000000000
--- a/meta/recipes-graphics/cogl/cogl-1.0/cogl-framebuffer-gl-Work-again-on-GLESv2.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1Upstream-Status: Backport
2Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
3
4
5
6From f8cce5f6cb2958a4074f87cd345bfe46e0dda6e1 Mon Sep 17 00:00:00 2001
7From: "Jasper St. Pierre" <jstpierre@mecheye.net>
8Date: Mon, 20 Apr 2015 12:08:29 -0700
9Subject: cogl-framebuffer-gl: Work again on GLESv2
10
11
12diff --git a/cogl/driver/gl/cogl-framebuffer-gl.c b/cogl/driver/gl/cogl-framebuffer-gl.c
13index 793b10b..609cfb3 100644
14--- a/cogl/driver/gl/cogl-framebuffer-gl.c
15+++ b/cogl/driver/gl/cogl-framebuffer-gl.c
16@@ -107,6 +107,12 @@
17 #ifndef GL_PACK_INVERT_MESA
18 #define GL_PACK_INVERT_MESA 0x8758
19 #endif
20+#ifndef GL_BACK_LEFT
21+#define GL_BACK_LEFT 0x0402
22+#endif
23+#ifndef GL_BACK_RIGHT
24+#define GL_BACK_RIGHT 0x0403
25+#endif
26
27 #ifndef GL_COLOR
28 #define GL_COLOR 0x1800
29@@ -245,6 +251,9 @@ _cogl_framebuffer_gl_flush_stereo_mode_state (CoglFramebuffer *framebuffer)
30 if (framebuffer->type == COGL_FRAMEBUFFER_TYPE_OFFSCREEN)
31 return;
32
33+ if (!ctx->glDrawBuffer)
34+ return;
35+
36 /* The one-shot default draw buffer setting in _cogl_framebuffer_gl_bind
37 * must have already happened. If not it would override what we set here. */
38 g_assert (ctx->was_bound_to_onscreen);
39--
40cgit v0.10.2
41
diff --git a/meta/recipes-graphics/cogl/cogl-1.0_1.20.0.bb b/meta/recipes-graphics/cogl/cogl-1.0_1.20.0.bb
deleted file mode 100644
index d20b814e8e..0000000000
--- a/meta/recipes-graphics/cogl/cogl-1.0_1.20.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require cogl-1.0.inc
2
3SRC_URI += "file://cogl-framebuffer-gl-Work-again-on-GLESv2.patch"
4
5LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84"
6SRC_URI[archive.md5sum] = "5b28897194d9ff76a574a9493d1f7ee0"
7SRC_URI[archive.sha256sum] = "729e35495829e7d31fafa3358e47b743ba21a2b08ff9b6cd28fb74c0de91192b"
8
diff --git a/meta/recipes-graphics/cogl/cogl-1.0_1.22.0.bb b/meta/recipes-graphics/cogl/cogl-1.0_1.22.0.bb
new file mode 100644
index 0000000000..3b1e1994e0
--- /dev/null
+++ b/meta/recipes-graphics/cogl/cogl-1.0_1.22.0.bb
@@ -0,0 +1,5 @@
1require cogl-1.0.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84"
4SRC_URI[archive.md5sum] = "ab684ec96848d79d22757fb3064820c8"
5SRC_URI[archive.sha256sum] = "689dfb5d14fc1106e9d2ded0f7930dcf7265d0bc84fa846b4f03941633eeaa91"