[Mesa-stable] [PATCH 2/9] nir/lower_indirect_derefs: Use the direct array deref for recursion

Jason Ekstrand jason at jlekstrand.net
Fri Jul 22 04:21:42 UTC 2016


This fixes about 100 of the new Vulkan CTS tests.

Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
Cc: "12.0" <mesa-stable at lists.freedesktop.org>
Cc: Connor Abbott <cwabbott0 at gmail.com>
Cc: Ian Romanick <idr at freedesktop.org>
Cc: Kenneth Graunke <kenneth at whitecape.org>
---
 src/compiler/nir/nir_lower_indirect_derefs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/nir/nir_lower_indirect_derefs.c b/src/compiler/nir/nir_lower_indirect_derefs.c
index 694a6e0..1bf4bf6 100644
--- a/src/compiler/nir/nir_lower_indirect_derefs.c
+++ b/src/compiler/nir/nir_lower_indirect_derefs.c
@@ -50,7 +50,7 @@ emit_indirect_load_store(nir_builder *b, nir_intrinsic_instr *orig_instr,
       direct.indirect = NIR_SRC_INIT;
 
       arr_parent->child = &direct.deref;
-      emit_load_store(b, orig_instr, deref, &arr->deref, dest, src);
+      emit_load_store(b, orig_instr, deref, &direct.deref, dest, src);
       arr_parent->child = &arr->deref;
    } else {
       int mid = start + (end - start) / 2;
-- 
2.5.0.400.gff86faf



More information about the mesa-stable mailing list