From 607bc899701dda25f7c91ebd2ec2136d4dab0448 Mon Sep 17 00:00:00 2001 From: Niels Ole Salscheider Date: Wed, 11 Jun 2014 23:13:12 +0200 Subject: [PATCH] egl/gallium: Set defines for supported APIs when using automake This fixes automake builds which are broken since b52a530ce2aada1967bc8fefa83ab53e6a737dae. v2: This patch also adds the FEATURE_* defines back to targets/egl-static for Android and Scons that have been removed in the mentioned commit. Signed-off-by: Niels Ole Salscheider Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79885 Reviewed-by: Emil Velikov --- src/gallium/state_trackers/egl/Makefile.am | 20 ++++++++++++++++++++ src/gallium/targets/egl-static/Android.mk | 2 ++ src/gallium/targets/egl-static/SConscript | 6 ++++++ 3 files changed, 28 insertions(+) diff --git a/src/gallium/state_trackers/egl/Makefile.am b/src/gallium/state_trackers/egl/Makefile.am index b7dcdabffef..828bf13e27c 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 diff --git a/src/gallium/targets/egl-static/Android.mk b/src/gallium/targets/egl-static/Android.mk index 01408a7cb18..37244b5443a 100644 --- a/src/gallium/targets/egl-static/Android.mk +++ b/src/gallium/targets/egl-static/Android.mk @@ -31,6 +31,8 @@ LOCAL_SRC_FILES := \ egl_st.c LOCAL_CFLAGS := \ + -DFEATURE_ES1=1 \ + -DFEATURE_ES2=1 \ -D_EGL_MAIN=_eglBuiltInDriverGALLIUM LOCAL_C_INCLUDES := \ diff --git a/src/gallium/targets/egl-static/SConscript b/src/gallium/targets/egl-static/SConscript index 7d8d4d27cdb..afb5c11fa91 100644 --- a/src/gallium/targets/egl-static/SConscript +++ b/src/gallium/targets/egl-static/SConscript @@ -63,6 +63,11 @@ if env['platform'] == 'windows': # OpenGL ES and OpenGL if env['gles']: + env.Append(CPPDEFINES = [ + 'FEATURE_GL=1', + 'FEATURE_ES1=1', + 'FEATURE_ES2=1' + ]) env.Prepend(LIBPATH = [shared_glapi.dir]) # manually add LIBPREFIX on windows glapi_name = 'glapi' if env['platform'] != 'windows' else 'libglapi' @@ -70,6 +75,7 @@ if env['gles']: # OpenVG if True: + env.Append(CPPDEFINES = ['FEATURE_VG=1']) env.Prepend(LIBPATH = [openvg.dir]) # manually add LIBPREFIX on windows openvg_name = 'OpenVG' if env['platform'] != 'windows' else 'libOpenVG' -- 2.11.0