diff options
author | Rob Clark <robclark@freedesktop.org> | 2015-10-08 18:19:00 -0400 |
---|---|---|
committer | Rob Clark <robclark@freedesktop.org> | 2015-10-09 15:03:28 -0400 |
commit | c9b982b72d443b138cfbded2f40350771c0bb321 (patch) | |
tree | 77a24951da52105423bc6001a1dc5b75b6ee0485 /src/gallium/auxiliary/nir/tgsi_to_nir.c | |
parent | 7e441bf025cf8c5d088430d546acb4c0ed58d27b (diff) | |
download | external_mesa3d-c9b982b72d443b138cfbded2f40350771c0bb321.zip external_mesa3d-c9b982b72d443b138cfbded2f40350771c0bb321.tar.gz external_mesa3d-c9b982b72d443b138cfbded2f40350771c0bb321.tar.bz2 |
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 <adf.lists@gmail.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Rob Clark <robclark@freedesktop.org>
Diffstat (limited to 'src/gallium/auxiliary/nir/tgsi_to_nir.c')
-rw-r--r-- | src/gallium/auxiliary/nir/tgsi_to_nir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c index cf43ef2..0539cfc 100644 --- a/src/gallium/auxiliary/nir/tgsi_to_nir.c +++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c @@ -27,7 +27,7 @@ #include "glsl/nir/nir_control_flow.h" #include "glsl/nir/nir_builder.h" #include "glsl/list.h" -#include "glsl/shader_enums.h" +#include "glsl/nir/shader_enums.h" #include "nir/tgsi_to_nir.h" #include "tgsi/tgsi_parse.h" |