diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-07-09 10:52:44 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-12 22:53:18 +0100 |
| commit | 9d38fb232deaa2e7e46d3c442d1598e13bba9c0a (patch) | |
| tree | 4c3b10bce90e25060e277a025421efc6a0daf5cc | |
| parent | c938d5e5855a9930dacccbd5fcba68a2e3fa6566 (diff) | |
| download | openembedded-core-9d38fb232deaa2e7e46d3c442d1598e13bba9c0a.tar.gz openembedded-core-9d38fb232deaa2e7e46d3c442d1598e13bba9c0a.tar.bz2 openembedded-core-9d38fb232deaa2e7e46d3c442d1598e13bba9c0a.zip | |
cogl-1.0: Upgrade 1.18.2 -> 1.20.0
* Backport patch that fixes build with GLES2
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
3 files changed, 49 insertions, 6 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 new file mode 100644 index 0000000000..8e839579fe --- /dev/null +++ b/meta/recipes-graphics/cogl/cogl-1.0/cogl-framebuffer-gl-Work-again-on-GLESv2.patch @@ -0,0 +1,41 @@ +Upstream-Status: Backport +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> + + + +From f8cce5f6cb2958a4074f87cd345bfe46e0dda6e1 Mon Sep 17 00:00:00 2001 +From: "Jasper St. Pierre" <jstpierre@mecheye.net> +Date: Mon, 20 Apr 2015 12:08:29 -0700 +Subject: cogl-framebuffer-gl: Work again on GLESv2 + + +diff --git a/cogl/driver/gl/cogl-framebuffer-gl.c b/cogl/driver/gl/cogl-framebuffer-gl.c +index 793b10b..609cfb3 100644 +--- a/cogl/driver/gl/cogl-framebuffer-gl.c ++++ b/cogl/driver/gl/cogl-framebuffer-gl.c +@@ -107,6 +107,12 @@ + #ifndef GL_PACK_INVERT_MESA + #define GL_PACK_INVERT_MESA 0x8758 + #endif ++#ifndef GL_BACK_LEFT ++#define GL_BACK_LEFT 0x0402 ++#endif ++#ifndef GL_BACK_RIGHT ++#define GL_BACK_RIGHT 0x0403 ++#endif + + #ifndef GL_COLOR + #define GL_COLOR 0x1800 +@@ -245,6 +251,9 @@ _cogl_framebuffer_gl_flush_stereo_mode_state (CoglFramebuffer *framebuffer) + if (framebuffer->type == COGL_FRAMEBUFFER_TYPE_OFFSCREEN) + return; + ++ if (!ctx->glDrawBuffer) ++ return; ++ + /* The one-shot default draw buffer setting in _cogl_framebuffer_gl_bind + * must have already happened. If not it would override what we set here. */ + g_assert (ctx->was_bound_to_onscreen); +-- +cgit v0.10.2 + diff --git a/meta/recipes-graphics/cogl/cogl-1.0_1.18.2.bb b/meta/recipes-graphics/cogl/cogl-1.0_1.18.2.bb deleted file mode 100644 index 6700efb66b..0000000000 --- a/meta/recipes-graphics/cogl/cogl-1.0_1.18.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require cogl-1.0.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84" - -SRC_URI[archive.md5sum] = "952155d526d35f297737266408e842b5" -SRC_URI[archive.sha256sum] = "9278e519d5480eb0379efd48db024e8fdbf93f01dff48a7e756b85b508a863aa" 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 new file mode 100644 index 0000000000..d20b814e8e --- /dev/null +++ b/meta/recipes-graphics/cogl/cogl-1.0_1.20.0.bb @@ -0,0 +1,8 @@ +require cogl-1.0.inc + +SRC_URI += "file://cogl-framebuffer-gl-Work-again-on-GLESv2.patch" + +LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84" +SRC_URI[archive.md5sum] = "5b28897194d9ff76a574a9493d1f7ee0" +SRC_URI[archive.sha256sum] = "729e35495829e7d31fafa3358e47b743ba21a2b08ff9b6cd28fb74c0de91192b" + |