diff options
| author | Rob Clark <[email protected]> | 2015-10-10 13:55:07 -0400 |
|---|---|---|
| committer | Rob Clark <[email protected]> | 2015-10-16 19:33:38 -0400 |
| commit | b9b40ef9b7644ea24768bc8b7464b1719efe99bf (patch) | |
| tree | ccca8ea0f2a4d0cbc6009cade33d9daf3c588c07 /src/glsl/Makefile.sources | |
| parent | 183db3a64557d5d231ef58ab5666286f323ff333 (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 <[email protected]>
Signed-off-by: Rob Clark <[email protected]>
Diffstat (limited to 'src/glsl/Makefile.sources')
| -rw-r--r-- | src/glsl/Makefile.sources | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources index 4da64f43873..ca870367640 100644 --- a/src/glsl/Makefile.sources +++ b/src/glsl/Makefile.sources @@ -20,6 +20,8 @@ NIR_GENERATED_FILES = \ NIR_FILES = \ nir/glsl_to_nir.cpp \ nir/glsl_to_nir.h \ + nir/glsl_types.cpp \ + nir/glsl_types.h \ nir/nir.c \ nir/nir.h \ nir/nir_array.h \ @@ -104,8 +106,6 @@ LIBGLSL_FILES = \ glsl_parser_extras.h \ glsl_symbol_table.cpp \ glsl_symbol_table.h \ - glsl_types.cpp \ - glsl_types.h \ hir_field_selection.cpp \ ir_basic_block.cpp \ ir_basic_block.h \ |