fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 02:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gallium: remove input_map[] from pipe_shader_state

Browse source
This commit is contained in:
Brian 2008-02-26 08:43:07 -07:00
parent 232a41e19f
commit ecd50ef58b
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gallium/include/pipe/p_state.h
View file

@ -162,7 +162,6 @@ struct pipe_shader_state
const struct tgsi_token *tokens;
ubyte num_inputs;
ubyte num_outputs;
ubyte input_map[PIPE_MAX_SHADER_INPUTS]; /* XXX this may be temporary */
ubyte input_semantic_name[PIPE_MAX_SHADER_INPUTS]; /**< TGSI_SEMANTIC_x */
ubyte input_semantic_index[PIPE_MAX_SHADER_INPUTS];
ubyte output_semantic_name[PIPE_MAX_SHADER_OUTPUTS]; /**< TGSI_SEMANTIC_x */

2
src/mesa/state_tracker/st_atom_shader.c
View file

@ -227,7 +227,7 @@ find_translated_vp(struct st_context *st,
if (fpInAttrib >= 0) {
GLuint fpInSlot = stfp->input_to_slot[fpInAttrib];
if (fpInSlot != ~0) {
GLuint vpOutSlot = stfp->cso->state.input_map[fpInSlot];
GLuint vpOutSlot = stfp->input_map[fpInSlot];
xvp->output_to_slot[outAttr] = vpOutSlot;
numVpOuts++;
}

2
src/mesa/state_tracker/st_program.c
View file

@ -311,7 +311,7 @@ st_translate_fragment_program(struct st_context *st,
defaultInputMapping[attr] = slot;
fs.input_map[slot] = vslot++;
stfp->input_map[slot] = vslot++;
fs.num_inputs++;

3
src/mesa/state_tracker/st_program.h
View file

@ -57,6 +57,9 @@ struct st_fragment_program
GLuint input_to_slot[FRAG_ATTRIB_MAX]; /**< Maps FRAG_ATTRIB_x to slot */
GLuint num_input_slots;
/** map FP input back to VP output */
GLuint input_map[PIPE_MAX_SHADER_INPUTS];
/** The program in TGSI format */
struct tgsi_token tokens[ST_MAX_SHADER_TOKENS];