commit 6e92968d751ce3006b5ca0fc59eced20c94dc507
author Brian Paul <brian.paul@tungstengraphics.com> Sun May 18 15:52:13 2008 -0600
committer Brian Paul <brian.paul@tungstengraphics.com> Sun May 18 15:52:13 2008 -0600
tree 0712ef0ef977f5537f73cd79e5589873930b1168
parent 2f8fc325aca43693aac368ae5781547cc976d387

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

cherry-picked from gallium-0.1 (068c7bd912283e051a55b2fd5c4568685d10f3ed)

src/mesa/shader/prog_statevars.c

diff --git a/src/mesa/shader/prog_statevars.c b/src/mesa/shader/prog_statevars.c
index dd3c3a1..592a636 100644
--- a/src/mesa/shader/prog_statevars.c
+++ b/src/mesa/shader/prog_statevars.c
@@ -279,6 +279,7 @@
    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 @@
          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;