Merge ../mesa into vulkan

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

diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources
index b539b45e432ca233f36113032f4d293964fc46cb..65a26268c2e6ccf57c797c4bd49605e1fcf2482c 100644 (file)
--- a/src/glsl/Makefile.sources
+++ b/src/glsl/Makefile.sources
@@ -30,6 +30,7 @@ NIR_FILES = \
        nir/nir_control_flow_private.h \
        nir/nir_dominance.c \
        nir/nir_from_ssa.c \
+       nir/nir_gs_count_vertices.c \
        nir/nir_intrinsics.c \
        nir/nir_intrinsics.h \
        nir/nir_live_variables.c \
@@ -37,16 +38,18 @@ NIR_FILES = \
        nir/nir_lower_atomics.c \
        nir/nir_lower_clip.c \
        nir/nir_lower_global_vars_to_local.c \
+       nir/nir_lower_gs_intrinsics.c \
        nir/nir_lower_load_const_to_scalar.c \
        nir/nir_lower_locals_to_regs.c \
        nir/nir_lower_idiv.c \
        nir/nir_lower_io.c \
        nir/nir_lower_outputs_to_temporaries.c \
        nir/nir_lower_phis_to_scalar.c \
-       nir/nir_lower_samplers.cpp \
+       nir/nir_lower_samplers.c \
        nir/nir_lower_system_values.c \
        nir/nir_lower_tex.c \
        nir/nir_lower_to_source_mods.c \
+       nir/nir_lower_two_sided_color.c \
        nir/nir_lower_vars_to_ssa.c \
        nir/nir_lower_var_copies.c \
        nir/nir_lower_vec_to_movs.c \
@@ -68,6 +71,7 @@ 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 \
@@ -76,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/spirv_to_nir.c \
+       nir/spirv_glsl450_to_nir.c
 
 # libglsl
 
@@ -181,7 +187,6 @@ LIBGLSL_FILES = \
        opt_constant_variable.cpp \
        opt_copy_propagation.cpp \
        opt_copy_propagation_elements.cpp \
-       opt_cse.cpp \
        opt_dead_builtin_variables.cpp \
        opt_dead_builtin_varyings.cpp \
        opt_dead_code.cpp \