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>
This commit is contained in:
parent
f54d4e4f48
commit
148c95331d
|
@ -1,41 +0,0 @@
|
|||
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,8 +0,0 @@
|
|||
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"
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
require cogl-1.0.inc
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84"
|
||||
SRC_URI[archive.md5sum] = "ab684ec96848d79d22757fb3064820c8"
|
||||
SRC_URI[archive.sha256sum] = "689dfb5d14fc1106e9d2ded0f7930dcf7265d0bc84fa846b4f03941633eeaa91"
|
Loading…
Reference in New Issue