commit 90ebb581e60d29bd565ad4d8a49e642de7b0ce5d
author Brian Paul <brian.paul@tungstengraphics.com> Wed Nov 02 18:06:12 2005 +0000
committer Brian Paul <brian.paul@tungstengraphics.com> Wed Nov 02 18:06:12 2005 +0000
tree ccce2853c466080faecc21bd6013a029f2d76fcb
parent 5a02209cd2a634406fd54808ef19baf5f2c098a1

Rename FRAG_OUTPUT_* tokens to FRAG_RESULT_* to match vertex program convention

src/mesa/shader/program.c

diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index a054567..ce0a484 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -1378,15 +1378,15 @@
          }
          else if (_mesa_strcmp(reg, "o[COLR]") == 0) {
             /* Fragment output color */
-            COPY_4V(v, ctx->FragmentProgram.Machine.Outputs[FRAG_OUTPUT_COLR]);
+            COPY_4V(v, ctx->FragmentProgram.Machine.Outputs[FRAG_RESULT_COLR]);
          }
          else if (_mesa_strcmp(reg, "o[COLH]") == 0) {
             /* Fragment output color */
-            COPY_4V(v, ctx->FragmentProgram.Machine.Outputs[FRAG_OUTPUT_COLH]);
+            COPY_4V(v, ctx->FragmentProgram.Machine.Outputs[FRAG_RESULT_COLH]);
          }
          else if (_mesa_strcmp(reg, "o[DEPR]") == 0) {
             /* Fragment output depth */
-            COPY_4V(v, ctx->FragmentProgram.Machine.Outputs[FRAG_OUTPUT_DEPR]);
+            COPY_4V(v, ctx->FragmentProgram.Machine.Outputs[FRAG_RESULT_DEPR]);
          }
          else {
             /* try user-defined identifiers */