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

add state vars for color matrix, pixel transfer scale&bias

Browse Source 
cherry-picked from gallium-0.1 (068c7bd912)
This commit is contained in:
Brian Paul
2008-05-18 15:52:13 -06:00
parent 2f8fc325ac
commit 6e92968d75
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -279,6 +279,7 @@ _mesa_fetch_state(GLcontext *ctx, const gl_state_index state[],
case STATE_MVP_MATRIX: case STATE_MVP_MATRIX:
case STATE_TEXTURE_MATRIX: case STATE_TEXTURE_MATRIX:
case STATE_PROGRAM_MATRIX: case STATE_PROGRAM_MATRIX:
case STATE_COLOR_MATRIX:
{ {
/* state[0] = modelview, projection, texture, etc. */ /* state[0] = modelview, projection, texture, etc. */
/* state[1] = which texture matrix or program matrix */ /* state[1] = which texture matrix or program matrix */
@@ -312,6 +313,9 @@ _mesa_fetch_state(GLcontext *ctx, const gl_state_index state[],
else if (mat == STATE_PROGRAM_MATRIX) { else if (mat == STATE_PROGRAM_MATRIX) {
matrix = ctx->ProgramMatrixStack[index].Top; matrix = ctx->ProgramMatrixStack[index].Top;
} }
else if (mat == STATE_COLOR_MATRIX) {
matrix = ctx->ColorMatrixStack.Top;
}
else { else {
_mesa_problem(ctx, "Bad matrix name in _mesa_fetch_state()"); _mesa_problem(ctx, "Bad matrix name in _mesa_fetch_state()");
return; return;

1
src/mesa/shader/prog_statevars.h
View File

@@ -67,6 +67,7 @@ typedef enum gl_state_index_ {
STATE_MVP_MATRIX, STATE_MVP_MATRIX,
STATE_TEXTURE_MATRIX, STATE_TEXTURE_MATRIX,
STATE_PROGRAM_MATRIX, STATE_PROGRAM_MATRIX,
STATE_COLOR_MATRIX,
STATE_MATRIX_INVERSE, STATE_MATRIX_INVERSE,
STATE_MATRIX_TRANSPOSE, STATE_MATRIX_TRANSPOSE,
STATE_MATRIX_INVTRANS, STATE_MATRIX_INVTRANS,