fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

broadcom/compiler: fix first_component assertion

Browse source 
first_component is an uint, and thus if it takes value 0 we can't know
if it is because writemask has its first bit to 1, or all bits to 0.

As we want to ensure that at least one bit is set, apply the assertion
in writemask.

Fixes CID#1472829 "Macro compares unsigned to 0 (NO_EFFECT)".

v2:
 - Restore "first_component <= last_component" assertion (Iago)

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10103>
This commit is contained in:
Juan A. Suarez Romero 2021-04-08 11:53:50 +02:00 • committed by Marge Bot
parent 46fc8ed432
commit cc8d4cd1ae
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/broadcom/compiler/nir_to_vir.c
View file

@ -315,13 +315,13 @@ emit_tmu_general_store_writes(struct v3d_compile *c,
* are enabled in the writemask and emit the TMUD
* instructions for them.
*/
assert(*writemask != 0);
uint32_t first_component = ffs(*writemask) - 1;
uint32_t last_component = first_component;
while (*writemask & BITFIELD_BIT(last_component + 1))
last_component++;
assert(first_component >= 0 &&
first_component <= last_component &&
assert(first_component <= last_component &&
last_component < instr->num_components);
for (int i = first_component; i <= last_component; i++) {