mesa: Branch 'glsl-compiler-1' - 2 commits

[Brian Paul]

 src/mesa/shader/prog_execute.c   |    5 +++++
 src/mesa/shader/prog_statevars.c |   12 +++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

New commits:
diff-tree 9637c963f59192aaccf68e7690f5ffb1e17ba077 (from fb3f0beb42868cef6ee78385164fb9605820c365)
Author: Brian <brian at yutani.localnet.net>
Date:   Wed Mar 7 17:40:57 2007 -0700

    more DEBUG_PROG

diff --git a/src/mesa/shader/prog_execute.c b/src/mesa/shader/prog_execute.c
index 828a90d..092c07f 100644
--- a/src/mesa/shader/prog_execute.c
+++ b/src/mesa/shader/prog_execute.c
@@ -1651,6 +1651,11 @@ _mesa_execute_program(GLcontext * ctx,
             result[2] = a[0] * b[1] - a[1] * b[0];
             result[3] = 1.0;
             store_vector4(inst, machine, result);
+            if (DEBUG_PROG) {
+               printf("XPD (%g %g %g %g) = (%g %g %g) X (%g %g %g)\n",
+                      result[0], result[1], result[2], result[3],
+                      a[0], a[1], a[2], b[0], b[1], b[2]);
+            }
          }
          break;
       case OPCODE_X2D:         /* 2-D matrix transform */
diff-tree fb3f0beb42868cef6ee78385164fb9605820c365 (from 0aec2bb8f218b7e419806149a2c50f598cd07a6a)
Author: Brian <brian at yutani.localnet.net>
Date:   Wed Mar 7 17:37:24 2007 -0700

    update comments

diff --git a/src/mesa/shader/prog_statevars.c b/src/mesa/shader/prog_statevars.c
index 8b4903e..953fbb9 100644
--- a/src/mesa/shader/prog_statevars.c
+++ b/src/mesa/shader/prog_statevars.c
@@ -278,14 +278,12 @@ _mesa_fetch_state(GLcontext *ctx, const 
    case STATE_MVP_MATRIX:
    case STATE_TEXTURE_MATRIX:
    case STATE_PROGRAM_MATRIX:
-      /*case STATE_MATRIX:*/
       {
-         /* state[1] = modelview, projection, texture, etc. */
-         /* state[2] = which texture matrix or program matrix */
-         /* state[3] = first row to fetch */
-         /* state[4] = last row to fetch */
-         /* state[5] = transpose, inverse or invtrans */
-
+         /* state[0] = modelview, projection, texture, etc. */
+         /* state[1] = which texture matrix or program matrix */
+         /* state[2] = first row to fetch */
+         /* state[3] = last row to fetch */
+         /* state[4] = transpose, inverse or invtrans */
          const GLmatrix *matrix;
          const gl_state_index mat = state[0];
          const GLuint index = (GLuint) state[1];