summaryrefslogtreecommitdiffstats
path: root/src/glsl/SConscript
diff options
context:
space:
mode:
authorRob Clark <robclark@freedesktop.org>2015-10-10 13:55:07 -0400
committerRob Clark <robclark@freedesktop.org>2015-10-16 19:33:38 -0400
commitb9b40ef9b7644ea24768bc8b7464b1719efe99bf (patch)
treeccca8ea0f2a4d0cbc6009cade33d9daf3c588c07 /src/glsl/SConscript
parent183db3a64557d5d231ef58ab5666286f323ff333 (diff)
nir: remove dependency on glsl
Move glsl_types into NIR, now that the dependency on glsl_symbol_table has been split out. Possibly makes sense to rename things at this point, but if we do that I'd like to keep it split out into a separate patch to make git history easier to follow (IMHO). v2: fix android build v3: I f***ing hate scons.. but at least it builds Reviewed-by: Jason Ekstrand <jason@jlekstrand.net> Signed-off-by: Rob Clark <robclark@freedesktop.org>
Diffstat (limited to 'src/glsl/SConscript')
-rw-r--r--src/glsl/SConscript2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index 89c603580a5..927cbdcdb78 100644
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -16,6 +16,7 @@ env.Prepend(CPPPATH = [
'#src/gallium/include',
'#src/gallium/auxiliary',
'#src/glsl',
+ '#src/glsl/nir',
'#src/glsl/glcpp',
])
@@ -80,6 +81,7 @@ mesa_objs = env.StaticObject([
'prog_hash_table.c',
'symbol_table.c',
'dummy_errors.c',
+ 'nir/glsl_types.cpp',
])
compiler_objs += mesa_objs