Merge ../mesa into vulkan

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

diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources
index face22ec6805c3de43f24eac7fcc1eaa10ea0b8a..65a26268c2e6ccf57c797c4bd49605e1fcf2482c 100644 (file)
--- a/src/glsl/Makefile.sources
+++ b/src/glsl/Makefile.sources
@@ -11,6 +11,7 @@ LIBGLCPP_GENERATED_FILES = \
        glcpp/glcpp-parse.c
 
 NIR_GENERATED_FILES = \
+       nir/nir_builder_opcodes.h \
        nir/nir_constant_expressions.c \
        nir/nir_opcodes.c \
        nir/nir_opcodes.h \
@@ -21,41 +22,67 @@ NIR_FILES = \
        nir/glsl_to_nir.h \
        nir/nir.c \
        nir/nir.h \
+       nir/nir_array.h \
+       nir/nir_builder.h \
+       nir/nir_constant_expressions.h \
+       nir/nir_control_flow.c \
+       nir/nir_control_flow.h \
+       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 \
        nir/nir_lower_alu_to_scalar.c \
        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_samplers.cpp \
+       nir/nir_lower_outputs_to_temporaries.c \
+       nir/nir_lower_phis_to_scalar.c \
+       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 \
        nir/nir_metadata.c \
+       nir/nir_move_vec_src_uses_to_dest.c \
+       nir/nir_normalize_cubemap_coords.c \
        nir/nir_opt_constant_folding.c \
        nir/nir_opt_copy_propagate.c \
        nir/nir_opt_cse.c \
        nir/nir_opt_dce.c \
+       nir/nir_opt_dead_cf.c \
+       nir/nir_opt_gcm.c \
        nir/nir_opt_global_to_local.c \
+       nir/nir_opt_peephole_ffma.c \
        nir/nir_opt_peephole_select.c \
+       nir/nir_opt_remove_phis.c \
+       nir/nir_opt_undef.c \
        nir/nir_print.c \
        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 \
        nir/nir_types.h \
        nir/nir_validate.c \
+       nir/nir_vla.h \
        nir/nir_worklist.c \
        nir/nir_worklist.h \
        nir/nir_types.cpp \
-       $(NIR_GENERATED_FILES)
+       nir/spirv_to_nir.c \
+       nir/spirv_glsl450_to_nir.c
 
 # libglsl
 
@@ -141,6 +168,8 @@ LIBGLSL_FILES = \
        lower_packed_varyings.cpp \
        lower_named_interface_blocks.cpp \
        lower_packing_builtins.cpp \
+       lower_subroutine.cpp \
+       lower_tess_level.cpp \
        lower_texture_projection.cpp \
        lower_variable_index_to_cond_assign.cpp \
        lower_vec_index_to_cond_assign.cpp \
@@ -152,12 +181,12 @@ LIBGLSL_FILES = \
        lower_ubo_reference.cpp \
        opt_algebraic.cpp \
        opt_array_splitting.cpp \
+       opt_conditional_discard.cpp \
        opt_constant_folding.cpp \
        opt_constant_propagation.cpp \
        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 \
@@ -177,7 +206,8 @@ LIBGLSL_FILES = \
        opt_vectorize.cpp \
        program.h \
        s_expression.cpp \
-       s_expression.h
+       s_expression.h \
+       shader_enums.h
 
 # glsl_compiler