Mesa (master): freedreno/ir3: fix emit_tex_info split_dest

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: aeb5b9cebf5c5fde2eed9be1d0ec64afd8aa8b6d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=aeb5b9cebf5c5fde2eed9be1d0ec64afd8aa8b6d

Author: Jonathan Marek <jonathan at marek.ca>
Date:   Tue Apr 14 14:19:14 2020 -0400

freedreno/ir3: fix emit_tex_info split_dest

Fixes a "free(): invalid next size (fast)" error in:

dEQP-VK.glsl.texture_functions.query.texturequerylevels.*

Signed-off-by: Jonathan Marek <jonathan at marek.ca>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4557>

---

 src/freedreno/ir3/ir3_compiler_nir.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/freedreno/ir3/ir3_compiler_nir.c b/src/freedreno/ir3/ir3_compiler_nir.c
index 307eded893a..8c676b2f3ce 100644
--- a/src/freedreno/ir3/ir3_compiler_nir.c
+++ b/src/freedreno/ir3/ir3_compiler_nir.c
@@ -2515,8 +2515,7 @@ emit_tex_info(struct ir3_context *ctx, nir_tex_instr *tex, unsigned idx)
 	/* even though there is only one component, since it ends
 	 * up in .y/.z/.w rather than .x, we need a split_dest()
 	 */
-	if (idx)
-		ir3_split_dest(b, dst, sam, 0, idx + 1);
+	ir3_split_dest(b, dst, sam, idx, 1);
 
 	/* The # of levels comes from getinfo.z. We need to add 1 to it, since
 	 * the value in TEX_CONST_0 is zero-based.