diff options
| author | Brian Paul <[email protected]> | 2005-11-02 18:06:12 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2005-11-02 18:06:12 +0000 |
| commit | 90ebb581e60d29bd565ad4d8a49e642de7b0ce5d (patch) | |
| tree | ccce2853c466080faecc21bd6013a029f2d76fcb /src/mesa/main/texenvprogram.c | |
| parent | 5a02209cd2a634406fd54808ef19baf5f2c098a1 (diff) | |
Rename FRAG_OUTPUT_* tokens to FRAG_RESULT_* to match vertex program convention
Diffstat (limited to 'src/mesa/main/texenvprogram.c')
| -rw-r--r-- | src/mesa/main/texenvprogram.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c index 43dda28f263..6197c156848 100644 --- a/src/mesa/main/texenvprogram.c +++ b/src/mesa/main/texenvprogram.c @@ -857,7 +857,7 @@ static struct ureg emit_texenv( struct texenv_fragment_program *p, int unit ) rgb_shift) dest = get_temp( p ); else - dest = make_ureg(PROGRAM_OUTPUT, FRAG_OUTPUT_COLR); + dest = make_ureg(PROGRAM_OUTPUT, FRAG_RESULT_COLR); /* Emit the RGB and A combine ops */ @@ -1000,7 +1000,7 @@ static void create_new_program(struct state_key *key, GLcontext *ctx, p.program->Parameters = _mesa_new_parameter_list(); p.program->InputsRead = 0; - p.program->OutputsWritten = 1 << FRAG_OUTPUT_COLR; + p.program->OutputsWritten = 1 << FRAG_RESULT_COLR; for (unit = 0; unit < MAX_TEXTURE_UNITS; unit++) p.src_texture[unit] = undef; @@ -1030,7 +1030,7 @@ static void create_new_program(struct state_key *key, GLcontext *ctx, } cf = get_source( &p, SRC_PREVIOUS, 0 ); - out = make_ureg( PROGRAM_OUTPUT, FRAG_OUTPUT_COLR ); + out = make_ureg( PROGRAM_OUTPUT, FRAG_RESULT_COLR ); if (key->separate_specular) { /* Emit specular add. |