[cairo-commit] src/cairo-gl-device.c

Chris Wilson ickle at kemper.freedesktop.org
Thu May 24 12:42:41 PDT 2012


 src/cairo-gl-device.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 465319ce828f922edce46b6e7628da543b20d5e4
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu May 24 20:39:34 2012 +0100

    gl: Use core GL_STENCIL8_DEPTH24 for gl_flavor=desktop
    
    Jesse complained that --enable-gl --enable-glesv2 wasn't pulling in the
    right headers, and in particular GL_STENCIL8_DEPTH24_OES was undefined
    but being used. In this case we can simply use the identical
    GL_STENCIL8_DEPTH24 instead.
    
    Reported-by: Jesse Barnes <jbarnes at virtuousgeek.org>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/cairo-gl-device.c b/src/cairo-gl-device.c
index 4e86716..87ceb66 100644
--- a/src/cairo-gl-device.c
+++ b/src/cairo-gl-device.c
@@ -319,7 +319,7 @@ _get_depth_stencil_format (cairo_gl_context_t *ctx)
 
 #if CAIRO_HAS_GLESV2_SURFACE
     if (ctx->gl_flavor == CAIRO_GL_FLAVOR_DESKTOP)
-	return GL_DEPTH24_STENCIL8_OES;
+	return GL_DEPTH24_STENCIL8;
 #endif
 
 #if CAIRO_HAS_GL_SURFACE


More information about the cairo-commit mailing list