Cairo 1.15.4 and Mesa 13.1

Submitted by Konstantin Ripak on Jan. 5, 2017, 8:35 a.m.

Details

Message ID CAA8s6jce=KKzsEOcZsJ5bGQ=c8A0Bh7QNGk86Vp0swSZ0ew9ZA@mail.gmail.com
State New
Series "Cairo 1.15.4 and Mesa 13.1"
Headers show

Commit Message

Konstantin Ripak Jan. 5, 2017, 8:35 a.m.
Hi,
I've just discovered that latest changes to cairo regarding CAIRO_GL_FLAVOR_ES
break copatibility of cairo gl backend with OpenGL ES 3.
https://lists.freedesktop.org/archives/cairo-commit/2016-October/012977.html

The issue is in this change:

If version contains "OpenGL ES 3" this doesn't work at all.

As far as I know OpenGL ES 3 is backward compatible with OpenGL ES 2, so
why not we fix this?

Best Regards,
Konstantin

Patch hide | download patch | download mbox

diff --git a/src/cairo-gl-info.c b/src/cairo-gl-info.c
index acefbb9..39541aa 100644
--- a/src/cairo-gl-info.c
+++ b/src/cairo-gl-info.c
@@ -65,8 +65,8 @@  _cairo_gl_get_flavor (void)

     if (version == NULL)
 	flavor = CAIRO_GL_FLAVOR_NONE;
-    else if (strstr (version, "OpenGL ES") != NULL)
-	flavor = CAIRO_GL_FLAVOR_ES;
+    else if (strstr (version, "OpenGL ES 2") != NULL)
+	flavor = CAIRO_GL_FLAVOR_ES2;
     else
 	flavor = CAIRO_GL_FLAVOR_DESKTOP;