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

4 files changed, 10 insertions, 10 deletions

diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
index 19c38b6272..377fc8a8ac 100644
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@ -1537,7 +1537,7 @@ parse_attrib_binding(GLcontext * ctx, GLubyte ** inst,
  *
  * \param inst       The parsed tokens
  * \param outputReg  Returned index/number of the output register,
- *                   one of the VERT_RESULT_* or FRAG_OUTPUT_* values.
+ *                   one of the VERT_RESULT_* or FRAG_RESULT_* values.
  */
 static GLuint
 parse_result_binding(GLcontext *ctx, GLubyte **inst,
@@ -1555,7 +1555,7 @@ parse_result_binding(GLcontext *ctx, GLubyte **inst,
              */
             parse_output_color_num(ctx, inst, Program, &out_color);
             ASSERT(out_color < MAX_DRAW_BUFFERS);
-            *outputReg = FRAG_OUTPUT_COLR;
+            *outputReg = FRAG_RESULT_COLR;
          }
          else {
             /* for vtx programs, this is VERTEX_RESULT_POSITION */
@@ -1566,7 +1566,7 @@ parse_result_binding(GLcontext *ctx, GLubyte **inst,
       case FRAGMENT_RESULT_DEPTH:
          if (Program->Base.Target == GL_FRAGMENT_PROGRAM_ARB) {
             /* for frag programs, this is FRAGMENT_RESULT_DEPTH */
-            *outputReg = FRAG_OUTPUT_DEPR;
+            *outputReg = FRAG_RESULT_DEPR;
          }
          else {
             /* for vtx programs, this is VERTEX_RESULT_COLOR */
diff --git a/src/mesa/shader/nvfragparse.c b/src/mesa/shader/nvfragparse.c
index 520bf05627..e1eeebd9a3 100644
--- a/src/mesa/shader/nvfragparse.c
+++ b/src/mesa/shader/nvfragparse.c
@@ -843,7 +843,7 @@ Parse_OutputReg(struct parse_state *parseState, GLint *outputRegNum)
    /* try to match an output register name */
    for (j = 0; OutputRegisters[j]; j++) {
       if (_mesa_strcmp((const char *) token, OutputRegisters[j]) == 0) {
-         static GLuint bothColors = (1 << FRAG_OUTPUT_COLR) | (1 << FRAG_OUTPUT_COLH);
+         static GLuint bothColors = (1 << FRAG_RESULT_COLR) | (1 << FRAG_RESULT_COLH);
          *outputRegNum = j;
          parseState->outputsWritten |= (1 << j);
          if ((parseState->outputsWritten & bothColors) == bothColors) {
diff --git a/src/mesa/shader/nvfragprog.h b/src/mesa/shader/nvfragprog.h
index bd9c8bb06c..8596ba08e1 100644
--- a/src/mesa/shader/nvfragprog.h
+++ b/src/mesa/shader/nvfragprog.h
@@ -123,10 +123,10 @@ struct fp_src_register
    GLuint File:4;
    GLuint Index:8;
    GLuint Swizzle:12;
-   GLuint NegateBase:4; /* ARB: negate/extended negate.
+   GLuint NegateBase:4; /* ARB: negate/extended negate, per component.
 			   NV: negate before absolute value? */
-   GLuint Abs:1;        /* NV: take absolute value? */
-   GLuint NegateAbs:1;  /* NV: negate after absolute value? */
+   GLuint Abs:1;        /* NV: take absolute value (all components) ? */
+   GLuint NegateAbs:1;  /* NV: negate (all components) after absolute value? */
 };
 
 
diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index a054567e5f..ce0a48495f 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -1378,15 +1378,15 @@ _mesa_GetProgramRegisterfvMESA(GLenum target,
          }
          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 */