From: Rob Clark <robdclark@gmail.com>
Date: Thu, 17 May 2018 18:22:01 +0000 (-0400)
Subject: mesa/st: temporarily disable lower_io_to_elements()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3859e0b4fe935c1bc399a7f5e8f2b5b5c73bcd60;p=mesa.git

mesa/st: temporarily disable lower_io_to_elements()

Not required for correctness, and makes the order of converting passes
to deref instructions hard to get right for both prog_to_nir and
glsl_to_nir cases.

Signed-off-by: Rob Clark <robdclark@gmail.com>
Acked-by: Rob Clark <robdclark@gmail.com>
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Acked-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp
index 55615728da7..56d53bd7db3 100644
--- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
@@ -596,7 +596,7 @@ st_nir_get_mesa_program(struct gl_context *ctx,
 static void
 st_nir_link_shaders(nir_shader **producer, nir_shader **consumer, bool scalar)
 {
-   nir_lower_io_arrays_to_elements(*producer, *consumer);
+   /* nir_lower_io_arrays_to_elements(*producer, *consumer); */
 
    NIR_PASS_V(*producer, nir_remove_dead_variables, nir_var_shader_out);
    NIR_PASS_V(*consumer, nir_remove_dead_variables, nir_var_shader_in);