gallium: remove input_map[] from pipe_shader_state
This commit is contained in:
@@ -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 */
|
||||
|
@@ -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++;
|
||||
}
|
||||
|
@@ -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++;
|
||||
|
||||
|
@@ -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];
|
||||
|
||||
|
Reference in New Issue
Block a user