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/main | |
| parent | 5a02209cd2a634406fd54808ef19baf5f2c098a1 (diff) | |
Rename FRAG_OUTPUT_* tokens to FRAG_RESULT_* to match vertex program convention
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/mtypes.h | 23 | ||||
| -rw-r--r-- | src/mesa/main/texenvprogram.c | 6 |
2 files changed, 16 insertions, 13 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index d77759df25..cc44acf3cf 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -155,7 +155,7 @@ enum VERT_ATTRIB_GENERIC1 = 17, VERT_ATTRIB_GENERIC2 = 18, VERT_ATTRIB_GENERIC3 = 19, - VERT_ATTRIB_MAX = 16 + VERT_ATTRIB_MAX = 16 /* XXX not counting generic attribs yet */ }; /** @@ -188,10 +188,10 @@ enum #define VERT_BIT_GENERIC(g) (1 << (VERT_ATTRIB_GENERIC0 + (g))) /*@}*/ - /** * Indexes for vertex program result attributes */ +/*@{*/ #define VERT_RESULT_HPOS 0 #define VERT_RESULT_COL0 1 #define VERT_RESULT_COL1 2 @@ -208,6 +208,7 @@ enum #define VERT_RESULT_BFC0 13 #define VERT_RESULT_BFC1 14 #define VERT_RESULT_MAX 15 +/*@}*/ /** @@ -227,12 +228,11 @@ enum FRAG_ATTRIB_TEX5 = 9, FRAG_ATTRIB_TEX6 = 10, FRAG_ATTRIB_TEX7 = 11, - FRAG_ATTRIB_MAX = 12 }; -/* - * Bitflags for fragment attributes. +/** + * Bitflags for fragment program input attributes. */ /*@{*/ #define FRAG_BIT_WPOS (1 << FRAG_ATTRIB_WPOS) @@ -259,12 +259,15 @@ enum /*@}*/ -/* Fragment program results +/** + * Fragment program results */ -#define FRAG_OUTPUT_COLR 0 -#define FRAG_OUTPUT_COLH 1 -#define FRAG_OUTPUT_DEPR 2 -#define FRAG_OUTPUT_MAX 3 +/*@{*/ +#define FRAG_RESULT_COLR 0 +#define FRAG_RESULT_COLH 1 +#define FRAG_RESULT_DEPR 2 +#define FRAG_RESULT_MAX 3 +/*@}*/ /** diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c index 43dda28f26..6197c15684 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. |