Merge remote-tracking branch 'mesa-public/master' into vulkan

[mesa.git] / src / glsl / Makefile.sources

diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources
index e64c31e17c6b5f6b6b29a977ac729dcadb63b1af..80d21a0718d31eb0e13a5f33d390c8d77a050a73 100644 (file)
--- a/src/glsl/Makefile.sources
+++ b/src/glsl/Makefile.sources
@@ -18,8 +18,6 @@ NIR_GENERATED_FILES = \
        nir/nir_opt_algebraic.c
 
 NIR_FILES = \
-       nir/glsl_to_nir.cpp \
-       nir/glsl_to_nir.h \
        nir/glsl_types.cpp \
        nir/glsl_types.h \
        nir/builtin_type_macros.h \
@@ -36,6 +34,7 @@ NIR_FILES = \
        nir/nir_from_ssa.c \
        nir/nir_gather_info.c \
        nir/nir_gs_count_vertices.c \
+       nir/nir_inline_functions.c \
        nir/nir_intrinsics.c \
        nir/nir_intrinsics.h \
        nir/nir_instr_set.c \
@@ -44,8 +43,10 @@ NIR_FILES = \
        nir/nir_lower_alu_to_scalar.c \
        nir/nir_lower_atomics.c \
        nir/nir_lower_clip.c \
+       nir/nir_lower_returns.c \
        nir/nir_lower_global_vars_to_local.c \
        nir/nir_lower_gs_intrinsics.c \
+        nir/nir_lower_indirect_derefs.c \
        nir/nir_lower_load_const_to_scalar.c \
        nir/nir_lower_locals_to_regs.c \
        nir/nir_lower_idiv.c \
@@ -77,7 +78,6 @@ NIR_FILES = \
        nir/nir_remove_dead_variables.c \
        nir/nir_search.c \
        nir/nir_search.h \
-       nir/nir_spirv.h \
        nir/nir_split_var_copies.c \
        nir/nir_sweep.c \
        nir/nir_to_ssa.c \
@@ -88,9 +88,15 @@ NIR_FILES = \
        nir/nir_worklist.h \
        nir/nir_types.cpp \
        nir/shader_enums.h \
-       nir/shader_enums.c \
-       nir/spirv_to_nir.c \
-       nir/spirv_glsl450_to_nir.c
+       nir/shader_enums.c
+
+SPIRV_FILES = \
+       nir/spirv/nir_spirv.h \
+       nir/spirv/spirv_to_nir.c \
+       nir/spirv/vtn_alu.c \
+       nir/spirv/vtn_cfg.c \
+       nir/spirv/vtn_glsl450.c \
+       nir/spirv/vtn_private.h
 
 # libglsl
 
@@ -217,6 +223,11 @@ LIBGLSL_FILES = \
        s_expression.cpp \
        s_expression.h
 
+# glsl to nir pass
+GLSL_TO_NIR_FILES = \
+       nir/glsl_to_nir.cpp \
+       nir/glsl_to_nir.h
+
 # glsl_compiler
 
 GLSL_COMPILER_CXX_FILES = \