diff options
author | Chris Michael <cp.michael@samsung.com> | 2016-08-03 08:54:54 -0400 |
---|---|---|
committer | Chris Michael <cp.michael@samsung.com> | 2016-08-03 09:00:50 -0400 |
commit | e4c641ed1e5607651e2d43a832e7cc01471f3fd6 (patch) | |
tree | d242c52585bef1460ece44bb8f9fccd1fff468b8 /src | |
parent | bb2e4195d7d0d510c968a0ba33c8b0ccfc94e101 (diff) |
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>
Diffstat (limited to 'src')
-rw-r--r-- | src/modules/evas/engines/gl_x11/evas_x_main.c | 7 |
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: | |||
542 | // ALSO as of some nvidia driver version loose binding is | 542 | // ALSO as of some nvidia driver version loose binding is |
543 | // probably not needed | 543 | // probably not needed |
544 | if (v1 < 195) gw->detected.loose_binding = 1; | 544 | if (v1 < 195) gw->detected.loose_binding = 1; |
545 | #ifndef GL_GLES | ||
545 | if (v1 >= 360) gw->detected.noext_glXCreatePixmap = 1; | 546 | if (v1 >= 360) gw->detected.noext_glXCreatePixmap = 1; |
547 | #endif | ||
546 | } | 548 | } |
547 | } | 549 | } |
548 | else | 550 | else |
@@ -558,7 +560,12 @@ try_gles2: | |||
558 | gw->detected.msaa = val; | 560 | gw->detected.msaa = val; |
559 | #endif | 561 | #endif |
560 | 562 | ||
563 | #ifndef GL_GLES | ||
561 | eng_gl_symbols(gw->detected.noext_glXCreatePixmap); | 564 | eng_gl_symbols(gw->detected.noext_glXCreatePixmap); |
565 | #else | ||
566 | eng_gl_symbols(EINA_FALSE); // EINA_FALSE is ignored anyway for gl_gles | ||
567 | #endif | ||
568 | |||
562 | gw->gl_context = glsym_evas_gl_common_context_new(); | 569 | gw->gl_context = glsym_evas_gl_common_context_new(); |
563 | if (!gw->gl_context) | 570 | if (!gw->gl_context) |
564 | { | 571 | { |