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 b876642e859ebca526a5f95ab68c532a4e531aac..80d21a0718d31eb0e13a5f33d390c8d77a050a73 100644 (file)
--- a/src/glsl/Makefile.sources
+++ b/src/glsl/Makefile.sources
@@ -18,49 +18,85 @@ 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 \
        nir/nir.c \
        nir/nir.h \
+       nir/nir_array.h \
+       nir/nir_builder.h \
+       nir/nir_clone.c \
        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_gather_info.c \
+       nir/nir_gs_count_vertices.c \
+       nir/nir_inline_functions.c \
        nir/nir_intrinsics.c \
        nir/nir_intrinsics.h \
-       nir/nir_live_variables.c \
+       nir/nir_instr_set.c \
+       nir/nir_instr_set.h \
+       nir/nir_liveness.c \
        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 \
        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 \
        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_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_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/shader_enums.h \
+       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
 
@@ -74,15 +110,12 @@ LIBGLSL_FILES = \
        blob.c \
        blob.h \
        builtin_functions.cpp \
-       builtin_type_macros.h \
        builtin_types.cpp \
        builtin_variables.cpp \
        glsl_parser_extras.cpp \
        glsl_parser_extras.h \
        glsl_symbol_table.cpp \
        glsl_symbol_table.h \
-       glsl_types.cpp \
-       glsl_types.h \
        hir_field_selection.cpp \
        ir_basic_block.cpp \
        ir_basic_block.h \
@@ -133,6 +166,8 @@ LIBGLSL_FILES = \
        loop_analysis.h \
        loop_controls.cpp \
        loop_unroll.cpp \
+       lower_buffer_access.cpp \
+       lower_buffer_access.h \
        lower_clip_distance.cpp \
        lower_const_arrays_to_uniforms.cpp \
        lower_discard.cpp \
@@ -146,14 +181,18 @@ 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 \
        lower_vec_index_to_swizzle.cpp \
        lower_vector.cpp \
+       lower_vector_derefs.cpp \
        lower_vector_insert.cpp \
        lower_vertex_id.cpp \
        lower_output_reads.cpp \
+       lower_shared_reference.cpp \
        lower_ubo_reference.cpp \
        opt_algebraic.cpp \
        opt_array_splitting.cpp \
@@ -163,7 +202,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 \
@@ -185,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 = \