Re: [E-devel] [EGIT] [core/efl] master 01/01: evas: Fix compiling evas x engine with no gles
Hi, On 4 August 2016 at 00:34, Christopher Michael wrote: > On 08/03/2016 10:58 AM, Gustavo Sverzut Barbieri wrote: > > On Wed, Aug 3, 2016 at 10:01 AM, Chris Michael > wrote: > > [...] > >> +#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 > > > > Actually this gw->detected.noext_glXCreatePixmap is only used in this > > function, thus I wonder why not a local variable instead of adding a > > member to the struct and then ifdef it. > > > > > > You'd have to ask the original author of the code (jpeg). I just fixed > the build break. > Yeah. No good reason, really. Also, sorry for the break. No point in changing this now, I have a large pending patch that fixes how we resolve extensions, because there was a huge misconception about GetProcAddress in evas gl code. So this variable will not be needed anymore anyway. -- Jean-Philippe André -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: evas: Fix compiling evas x engine with no gles
On 08/03/2016 10:58 AM, Gustavo Sverzut Barbieri wrote: > On Wed, Aug 3, 2016 at 10:01 AM, Chris Michael wrote: > [...] >> +#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 > > Actually this gw->detected.noext_glXCreatePixmap is only used in this > function, thus I wonder why not a local variable instead of adding a > member to the struct and then ifdef it. > > You'd have to ask the original author of the code (jpeg). I just fixed the build break. Cheers, dh -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: evas: Fix compiling evas x engine with no gles
On Wed, Aug 3, 2016 at 10:01 AM, Chris Michael wrote: [...] > +#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 Actually this gw->detected.noext_glXCreatePixmap is only used in this function, thus I wonder why not a local variable instead of adding a member to the struct and then ifdef it. -- Gustavo Sverzut Barbieri -- Mobile: +55 (16) 99354-9890 -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: evas: Fix compiling evas x engine with no gles
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e4c641ed1e5607651e2d43a832e7cc01471f3fd6
commit e4c641ed1e5607651e2d43a832e7cc01471f3fd6
Author: Chris Michael
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
---
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)
{
--
