summaryrefslogtreecommitdiff
path: root/src/mesa/state_tracker/st_atom_shader.c
diff options
context:
space:
mode:
authorKeith Whitwell <keithw@vmware.com>2010-02-01 20:42:34 +0000
committerKeith Whitwell <keithw@vmware.com>2010-02-01 20:42:34 +0000
commite1906ae98ef4d8f153553056552c06ac4292d1f5 (patch)
treec01194bb40fe6a1a44f7c2608d90f144bb8f8d22 /src/mesa/state_tracker/st_atom_shader.c
parentd51b04320d79234f86fc2b881dab33e646400e76 (diff)
st/mesa: remove duplicate calculation of fp input mapping
This was being calculated the same way in two different places. Now just do it in st_translate_fragment_program().
Diffstat (limited to 'src/mesa/state_tracker/st_atom_shader.c')
-rw-r--r--src/mesa/state_tracker/st_atom_shader.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/src/mesa/state_tracker/st_atom_shader.c b/src/mesa/state_tracker/st_atom_shader.c
index aa0508a41f..d9b508537d 100644
--- a/src/mesa/state_tracker/st_atom_shader.c
+++ b/src/mesa/state_tracker/st_atom_shader.c
@@ -60,26 +60,10 @@ static void
translate_fp(struct st_context *st,
struct st_fragment_program *stfp)
{
- const GLbitfield fragInputsRead = stfp->Base.Base.InputsRead;
-
if (!stfp->state.tokens) {
- GLuint inAttr, numIn = 0;
-
- for (inAttr = 0; inAttr < FRAG_ATTRIB_MAX; inAttr++) {
- if (fragInputsRead & (1 << inAttr)) {
- stfp->input_to_slot[inAttr] = numIn;
- numIn++;
- }
- else {
- stfp->input_to_slot[inAttr] = -1;
- }
- }
-
- stfp->num_input_slots = numIn;
-
assert(stfp->Base.Base.NumInstructions > 0);
- st_translate_fragment_program(st, stfp, stfp->input_to_slot);
+ st_translate_fragment_program(st, stfp);
}
}