aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2016-08-03 08:54:54 -0400
committerChris Michael <cp.michael@samsung.com>2016-08-03 09:00:50 -0400
commite4c641ed1e5607651e2d43a832e7cc01471f3fd6 (patch)
treed242c52585bef1460ece44bb8f9fccd1fff468b8
parentelm focus default theme: fix wrong resizing (diff)
downloadefl-e4c641ed1e5607651e2d43a832e7cc01471f3fd6.tar.gz
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.michael@samsung.com>
-rw-r--r--src/modules/evas/engines/gl_x11/evas_x_main.c7
1 files changed, 7 insertions, 0 deletions
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 9e03851538..98dfcc8b42 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)
{