Module: Mesa
Branch: master
Commit: c9b982b72d443b138cfbded2f40350771c0bb321
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c9b982b72d443b138cfbded2f40350771c0bb321
Author: Rob Clark <robcl...@freedesktop.org>
Date: Thu Oct 8 18:19:00 2015 -0400
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.li...@gmail.com>
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
Signed-off-by: Rob Clark <robcl...@freedesktop.org>
---
src/Makefile.am | 1 -
src/gallium/auxiliary/nir/tgsi_to_nir.c | 2 +-
src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c | 1 -
src/gallium/drivers/freedreno/ir3/ir3_nir.h | 1 +
src/gallium/drivers/freedreno/ir3/ir3_shader.h | 2 +-
src/glsl/Makefile.sources | 7 ++++---
src/glsl/nir/nir.h | 2 +-
src/glsl/{ => nir}/shader_enums.c | 2 +-
src/glsl/{ => nir}/shader_enums.h | 0
src/mesa/Makefile.sources | 4 +---
src/mesa/main/mtypes.h | 2 +-
11 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 9e15cca..0d49bcd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -62,7 +62,6 @@ AM_CPPFLAGS = \
noinst_LTLIBRARIES = libglsl_util.la
libglsl_util_la_SOURCES = \
- glsl/shader_enums.c \
mesa/main/imports.c \
mesa/program/prog_hash_table.c \
mesa/program/symbol_table.c \
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"
diff --git a/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c
b/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c
index 7eddbdd..8c9234b 100644
--- a/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c
+++ b/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c
@@ -36,7 +36,6 @@
#include "tgsi/tgsi_strings.h"
#include "nir/tgsi_to_nir.h"
-#include "glsl/shader_enums.h"
#include "freedreno_util.h"
diff --git a/src/gallium/drivers/freedreno/ir3/ir3_nir.h
b/src/gallium/drivers/freedreno/ir3/ir3_nir.h
index f3d3075..9950782 100644
--- a/src/gallium/drivers/freedreno/ir3/ir3_nir.h
+++ b/src/gallium/drivers/freedreno/ir3/ir3_nir.h
@@ -30,6 +30,7 @@
#define IR3_NIR_H_
#include "glsl/nir/nir.h"
+#include "glsl/nir/shader_enums.h"
bool ir3_nir_lower_if_else(nir_shader *shader);
diff --git a/src/gallium/drivers/freedreno/ir3/ir3_shader.h
b/src/gallium/drivers/freedreno/ir3/ir3_shader.h
index 6dc0ce1..7e2c27d 100644
--- a/src/gallium/drivers/freedreno/ir3/ir3_shader.h
+++ b/src/gallium/drivers/freedreno/ir3/ir3_shader.h
@@ -30,7 +30,7 @@
#define IR3_SHADER_H_
#include "pipe/p_state.h"
-#include "glsl/shader_enums.h"
+#include "glsl/nir/shader_enums.h"
#include "ir3.h"
#include "disasm.h"
diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources
index bb8bddc..436949c 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 befc7fc..112c6b5 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
similarity index 99%
rename from src/glsl/shader_enums.c
rename to src/glsl/nir/shader_enums.c
index c196b79..3722475 100644
--- a/src/glsl/shader_enums.c
+++ b/src/glsl/nir/shader_enums.c
@@ -26,7 +26,7 @@
* Rob Clark <robcl...@freedesktop.org>
*/
-#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
similarity index 100%
rename from src/glsl/shader_enums.h
rename to src/glsl/nir/shader_enums.h
diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources
index 0915594..b40ee4d 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 5272372..0a54b20 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 */
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
