Mesa (master): st/mesa: remove dead stfp input_map array
Keith Whitwell
keithw at kemper.freedesktop.org
Mon Feb 1 20:35:06 UTC 2010
Module: Mesa
Branch: master
Commit: d51b04320d79234f86fc2b881dab33e646400e76
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d51b04320d79234f86fc2b881dab33e646400e76
Author: Keith Whitwell <keithw at vmware.com>
Date: Mon Feb 1 20:32:32 2010 +0000
st/mesa: remove dead stfp input_map array
Was being calculated and not used. Also was probably incorrect...
---
src/mesa/state_tracker/st_program.c | 9 ---------
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 5c87e47..afe924f 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 6b9a922..a094d1c 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];
More information about the mesa-commit
mailing list