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/glsl | |
| 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/glsl')
| -rw-r--r-- | src/glsl/Makefile.sources | 7 | ||||
| -rw-r--r-- | src/glsl/nir/nir.h | 2 | ||||
| -rw-r--r-- | src/glsl/nir/shader_enums.c (renamed from src/glsl/shader_enums.c) | 2 | ||||
| -rw-r--r-- | src/glsl/nir/shader_enums.h (renamed from src/glsl/shader_enums.h) | 0 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources index bb8bddc69af..436949cd760 100644 --- a/src/glsl/Makefile.sources +++ b/src/glsl/Makefile.sources @@ -80,7 +80,9 @@ NIR_FILES = \ nir/nir_vla.h \ nir/nir_worklist.c \ nir/nir_worklist.h \ - nir/nir_types.cpp + nir/nir_types.cpp \ + nir/shader_enums.h \ + nir/shader_enums.c # libglsl @@ -204,8 +206,7 @@ LIBGLSL_FILES = \ opt_vectorize.cpp \ program.h \ s_expression.cpp \ - s_expression.h \ - shader_enums.h + s_expression.h # glsl_compiler diff --git a/src/glsl/nir/nir.h b/src/glsl/nir/nir.h index befc7fce724..112c6b5412a 100644 --- a/src/glsl/nir/nir.h +++ b/src/glsl/nir/nir.h @@ -35,7 +35,7 @@ #include "util/set.h" #include "util/bitset.h" #include "nir_types.h" -#include "glsl/shader_enums.h" +#include "shader_enums.h" #include <stdio.h> #include "nir_opcodes.h" diff --git a/src/glsl/shader_enums.c b/src/glsl/nir/shader_enums.c index c196b791d4f..3722475731b 100644 --- a/src/glsl/shader_enums.c +++ b/src/glsl/nir/shader_enums.c @@ -26,7 +26,7 @@ * Rob Clark <[email protected]> */ -#include "glsl/shader_enums.h" +#include "shader_enums.h" #include "util/macros.h" #define ENUM(x) [x] = #x diff --git a/src/glsl/shader_enums.h b/src/glsl/nir/shader_enums.h index 2a5d2c5bfa7..2a5d2c5bfa7 100644 --- a/src/glsl/shader_enums.h +++ b/src/glsl/nir/shader_enums.h |