diff options
| author | Rob Clark <[email protected]> | 2015-10-08 18:19:00 -0400 |
|---|---|---|
| committer | Rob Clark <[email protected]> | 2015-10-09 15:03:28 -0400 |
| commit | c9b982b72d443b138cfbded2f40350771c0bb321 (patch) | |
| tree | 77a24951da52105423bc6001a1dc5b75b6ee0485 /src/mesa | |
| parent | 7e441bf025cf8c5d088430d546acb4c0ed58d27b (diff) | |
glsl: move shader_enums into nir
First step towards inverting the dependency between glsl and nir (so nir
can be used without glsl). Also solves this issue with 'make distclean'
Making distclean in mesa
make[2]: Entering directory '/mnt/sdb1/Src64/Mesa-git/mesa/src/mesa'
Makefile:2486: ../glsl/.deps/shader_enums.Plo: No such file or directory
make[2]: *** No rule to make target '../glsl/.deps/shader_enums.Plo'. Stop.
make[2]: Leaving directory '/mnt/sdb1/Src64/Mesa-git/mesa/src/mesa'
Makefile:684: recipe for target 'distclean-recursive' failed
make[1]: *** [distclean-recursive] Error 1
make[1]: Leaving directory '/mnt/sdb1/Src64/Mesa-git/mesa/src'
Makefile:615: recipe for target 'distclean-recursive' failed
make: *** [distclean-recursive] Error 1
Reported-by: Andy Furniss <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Signed-off-by: Rob Clark <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/Makefile.sources | 4 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources index 0915594cea6..b40ee4d395b 100644 --- a/src/mesa/Makefile.sources +++ b/src/mesa/Makefile.sources @@ -525,9 +525,7 @@ PROGRAM_FILES = \ program/sampler.h \ program/string_to_uint_map.cpp \ program/symbol_table.c \ - program/symbol_table.h \ - ../glsl/shader_enums.c \ - ../glsl/shader_enums.h + program/symbol_table.h PROGRAM_NIR_FILES = \ program/prog_to_nir.c \ diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 5272372eb8e..0a54b2073e2 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -42,7 +42,7 @@ #include "main/config.h" #include "glapi/glapi.h" #include "math/m_matrix.h" /* GLmatrix */ -#include "glsl/shader_enums.h" +#include "glsl/nir/shader_enums.h" #include "main/formats.h" /* MESA_FORMAT_COUNT */ |