Module: Mesa
Branch: master
Commit: 8698194313f91a3aaec2ad84c4ea5a4892cf5f1a
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=8698194313f91a3aaec2ad84c4ea5a4892cf5f1a
Author: Thomas Hindoe Paaboel Andersen <pho...@gmail.com>
Date: Wed May 4 05:48:39 2016 +0200
nir: fix assert for wildcard pairs
The assert was null checking dest_arr_parent twice. The intention
seems to be to check both dest_ and src_.
Added in d3636da9
Reviewed-by: Eduardo Lima Mitev <el...@igalia.com>
---
src/compiler/nir/nir_lower_var_copies.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/compiler/nir/nir_lower_var_copies.c
b/src/compiler/nir/nir_lower_var_copies.c
index 707d5af..1a7e2ee 100644
--- a/src/compiler/nir/nir_lower_var_copies.c
+++ b/src/compiler/nir/nir_lower_var_copies.c
@@ -85,7 +85,7 @@ emit_copy_load_store(nir_intrinsic_instr *copy_instr,
if (src_arr_parent || dest_arr_parent) {
/* Wildcards had better come in matched pairs */
- assert(dest_arr_parent && dest_arr_parent);
+ assert(src_arr_parent && dest_arr_parent);
nir_deref_array *src_arr = nir_deref_as_array(src_arr_parent->child);
nir_deref_array *dest_arr = nir_deref_as_array(dest_arr_parent->child);
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
