OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Use a switch for state_iter and be more precise about its type

Browse Source 
Even if this technically won't change anything, it prevents a false-positive of
uninitialized use of variables with clang.

Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26067>
This commit is contained in:
Corentin Noël
2023-11-06 14:22:32 +01:00
committed by Marge Bot
parent 9c78a3f5ae
commit 8e196214a0
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mesa/program/prog_statevars.c
View File

@@ -1617,22 +1617,28 @@ _mesa_optimize_state_parameters(struct gl_constants *consts,
gl_state_index16 state = STATE_NOT_STATE_VAR;
unsigned num_lights = 0;
for (unsigned state_iter = STATE_LIGHTPROD_ARRAY_FRONT;
for (gl_state_index state_iter = STATE_LIGHTPROD_ARRAY_FRONT;
state_iter <= STATE_LIGHTPROD_ARRAY_TWOSIDE; state_iter++) {
unsigned num_attribs, base_attrib, attrib_incr;
if (state_iter == STATE_LIGHTPROD_ARRAY_FRONT) {
switch (state_iter) {
case STATE_LIGHTPROD_ARRAY_FRONT:
num_attribs = 3;
base_attrib = MAT_ATTRIB_FRONT_AMBIENT;
attrib_incr = 2;
} else if (state_iter == STATE_LIGHTPROD_ARRAY_BACK) {
break;
case STATE_LIGHTPROD_ARRAY_BACK:
num_attribs = 3;
base_attrib = MAT_ATTRIB_BACK_AMBIENT;
attrib_incr = 2;
} else if (state_iter == STATE_LIGHTPROD_ARRAY_TWOSIDE) {
break;
case STATE_LIGHTPROD_ARRAY_TWOSIDE:
num_attribs = 6;
base_attrib = MAT_ATTRIB_FRONT_AMBIENT;
attrib_incr = 1;
break;
default:
unreachable("unexpected state-var");
}
/* Find all attributes for one light. */