diff options
| author | Keith Whitwell <keithw@vmware.com> | 2010-02-01 20:32:32 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2010-02-01 20:33:53 +0000 |
| commit | d51b04320d79234f86fc2b881dab33e646400e76 (patch) | |
| tree | fa57fe5d926541aabbc6072c6c11901ab5480ce6 | |
| parent | 12ffee5d58de487cd03e274f7d6f7118d9ad8206 (diff) | |
st/mesa: remove dead stfp input_map array
Was being calculated and not used. Also was probably incorrect...
| -rw-r--r-- | src/mesa/state_tracker/st_program.c | 9 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_program.h | 3 |
2 files changed, 0 insertions, 12 deletions
diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index 5c87e47ca3..afe924fc9c 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -286,7 +286,6 @@ st_translate_fragment_program(struct st_context *st, enum pipe_error error; const GLbitfield inputsRead = stfp->Base.Base.InputsRead; struct ureg_program *ureg; - GLuint vslot = 0; uint fs_num_inputs = 0; @@ -294,12 +293,6 @@ st_translate_fragment_program(struct st_context *st, ubyte fs_output_semantic_index[PIPE_MAX_SHADER_OUTPUTS]; uint fs_num_outputs = 0; - /* which vertex output goes to the first fragment input: */ - if (inputsRead & FRAG_BIT_WPOS) - vslot = 0; - else - vslot = 1; - /* * Convert Mesa program inputs to TGSI input register semantics. */ @@ -309,8 +302,6 @@ st_translate_fragment_program(struct st_context *st, defaultInputMapping[attr] = slot; - stfp->input_map[slot] = vslot++; - fs_num_inputs++; switch (attr) { diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h index 6b9a9226df..a094d1c93d 100644 --- a/src/mesa/state_tracker/st_program.h +++ b/src/mesa/state_tracker/st_program.h @@ -55,9 +55,6 @@ 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]; - ubyte input_semantic_name[PIPE_MAX_SHADER_INPUTS]; ubyte input_semantic_index[PIPE_MAX_SHADER_INPUTS]; |