summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2014-01-10 23:36:16 +0000
committerEmil Velikov <emil.l.velikov@gmail.com>2014-01-18 18:47:27 +0000
commit8c2e7fd8460750543367053b1be9368cc38e1d6a (patch)
tree9587b089f9e43b090a8104661a1c5e27f0769a08 /src/gallium/targets
parent1c5e2965a0de296240dd8f5af12482164416b7f1 (diff)
downloadexternal_mesa3d-8c2e7fd8460750543367053b1be9368cc38e1d6a.zip
external_mesa3d-8c2e7fd8460750543367053b1be9368cc38e1d6a.tar.gz
external_mesa3d-8c2e7fd8460750543367053b1be9368cc38e1d6a.tar.bz2
loader: introduce the loader util lib
All the various window system integration layers duplicate roughly the same code for figuring out device and driver name, pci-id's, etc. Which is sad. So extract it out into a loader util lib. v2 (Emil) * Separate the introduction of libloader from the code de-duplication. * Strip out non-pci devices support. * Add scons + Android build system support. * Add VISIBILITY_CFLAGS to avoid exporting the loader funcs. v3 (Emil) * PIPE_OS_ANDROID is undefined at this scope, use ANDROID * Make sure we define _EGL_NO_DRM when building only swrast Signed-off-by: Rob Clark <robclark@freedesktop.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Rob Clark <robdclark@gmail.com> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/gallium/targets')
-rw-r--r--src/gallium/targets/egl-static/Android.mk1
-rw-r--r--src/gallium/targets/egl-static/Makefile.am1
-rw-r--r--src/gallium/targets/egl-static/SConscript1
3 files changed, 3 insertions, 0 deletions
diff --git a/src/gallium/targets/egl-static/Android.mk b/src/gallium/targets/egl-static/Android.mk
index 06975db..88df6d1 100644
--- a/src/gallium/targets/egl-static/Android.mk
+++ b/src/gallium/targets/egl-static/Android.mk
@@ -39,6 +39,7 @@ LOCAL_C_INCLUDES := \
$(GALLIUM_TOP)/state_trackers/vega \
$(GALLIUM_TOP)/state_trackers/egl \
$(MESA_TOP)/src/egl/main \
+ $(MESA_TOP)/src/loader \
$(MESA_TOP)/src/mesa
# swrast
diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am
index fdd5a1d..ebffd0e 100644
--- a/src/gallium/targets/egl-static/Makefile.am
+++ b/src/gallium/targets/egl-static/Makefile.am
@@ -36,6 +36,7 @@ AM_CFLAGS = $(PTHREAD_CFLAGS)
AM_CPPFLAGS = \
$(GALLIUM_CFLAGS) \
-I$(top_srcdir)/include \
+ -I$(top_srcdir)/src/loader \
-I$(top_srcdir)/src/gallium/drivers \
-I$(top_srcdir)/src/gallium/winsys \
-I$(top_srcdir)/src/gallium/include \
diff --git a/src/gallium/targets/egl-static/SConscript b/src/gallium/targets/egl-static/SConscript
index b4ccc5b..56e12e8 100644
--- a/src/gallium/targets/egl-static/SConscript
+++ b/src/gallium/targets/egl-static/SConscript
@@ -7,6 +7,7 @@ env = env.Clone()
env.Append(CPPPATH = [
'#/include',
+ '#/src/loader',
'#/src/egl/main',
'#/src/gallium/auxiliary',
'#/src/gallium/drivers',