diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2005-11-02 18:06:12 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2005-11-02 18:06:12 +0000 |
| commit | 90ebb581e60d29bd565ad4d8a49e642de7b0ce5d (patch) | |
| tree | ccce2853c466080faecc21bd6013a029f2d76fcb /src/mesa/shader/arbprogparse.c | |
| parent | 5a02209cd2a634406fd54808ef19baf5f2c098a1 (diff) | |
Rename FRAG_OUTPUT_* tokens to FRAG_RESULT_* to match vertex program convention
Diffstat (limited to 'src/mesa/shader/arbprogparse.c')
| -rw-r--r-- | src/mesa/shader/arbprogparse.c | 6 |
1 files changed, 3 insertions, 3 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 */ |