glsl: move shader_enums into nir
authorRob Clark <robclark@freedesktop.org>
Thu, 8 Oct 2015 22:19:00 +0000 (18:19 -0400)
committerRob Clark <robclark@freedesktop.org>
Fri, 9 Oct 2015 19:03:28 +0000 (15:03 -0400)
commitc9b982b72d443b138cfbded2f40350771c0bb321
tree77a24951da52105423bc6001a1dc5b75b6ee0485
parent7e441bf025cf8c5d088430d546acb4c0ed58d27b
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>
13 files changed:
src/Makefile.am
src/gallium/auxiliary/nir/tgsi_to_nir.c
src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c
src/gallium/drivers/freedreno/ir3/ir3_nir.h
src/gallium/drivers/freedreno/ir3/ir3_shader.h
src/glsl/Makefile.sources
src/glsl/nir/nir.h
src/glsl/nir/shader_enums.c [new file with mode: 0644]
src/glsl/nir/shader_enums.h [new file with mode: 0644]
src/glsl/shader_enums.c [deleted file]
src/glsl/shader_enums.h [deleted file]
src/mesa/Makefile.sources
src/mesa/main/mtypes.h