Re: [Mesa-dev] [PATCH] egl/gallium: Set defines for supported APIs when using automake
On 10/06/14 16:56, Niels Ole Salscheider wrote: On Tuesday 10 June 2014, 16:18:56, Emil Velikov wrote: On 10/06/14 15:17, Niels Ole Salscheider wrote: This fixes automake builds which are broken since b52a530ce2aada1967bc8fefa83ab53e6a737dae. Not sure what I was smoking with the above mentioned patch. Seem like I've completely forgotten about automake :\ Niels can you please drop the FEATURE* defines from src/gallium/targets/egl-static/Makefile.am I think they are still necessary since src/gallium/targets/egl-static/egl_st.c contains these flags, too... Or am I missing something? I have seen that you removed them in b52a530ce2aada1967bc8fefa83ab53e6a737dae for the other build systems... Thanks for looking things up, you're correct. Seems like yesterday was not my day :\ The defines are required in st/egl and targets/egl-static. With the former guarding the ClientAPI used by eglQueryString(dpy, EGL_CLIENT_APIS) and the latter for setting the correct stapi, used by eglGetProcAddress and eglCreateContext. Would you mind adding the defines back to targets/egl-static for Android/Scons ? Cheers Emil With that fixed Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79885 Reviewed-by: Emil Velikov emil.l.veli...@gmail.com Thanks Emil Signed-off-by: Niels Ole Salscheider niels_...@salscheider-online.de --- src/gallium/state_trackers/egl/Makefile.am | 20 1 file changed, 20 insertions(+) diff --git a/src/gallium/state_trackers/egl/Makefile.am b/src/gallium/state_trackers/egl/Makefile.am index b7dcdab..828bf13 100644 --- a/src/gallium/state_trackers/egl/Makefile.am +++ b/src/gallium/state_trackers/egl/Makefile.am @@ -88,3 +88,23 @@ AM_CPPFLAGS += \ -I$(top_srcdir)/src/gallium/winsys/sw \ -DHAVE_NULL_BACKEND endif + +if HAVE_OPENGL +AM_CPPFLAGS += \ + -DFEATURE_GL=1 +endif + +if HAVE_OPENGL_ES1 +AM_CPPFLAGS += \ + -DFEATURE_ES1=1 +endif + +if HAVE_OPENGL_ES2 +AM_CPPFLAGS += \ + -DFEATURE_ES2=1 +endif + +if HAVE_OPENVG +AM_CPPFLAGS += \ + -DFEATURE_VG=1 +endif ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] egl/gallium: Set defines for supported APIs when using automake
This fixes automake builds which are broken since b52a530ce2aada1967bc8fefa83ab53e6a737dae. Signed-off-by: Niels Ole Salscheider niels_...@salscheider-online.de --- src/gallium/state_trackers/egl/Makefile.am | 20 1 file changed, 20 insertions(+) diff --git a/src/gallium/state_trackers/egl/Makefile.am b/src/gallium/state_trackers/egl/Makefile.am index b7dcdab..828bf13 100644 --- a/src/gallium/state_trackers/egl/Makefile.am +++ b/src/gallium/state_trackers/egl/Makefile.am @@ -88,3 +88,23 @@ AM_CPPFLAGS += \ -I$(top_srcdir)/src/gallium/winsys/sw \ -DHAVE_NULL_BACKEND endif + +if HAVE_OPENGL +AM_CPPFLAGS += \ + -DFEATURE_GL=1 +endif + +if HAVE_OPENGL_ES1 +AM_CPPFLAGS += \ + -DFEATURE_ES1=1 +endif + +if HAVE_OPENGL_ES2 +AM_CPPFLAGS += \ + -DFEATURE_ES2=1 +endif + +if HAVE_OPENVG +AM_CPPFLAGS += \ + -DFEATURE_VG=1 +endif -- 2.0.0 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] egl/gallium: Set defines for supported APIs when using automake
On 10/06/14 15:17, Niels Ole Salscheider wrote: This fixes automake builds which are broken since b52a530ce2aada1967bc8fefa83ab53e6a737dae. Not sure what I was smoking with the above mentioned patch. Seem like I've completely forgotten about automake :\ Niels can you please drop the FEATURE* defines from src/gallium/targets/egl-static/Makefile.am With that fixed Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79885 Reviewed-by: Emil Velikov emil.l.veli...@gmail.com Thanks Emil Signed-off-by: Niels Ole Salscheider niels_...@salscheider-online.de --- src/gallium/state_trackers/egl/Makefile.am | 20 1 file changed, 20 insertions(+) diff --git a/src/gallium/state_trackers/egl/Makefile.am b/src/gallium/state_trackers/egl/Makefile.am index b7dcdab..828bf13 100644 --- a/src/gallium/state_trackers/egl/Makefile.am +++ b/src/gallium/state_trackers/egl/Makefile.am @@ -88,3 +88,23 @@ AM_CPPFLAGS += \ -I$(top_srcdir)/src/gallium/winsys/sw \ -DHAVE_NULL_BACKEND endif + +if HAVE_OPENGL +AM_CPPFLAGS += \ + -DFEATURE_GL=1 +endif + +if HAVE_OPENGL_ES1 +AM_CPPFLAGS += \ + -DFEATURE_ES1=1 +endif + +if HAVE_OPENGL_ES2 +AM_CPPFLAGS += \ + -DFEATURE_ES2=1 +endif + +if HAVE_OPENVG +AM_CPPFLAGS += \ + -DFEATURE_VG=1 +endif ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] egl/gallium: Set defines for supported APIs when using automake
On Tuesday 10 June 2014, 16:18:56, Emil Velikov wrote: On 10/06/14 15:17, Niels Ole Salscheider wrote: This fixes automake builds which are broken since b52a530ce2aada1967bc8fefa83ab53e6a737dae. Not sure what I was smoking with the above mentioned patch. Seem like I've completely forgotten about automake :\ Niels can you please drop the FEATURE* defines from src/gallium/targets/egl-static/Makefile.am I think they are still necessary since src/gallium/targets/egl-static/egl_st.c contains these flags, too... Or am I missing something? I have seen that you removed them in b52a530ce2aada1967bc8fefa83ab53e6a737dae for the other build systems... With that fixed Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79885 Reviewed-by: Emil Velikov emil.l.veli...@gmail.com Thanks Emil Signed-off-by: Niels Ole Salscheider niels_...@salscheider-online.de --- src/gallium/state_trackers/egl/Makefile.am | 20 1 file changed, 20 insertions(+) diff --git a/src/gallium/state_trackers/egl/Makefile.am b/src/gallium/state_trackers/egl/Makefile.am index b7dcdab..828bf13 100644 --- a/src/gallium/state_trackers/egl/Makefile.am +++ b/src/gallium/state_trackers/egl/Makefile.am @@ -88,3 +88,23 @@ AM_CPPFLAGS += \ -I$(top_srcdir)/src/gallium/winsys/sw \ -DHAVE_NULL_BACKEND endif + +if HAVE_OPENGL +AM_CPPFLAGS += \ + -DFEATURE_GL=1 +endif + +if HAVE_OPENGL_ES1 +AM_CPPFLAGS += \ + -DFEATURE_ES1=1 +endif + +if HAVE_OPENGL_ES2 +AM_CPPFLAGS += \ + -DFEATURE_ES2=1 +endif + +if HAVE_OPENVG +AM_CPPFLAGS += \ + -DFEATURE_VG=1 +endif ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
