KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freedreno/ir3: Fix off-by-one in prefetch safety assert. 

This looks like just a typo, we allow up to == 0xf in the lowering pass.

Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13668>
This commit is contained in:
Emma Anholt 2021-11-03 13:29:28 -07:00 committed by Marge Bot
parent b0f2b0e980
commit 34739cb6e2
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/freedreno/ci/freedreno-a630-fails.txt
View File

@ -82,9 +82,6 @@ spec@arb_arrays_of_arrays@execution@image_store@basic-imagestore-mixed-const-non
spec@arb_arrays_of_arrays@execution@image_store@basic-imagestore-mixed-const-non-const-uniform-index,Crash
spec@arb_arrays_of_arrays@execution@image_store@basic-imagestore-non-const-uniform-index,Crash
# "shader_runner: ../src/freedreno/ir3/ir3_compiler_nir.c:3928: collect_tex_prefetches: Assertion `fetch->samp_id < 0xf' failed."
spec@arb_arrays_of_arrays@execution@sampler@fs-struct-const-index-sampler-const-index,Crash
spec@arb_compute_shader@execution@border-color,Fail
spec@arb_depth_buffer_float@fbo-clear-formats stencil,Fail
spec@arb_depth_buffer_float@fbo-clear-formats stencil@GL_DEPTH32F_STENCIL8,Fail

2
src/freedreno/ir3/ir3_compiler_nir.c
View File

@ -4053,7 +4053,7 @@ collect_tex_prefetches(struct ir3_context *ctx, struct ir3 *ir)
*/
assert(fetch->dst <= 0x3f);
assert(fetch->tex_id <= 0x1f);
assert(fetch->samp_id < 0xf);
assert(fetch->samp_id <= 0xf);
ctx->so->total_in =
MAX2(ctx->so->total_in, instr->prefetch.input_offset + 2);