fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-31 16:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pan/mdg: Bounds check swizzle writing globals

Browse source 
Fixes scheduler hang in:

dEQP-GLES31.functional.shaders.opaque_type_indexing.ubo.const_literal_compute

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6516>
This commit is contained in:
Alyssa Rosenzweig 2020-08-27 15:13:19 -04:00
parent 2486fe6761
commit 41184f89eb
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/panfrost/midgard/midgard_compile.c
View file

@ -1357,6 +1357,15 @@ emit_global(
mir_set_offset(ctx, &ins, offset, is_shared);
mir_set_intr_mask(instr, &ins, is_read);
/* Set a valid swizzle for masked out components */
assert(ins.mask);
unsigned first_component = __builtin_ffs(ins.mask) - 1;
for (unsigned i = 0; i < ARRAY_SIZE(ins.swizzle[0]); ++i) {
if (!(ins.mask & (1 << i)))
ins.swizzle[0][i] = first_component;
}
emit_mir_instruction(ctx, ins);
}