Mesa (master): mesa: merge equivalent switch cases in prog_statevars.c
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Jan 21 22:16:31 UTC 2021
Module: Mesa
Branch: master
Commit: fd6ce2be9048f112c94ee288baea02b46c0ea4cd
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fd6ce2be9048f112c94ee288baea02b46c0ea4cd
Author: Marek Olšák <marek.olsak at amd.com>
Date: Sat Dec 12 23:28:06 2020 -0500
mesa: merge equivalent switch cases in prog_statevars.c
Reviewed-by: Zoltán Böszörményi <zboszor at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8183>
---
src/mesa/program/prog_statevars.c | 76 ++++++++++++++-------------------------
1 file changed, 26 insertions(+), 50 deletions(-)
diff --git a/src/mesa/program/prog_statevars.c b/src/mesa/program/prog_statevars.c
index 43d84ad0d37..59f42d0d3e2 100644
--- a/src/mesa/program/prog_statevars.c
+++ b/src/mesa/program/prog_statevars.c
@@ -698,6 +698,10 @@ _mesa_program_state_flags(const gl_state_index16 state[STATE_LENGTH])
case STATE_LIGHT:
case STATE_LIGHT_ARRAY:
case STATE_LIGHTMODEL_AMBIENT:
+ case STATE_LIGHT_SPOT_DIR_NORMALIZED:
+ case STATE_LIGHT_POSITION:
+ case STATE_LIGHT_POSITION_NORMALIZED:
+ case STATE_LIGHT_HALF_VECTOR:
return _NEW_LIGHT;
case STATE_TEXGEN:
@@ -708,6 +712,7 @@ _mesa_program_state_flags(const gl_state_index16 state[STATE_LENGTH])
case STATE_FOG_COLOR:
return _NEW_FOG | _NEW_BUFFERS | _NEW_FRAG_CLAMP;
case STATE_FOG_PARAMS:
+ case STATE_FOG_PARAMS_OPTIMIZED:
return _NEW_FOG;
case STATE_CLIPPLANE:
@@ -721,7 +726,10 @@ _mesa_program_state_flags(const gl_state_index16 state[STATE_LENGTH])
case STATE_MODELVIEW_MATRIX_INVERSE:
case STATE_MODELVIEW_MATRIX_TRANSPOSE:
case STATE_MODELVIEW_MATRIX_INVTRANS:
+ case STATE_NORMAL_SCALE_EYESPACE:
+ case STATE_NORMAL_SCALE:
return _NEW_MODELVIEW;
+
case STATE_PROJECTION_MATRIX:
case STATE_PROJECTION_MATRIX_INVERSE:
case STATE_PROJECTION_MATRIX_TRANSPOSE:
@@ -744,8 +752,13 @@ _mesa_program_state_flags(const gl_state_index16 state[STATE_LENGTH])
return _NEW_TRACK_MATRIX;
case STATE_NUM_SAMPLES:
+ case STATE_FB_SIZE:
+ case STATE_FB_WPOS_Y_TRANSFORM:
return _NEW_BUFFERS;
+ case STATE_FB_PNTC_Y_TRANSFORM:
+ return _NEW_BUFFERS | _NEW_POINT;
+
case STATE_DEPTH_RANGE:
return _NEW_VIEWPORT;
@@ -759,41 +772,19 @@ _mesa_program_state_flags(const gl_state_index16 state[STATE_LENGTH])
case STATE_VERTEX_PROGRAM_LOCAL_ARRAY:
return _NEW_PROGRAM;
- case STATE_NORMAL_SCALE_EYESPACE:
- return _NEW_MODELVIEW;
-
case STATE_CURRENT_ATTRIB:
return _NEW_CURRENT_ATTRIB;
case STATE_CURRENT_ATTRIB_MAYBE_VP_CLAMPED:
return _NEW_CURRENT_ATTRIB | _NEW_LIGHT | _NEW_BUFFERS;
- case STATE_NORMAL_SCALE:
- return _NEW_MODELVIEW;
-
- case STATE_FOG_PARAMS_OPTIMIZED:
- return _NEW_FOG;
case STATE_POINT_SIZE_CLAMPED:
return _NEW_POINT | _NEW_MULTISAMPLE;
- case STATE_LIGHT_SPOT_DIR_NORMALIZED:
- case STATE_LIGHT_POSITION:
- case STATE_LIGHT_POSITION_NORMALIZED:
- case STATE_LIGHT_HALF_VECTOR:
- return _NEW_LIGHT;
case STATE_PT_SCALE:
case STATE_PT_BIAS:
return _NEW_PIXEL;
- case STATE_FB_SIZE:
- case STATE_FB_WPOS_Y_TRANSFORM:
- return _NEW_BUFFERS;
-
- case STATE_FB_PNTC_Y_TRANSFORM:
- return _NEW_BUFFERS | _NEW_POINT;
-
case STATE_ADVANCED_BLENDING_MODE:
- return _NEW_COLOR;
-
case STATE_ALPHA_REF:
return _NEW_COLOR;
@@ -1089,17 +1080,10 @@ _mesa_program_state_string(const gl_state_index16 state[STATE_LENGTH])
append_token(str, state[0]);
switch (state[0]) {
- case STATE_MATERIAL:
- append_index(str, state[1], false);
- break;
case STATE_LIGHT:
append_index(str, state[1], true); /* light number [i]. */
append_token(str, state[2]); /* coefficients */
break;
- case STATE_LIGHT_ARRAY:
- sprintf(tmp, "[%d..%d]", state[1], state[1] + state[2] - 1);
- append(str, tmp);
- break;
case STATE_LIGHTMODEL_AMBIENT:
break;
case STATE_LIGHTMODEL_SCENECOLOR:
@@ -1166,25 +1150,7 @@ _mesa_program_state_string(const gl_state_index16 state[STATE_LENGTH])
append(str, tmp);
}
break;
- case STATE_POINT_SIZE:
- break;
- case STATE_POINT_ATTENUATION:
- break;
- case STATE_FOG_PARAMS:
- break;
- case STATE_FOG_COLOR:
- break;
- case STATE_NUM_SAMPLES:
- break;
- case STATE_DEPTH_RANGE:
- break;
- case STATE_FRAGMENT_PROGRAM_ENV:
- case STATE_FRAGMENT_PROGRAM_LOCAL:
- case STATE_VERTEX_PROGRAM_ENV:
- case STATE_VERTEX_PROGRAM_LOCAL:
- /* state[1] = parameter index */
- append_index(str, state[1], false);
- break;
+ case STATE_LIGHT_ARRAY:
case STATE_FRAGMENT_PROGRAM_ENV_ARRAY:
case STATE_FRAGMENT_PROGRAM_LOCAL_ARRAY:
case STATE_VERTEX_PROGRAM_ENV_ARRAY:
@@ -1192,8 +1158,11 @@ _mesa_program_state_string(const gl_state_index16 state[STATE_LENGTH])
sprintf(tmp, "[%d..%d]", state[1], state[1] + state[2] - 1);
append(str, tmp);
break;
- case STATE_NORMAL_SCALE_EYESPACE:
- break;
+ case STATE_MATERIAL:
+ case STATE_FRAGMENT_PROGRAM_ENV:
+ case STATE_FRAGMENT_PROGRAM_LOCAL:
+ case STATE_VERTEX_PROGRAM_ENV:
+ case STATE_VERTEX_PROGRAM_LOCAL:
case STATE_CURRENT_ATTRIB:
case STATE_CURRENT_ATTRIB_MAYBE_VP_CLAMPED:
case STATE_LIGHT_SPOT_DIR_NORMALIZED:
@@ -1203,6 +1172,13 @@ _mesa_program_state_string(const gl_state_index16 state[STATE_LENGTH])
case STATE_CLIP_INTERNAL:
append_index(str, state[1], false);
break;
+ case STATE_POINT_SIZE:
+ case STATE_POINT_ATTENUATION:
+ case STATE_FOG_PARAMS:
+ case STATE_FOG_COLOR:
+ case STATE_NUM_SAMPLES:
+ case STATE_DEPTH_RANGE:
+ case STATE_NORMAL_SCALE_EYESPACE:
case STATE_NORMAL_SCALE:
case STATE_FOG_PARAMS_OPTIMIZED:
case STATE_POINT_SIZE_CLAMPED:
More information about the mesa-commit
mailing list