From 8b409a429fdc40351c8470aff28587e62ac7bf41 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Thu, 7 May 2020 13:24:46 -0700 Subject: [PATCH] freedreno/ir3: fix indirect cb0 load_ubo lowering We can no longer assume that `state->ranges[0]` is block 0. It *often* is, but when we encounter a "real" ubo that we lower to `load_uniform` before a block 0 `load_ubo`, it could end up another entry in the table. Resulting in the second pass after gathering ubo ranges, not finding a valid range. Which results in a `load_ubo` for a thing that is not actually a ubo making it's way into ir3 frontend. Resulting in grabbing what we think is a ubo address out of some unrelated const register, and trying to dereference that. Which as you can imagine, fails in amusing ways. Fixes: fc850080ee3 ("ir3: Rewrite UBO push analysis to support bindless") Signed-off-by: Rob Clark Part-of: (cherry picked from commit d69f6fd8529b1dcefa443a8cb31bd362bb64a28c) --- .pick_status.json | 2 +- src/freedreno/ir3/ir3_nir_analyze_ubo_ranges.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 4bec5a0ba00..b64d59081cb 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -175,7 +175,7 @@ "description": "freedreno/ir3: fix indirect cb0 load_ubo lowering", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "fc850080ee304c2a62f7313c4b7ebe121c3ebb53" }, diff --git a/src/freedreno/ir3/ir3_nir_analyze_ubo_ranges.c b/src/freedreno/ir3/ir3_nir_analyze_ubo_ranges.c index 17d79b97a2e..23b6827bb28 100644 --- a/src/freedreno/ir3/ir3_nir_analyze_ubo_ranges.c +++ b/src/freedreno/ir3/ir3_nir_analyze_ubo_ranges.c @@ -98,8 +98,8 @@ gather_ubo_ranges(nir_shader *nir, nir_intrinsic_instr *instr, /* If this is an indirect on UBO 0, we'll still lower it back to * load_uniform. Set the range to cover all of UBO 0. */ - state->range[0].start = 0; - state->range[0].end = ALIGN(nir->num_uniforms * 16, 16 * 4); + old_r->start = 0; + old_r->end = ALIGN(nir->num_uniforms * 16, 16 * 4); } return;