devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e4c641ed1e5607651e2d43a832e7cc01471f3fd6
commit e4c641ed1e5607651e2d43a832e7cc01471f3fd6
Author: Chris Michael <cp.mich...@samsung.com>
Date: Wed Aug 3 08:54:54 2016 -0400
evas: Fix compiling evas x engine with no gles
This fixes an issue from 19eb7b727fbf35620a13fb65b50d3 where the code
would no longer compile due to not finding noext_glXCreatePixmap in
the structure. This was due to the fact that this field was not
compiled into the structure if gl_gles was defined.
Signed-off-by: Chris Michael <cp.mich...@samsung.com>
---
src/modules/evas/engines/gl_x11/evas_x_main.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/modules/evas/engines/gl_x11/evas_x_main.c
b/src/modules/evas/engines/gl_x11/evas_x_main.c
index 9e03851..98dfcc8 100644
--- a/src/modules/evas/engines/gl_x11/evas_x_main.c
+++ b/src/modules/evas/engines/gl_x11/evas_x_main.c
@@ -542,7 +542,9 @@ try_gles2:
// ALSO as of some nvidia driver version loose binding is
// probably not needed
if (v1 < 195) gw->detected.loose_binding = 1;
+#ifndef GL_GLES
if (v1 >= 360) gw->detected.noext_glXCreatePixmap = 1;
+#endif
}
}
else
@@ -558,7 +560,12 @@ try_gles2:
gw->detected.msaa = val;
#endif
+#ifndef GL_GLES
eng_gl_symbols(gw->detected.noext_glXCreatePixmap);
+#else
+ eng_gl_symbols(EINA_FALSE); // EINA_FALSE is ignored anyway for gl_gles
+#endif
+
gw->gl_context = glsym_evas_gl_common_context_new();
if (!gw->gl_context)
{
--
