mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 13:09:50 +00:00
cogl-1.0: Upgrade 1.18.2 -> 1.20.0
* Backport patch that fixes build with GLES2 (From OE-Core rev: 9d38fb232deaa2e7e46d3c442d1598e13bba9c0a) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
383e48e9ee
commit
409490147b
@@ -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
|
||||||
|
|
||||||
@@ -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"
|
|
||||||
@@ -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"
|
||||||
|
|
||||||
Reference in New Issue
Block a user