[Mesa-dev] [PATCH 12/16] Revert "HACK! nir: Disable building a couple passes"

[Rob Clark]

This reverts commit 28847bbe8d6f65f1bba7197f80c58054183b1c8c.
---
 src/compiler/Makefile.sources | 3 +++
 src/compiler/nir/meson.build  | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources
index fe328eef737..21b1f852e2e 100644
--- a/src/compiler/Makefile.sources
+++ b/src/compiler/Makefile.sources
@@ -230,13 +230,16 @@ NIR_FILES = \
 	nir/nir_lower_indirect_derefs.c \
 	nir/nir_lower_int64.c \
 	nir/nir_lower_io.c \
+	nir/nir_lower_io_arrays_to_elements.c \
 	nir/nir_lower_io_to_temporaries.c \
+	nir/nir_lower_io_to_scalar.c \
 	nir/nir_lower_passthrough_edgeflags.c \
 	nir/nir_lower_patch_vertices.c \
 	nir/nir_lower_phis_to_scalar.c \
 	nir/nir_lower_regs_to_ssa.c \
 	nir/nir_lower_returns.c \
 	nir/nir_lower_samplers.c \
+	nir/nir_lower_samplers_as_deref.c \
 	nir/nir_lower_subgroups.c \
 	nir/nir_lower_system_values.c \
 	nir/nir_lower_tex.c \
diff --git a/src/compiler/nir/meson.build b/src/compiler/nir/meson.build
index 1ce85c0f69c..1c13864a6b7 100644
--- a/src/compiler/nir/meson.build
+++ b/src/compiler/nir/meson.build
@@ -125,16 +125,16 @@ files_libnir = files(
   'nir_lower_indirect_derefs.c',
   'nir_lower_int64.c',
   'nir_lower_io.c',
-#  'nir_lower_io_arrays_to_elements.c',
+  'nir_lower_io_arrays_to_elements.c',
   'nir_lower_io_to_temporaries.c',
-#  'nir_lower_io_to_scalar.c',
+  'nir_lower_io_to_scalar.c',
   'nir_lower_passthrough_edgeflags.c',
   'nir_lower_patch_vertices.c',
   'nir_lower_phis_to_scalar.c',
   'nir_lower_regs_to_ssa.c',
   'nir_lower_returns.c',
   'nir_lower_samplers.c',
-#  'nir_lower_samplers_as_deref.c',
+  'nir_lower_samplers_as_deref.c',
   'nir_lower_subgroups.c',
   'nir_lower_system_values.c',
   'nir_lower_tex.c',
-- 
2.14.3