commit 21bcb2e1f64fe7161e05e4dbb7bea5609ba30e2a
author Brian <brian@nostromo.localnet.net> Sun Feb 25 18:35:47 2007 -0700
committer Brian <brian@nostromo.localnet.net> Sun Feb 25 18:35:47 2007 -0700
tree 08900a413cd3db4221b89308bfa181962d5b12d2
parent cfd0011f2fe3aad2ea0f66c151b3fb12d05f644e

s/GetFragmentProgramRegister/GetProgramRegister/

src/mesa/shader/prog_debug.c

diff --git a/src/mesa/shader/prog_debug.c b/src/mesa/shader/prog_debug.c
index e3e5396..57929fc 100644
--- a/src/mesa/shader/prog_debug.c
+++ b/src/mesa/shader/prog_debug.c
@@ -141,9 +141,7 @@
                            "glGetProgramRegisterfvMESA(registerName)");
                return;
             }
-#if 0 /* FIX ME */
-            ctx->Driver.GetVertexProgramRegister(ctx, PROGRAM_TEMPORARY, i, v);
-#endif
+            ctx->Driver.GetProgramRegister(ctx, PROGRAM_TEMPORARY, i, v);
          }
          else if (reg[0] == 'v' && reg[1] == '[') {
             /* Vertex Input attribute */
@@ -154,10 +152,7 @@
                _mesa_sprintf(number, "%d", i);
                if (_mesa_strncmp(reg + 2, name, 4) == 0 ||
                    _mesa_strncmp(reg + 2, number, _mesa_strlen(number)) == 0) {
-#if 0 /* FIX ME */
-                  ctx->Driver.GetVertexProgramRegister(ctx, PROGRAM_INPUT,
-                                                       i, v);
-#endif
+                  ctx->Driver.GetProgramRegister(ctx, PROGRAM_INPUT, i, v);
                   return;
                }
             }
@@ -210,7 +205,7 @@
                            "glGetProgramRegisterfvMESA(registerName)");
                return;
             }
-            ctx->Driver.GetFragmentProgramRegister(ctx, PROGRAM_TEMPORARY,
+            ctx->Driver.GetProgramRegister(ctx, PROGRAM_TEMPORARY,
                                                    i, v);
          }
          else if (reg[0] == 'f' && reg[1] == '[') {
@@ -219,8 +214,7 @@
             for (i = 0; i < ctx->Const.FragmentProgram.MaxAttribs; i++) {
                const char *name = _mesa_nv_fragment_input_register_name(i);
                if (_mesa_strncmp(reg + 2, name, 4) == 0) {
-                  ctx->Driver.GetFragmentProgramRegister(ctx,
-                                                         PROGRAM_INPUT, i, v);
+                  ctx->Driver.GetProgramRegister(ctx, PROGRAM_INPUT, i, v);
                   return;
                }
             }
@@ -230,18 +224,18 @@
          }
          else if (_mesa_strcmp(reg, "o[COLR]") == 0) {
             /* Fragment output color */
-            ctx->Driver.GetFragmentProgramRegister(ctx, PROGRAM_OUTPUT,
-                                                   FRAG_RESULT_COLR, v);
+            ctx->Driver.GetProgramRegister(ctx, PROGRAM_OUTPUT,
+                                           FRAG_RESULT_COLR, v);
          }
          else if (_mesa_strcmp(reg, "o[COLH]") == 0) {
             /* Fragment output color */
-            ctx->Driver.GetFragmentProgramRegister(ctx, PROGRAM_OUTPUT,
-                                                   FRAG_RESULT_COLH, v);
+            ctx->Driver.GetProgramRegister(ctx, PROGRAM_OUTPUT,
+                                           FRAG_RESULT_COLH, v);
          }
          else if (_mesa_strcmp(reg, "o[DEPR]") == 0) {
             /* Fragment output depth */
-            ctx->Driver.GetFragmentProgramRegister(ctx, PROGRAM_OUTPUT,
-                                                   FRAG_RESULT_DEPR, v);
+            ctx->Driver.GetProgramRegister(ctx, PROGRAM_OUTPUT,
+                                           FRAG_RESULT_DEPR, v);
          }
          else {
             /* try user-defined identifiers */