diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-05-18 15:52:13 -0600 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-05-18 15:52:13 -0600 |
| commit | 6e92968d751ce3006b5ca0fc59eced20c94dc507 (patch) | |
| tree | 0712ef0ef977f5537f73cd79e5589873930b1168 | |
| parent | 2f8fc325aca43693aac368ae5781547cc976d387 (diff) | |
add state vars for color matrix, pixel transfer scale&bias
cherry-picked from gallium-0.1 (068c7bd912283e051a55b2fd5c4568685d10f3ed)
| -rw-r--r-- | src/mesa/shader/prog_statevars.c | 4 | ||||
| -rw-r--r-- | src/mesa/shader/prog_statevars.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/mesa/shader/prog_statevars.c b/src/mesa/shader/prog_statevars.c index dd3c3a1c8c..592a63651c 100644 --- a/src/mesa/shader/prog_statevars.c +++ b/src/mesa/shader/prog_statevars.c @@ -279,6 +279,7 @@ _mesa_fetch_state(GLcontext *ctx, const gl_state_index state[], case STATE_MVP_MATRIX: case STATE_TEXTURE_MATRIX: case STATE_PROGRAM_MATRIX: + case STATE_COLOR_MATRIX: { /* state[0] = modelview, projection, texture, etc. */ /* 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) { matrix = ctx->ProgramMatrixStack[index].Top; } + else if (mat == STATE_COLOR_MATRIX) { + matrix = ctx->ColorMatrixStack.Top; + } else { _mesa_problem(ctx, "Bad matrix name in _mesa_fetch_state()"); return; diff --git a/src/mesa/shader/prog_statevars.h b/src/mesa/shader/prog_statevars.h index 53529ab243..64820a5b68 100644 --- a/src/mesa/shader/prog_statevars.h +++ b/src/mesa/shader/prog_statevars.h @@ -67,6 +67,7 @@ typedef enum gl_state_index_ { STATE_MVP_MATRIX, STATE_TEXTURE_MATRIX, STATE_PROGRAM_MATRIX, + STATE_COLOR_MATRIX, STATE_MATRIX_INVERSE, STATE_MATRIX_TRANSPOSE, STATE_MATRIX_INVTRANS, |