| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Backport |
| 2 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 3 | |
| 4 | |
| 5 | |
| 6 | From f8cce5f6cb2958a4074f87cd345bfe46e0dda6e1 Mon Sep 17 00:00:00 2001 |
| 7 | From: "Jasper St. Pierre" <jstpierre@mecheye.net> |
| 8 | Date: Mon, 20 Apr 2015 12:08:29 -0700 |
| 9 | Subject: cogl-framebuffer-gl: Work again on GLESv2 |
| 10 | |
| 11 | |
| 12 | diff --git a/cogl/driver/gl/cogl-framebuffer-gl.c b/cogl/driver/gl/cogl-framebuffer-gl.c |
| 13 | index 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 | -- |
| 40 | cgit v0.10.2 |
| 41 | |