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

Bryce Harrington bryce at kemper.freedesktop.org
Tue Sep 12 02:56:09 UTC 2017


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

New commits:
commit 1af18610baaefd2031259fc7aae79b341c57fb91
Author: Bryce Harrington <bryce at osg.samsung.com>
Date:   Mon Sep 11 19:49:14 2017 -0700

    glesv2: Fix regression in gles version detection
    
    Revert the _cairo_gl_get_flavor() portion of the change from commit
    eb523200.  This caused GLES to be enabled only if the hardware reported
    version 2 exactly; if the hardware supported version 2 and 3 then no ES
    support would be enabled.

diff --git a/src/cairo-gl-info.c b/src/cairo-gl-info.c
index 39541aa6..a4b42715 100644
--- a/src/cairo-gl-info.c
+++ b/src/cairo-gl-info.c
@@ -65,7 +65,7 @@ _cairo_gl_get_flavor (void)
 
     if (version == NULL)
 	flavor = CAIRO_GL_FLAVOR_NONE;
-    else if (strstr (version, "OpenGL ES 2") != NULL)
+    else if (strstr (version, "OpenGL ES") != NULL)
 	flavor = CAIRO_GL_FLAVOR_ES2;
     else
 	flavor = CAIRO_GL_FLAVOR_DESKTOP;


More information about the cairo-commit mailing list