Remove more spirv2nir remnants

diff --git a/src/compiler/glsl/.gitignore b/src/compiler/glsl/.gitignore
index 6db4e738f6e1f26ec7af3f5634856b010ba9bb1d..09951bac4455e3e3c9afd6b175ca53bb9a9dfc23 100644 (file)
--- a/src/compiler/glsl/.gitignore
+++ b/src/compiler/glsl/.gitignore
@@ -3,7 +3,6 @@ glsl_parser.cpp
 glsl_parser.h
 glsl_parser.output
 glsl_test
-spirv2nir
 subtest-cr/
 subtest-lf/
 subtest-cr-lf/

diff --git a/src/compiler/glsl/Makefile.am b/src/compiler/glsl/Makefile.am
index d6b1f9ed6958da6d852e88aba95229352c7b0390..9954b81240338659ec881300cf3eec29dcc067c4 100644 (file)
--- a/src/compiler/glsl/Makefile.am
+++ b/src/compiler/glsl/Makefile.am
@@ -66,7 +66,7 @@ check_PROGRAMS =                                      \
        tests/sampler-types-test                        \
        tests/uniform-initializer-test
 
-noinst_PROGRAMS = glsl_compiler spirv2nir
+noinst_PROGRAMS = glsl_compiler
 
 tests_blob_test_SOURCES =                              \
        tests/blob_test.c
@@ -135,6 +135,7 @@ libglsl_la_SOURCES =                                        \
        glsl_parser.h                                   \
        $(LIBGLSL_FILES)
 
+
 glsl_compiler_SOURCES = \
        $(GLSL_COMPILER_CXX_FILES)
 
@@ -144,16 +145,6 @@ glsl_compiler_LDADD =                                      \
        $(top_builddir)/src/util/libmesautil.la         \
        $(PTHREAD_LIBS)
 
-spirv2nir_SOURCES = \
-       standalone_scaffolding.cpp \
-       standalone_scaffolding.h \
-       nir/spirv2nir.c
-
-spirv2nir_LDADD =                                      \
-       libglsl.la                                      \
-       $(top_builddir)/src/libglsl_util.la             \
-       $(PTHREAD_LIBS)
-
 glsl_test_SOURCES = \
        standalone_scaffolding.cpp \
        test.cpp \

diff --git a/src/compiler/glsl/Makefile.sources b/src/compiler/glsl/Makefile.sources
index 970fab03bbfe0239544920aee68f5b262af2e42d..538196a79a92048d0de47b5e2586512642cce3ca 100644 (file)
--- a/src/compiler/glsl/Makefile.sources
+++ b/src/compiler/glsl/Makefile.sources
@@ -29,9 +29,7 @@ NIR_FILES = \
        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_instr_set.c \
@@ -40,10 +38,8 @@ 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 \
@@ -71,11 +67,8 @@ NIR_FILES = \
        nir/nir_opt_peephole_select.c \
        nir/nir_opt_remove_phis.c \
        nir/nir_opt_undef.c \
-       nir/nir_phi_builder.c \
-       nir/nir_phi_builder.h \
        nir/nir_print.c \
        nir/nir_remove_dead_variables.c \
-       nir/nir_repair_ssa.c \
        nir/nir_search.c \
        nir/nir_search.h \
        nir/nir_split_var_copies.c \
@@ -86,15 +79,6 @@ NIR_FILES = \
        nir/nir_worklist.c \
        nir/nir_worklist.h
 
-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 \
-       nir/spirv/vtn_variables.c
-
 # libglsl
 
 LIBGLSL_FILES = \