aboutsummaryrefslogtreecommitdiffstats
path: root/src/glsl
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2015-02-11 14:18:50 -0800
committerEric Anholt <[email protected]>2015-02-20 11:36:34 -0800
commite8c5cbfd921680c4a68755b66889338a6268debb (patch)
tree7572f6675d9ca68fd9cb9244b93ab24e74dd9bc0 /src/glsl
parentf5ac5e20b16d17b0adda6d856829dd0cf997f7dc (diff)
mesa: Add gallium include dirs to more parts of the tree.
v2: Try to patch up the scons bits. Reviewed-by: Jose Fonseca <[email protected]>
Diffstat (limited to 'src/glsl')
-rw-r--r--src/glsl/Makefile.am2
-rw-r--r--src/glsl/SConscript2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index 5d5cacc32c0..5a0a643daf2 100644
--- a/src/glsl/Makefile.am
+++ b/src/glsl/Makefile.am
@@ -26,6 +26,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/mapi \
-I$(top_srcdir)/src/mesa/ \
+ -I$(top_srcdir)/src/gallium/include \
+ -I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/glsl/glcpp \
-I$(top_srcdir)/src/glsl/nir \
-I$(top_srcdir)/src/gtest/include \
diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index 847e9624685..21c8266a636 100644
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -11,6 +11,8 @@ env.Prepend(CPPPATH = [
'#src',
'#src/mapi',
'#src/mesa',
+ '#src/gallium/include',
+ '#src/gallium/auxiliary',
'#src/glsl',
'#src/glsl/glcpp',
])