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

Merge commit 'origin/master' into gallium-0.2

Browse Source
This commit is contained in:
Alan Hourihane
2008-11-28 16:19:10 +00:00
parent 5b71472389 c303e7299b
commit c4c86bbd16
13 changed files with 240 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/mesa/shader/prog_statevars.c
View File

@@ -631,6 +631,9 @@ append(char *dst, const char *src)
}
/**
* Convert token 'k' to a string, append it only 'dst' string.
*/
static void
append_token(char *dst, gl_state_index k)
{
@@ -763,11 +766,30 @@ append_token(char *dst, gl_state_index k)
case STATE_LOCAL:
append(dst, "local");
break;
/* BEGIN internal state vars */
case STATE_INTERNAL:
append(dst, "(internal)");
break;
case STATE_NORMAL_SCALE:
append(dst, "normalScale");
break;
case STATE_INTERNAL:
append(dst, "(internal)");
case STATE_TEXRECT_SCALE:
append(dst, "texrectScale");
break;
case STATE_FOG_PARAMS_OPTIMIZED:
append(dst, "fogParamsOptimized");
break;
case STATE_LIGHT_SPOT_DIR_NORMALIZED:
append(dst, "lightSpotDirNormalized");
break;
case STATE_LIGHT_POSITION:
append(dst, "lightPosition");
break;
case STATE_LIGHT_POSITION_NORMALIZED:
append(dst, "light.position.normalized");
break;
case STATE_LIGHT_HALF_VECTOR:
append(dst, "lightHalfVector");
break;
case STATE_PT_SCALE:
append(dst, "PTscale");
@@ -818,16 +840,16 @@ _mesa_program_state_string(const gl_state_index state[STATE_LENGTH])
char tmp[30];
append(str, "state.");
append_token(str, (gl_state_index) state[0]);
append_token(str, state[0]);
switch (state[0]) {
case STATE_MATERIAL:
append_face(str, state[1]);
append_token(str, (gl_state_index) state[2]);
append_token(str, state[2]);
break;
case STATE_LIGHT:
append_index(str, state[1]); /* light number [i]. */
append_token(str, (gl_state_index) state[2]); /* coefficients */
append_token(str, state[2]); /* coefficients */
break;
case STATE_LIGHTMODEL_AMBIENT:
append(str, "lightmodel.ambient");
@@ -843,11 +865,11 @@ _mesa_program_state_string(const gl_state_index state[STATE_LENGTH])
case STATE_LIGHTPROD:
append_index(str, state[1]); /* light number [i]. */
append_face(str, state[2]);
append_token(str, (gl_state_index) state[3]);
append_token(str, state[3]);
break;
case STATE_TEXGEN:
append_index(str, state[1]); /* tex unit [i] */
append_token(str, (gl_state_index) state[2]); /* plane coef */
append_token(str, state[2]); /* plane coef */
break;
case STATE_TEXENV_COLOR:
append_index(str, state[1]); /* tex unit [i] */
@@ -869,11 +891,11 @@ _mesa_program_state_string(const gl_state_index state[STATE_LENGTH])
/* state[2] = first row to fetch */
/* state[3] = last row to fetch */
/* state[4] = transpose, inverse or invtrans */
const gl_state_index mat = (gl_state_index) state[0];
const gl_state_index mat = state[0];
const GLuint index = (GLuint) state[1];
const GLuint firstRow = (GLuint) state[2];
const GLuint lastRow = (GLuint) state[3];
const gl_state_index modifier = (gl_state_index) state[4];
const gl_state_index modifier = state[4];
if (index ||
mat == STATE_TEXTURE_MATRIX ||
mat == STATE_PROGRAM_MATRIX)
@@ -901,10 +923,11 @@ _mesa_program_state_string(const gl_state_index state[STATE_LENGTH])
case STATE_VERTEX_PROGRAM:
/* state[1] = {STATE_ENV, STATE_LOCAL} */
/* state[2] = parameter index */
append_token(str, (gl_state_index) state[1]);
append_token(str, state[1]);
append_index(str, state[2]);
break;
case STATE_INTERNAL:
append_token(str, state[1]);
break;
default:
_mesa_problem(NULL, "Invalid state in _mesa_program_state_string");