From e1906ae98ef4d8f153553056552c06ac4292d1f5 Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Mon, 1 Feb 2010 20:42:34 +0000 Subject: 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(). --- src/mesa/state_tracker/st_program.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/mesa/state_tracker/st_program.h') diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h index a094d1c93d..d9822e50f5 100644 --- a/src/mesa/state_tracker/st_program.h +++ b/src/mesa/state_tracker/st_program.h @@ -52,9 +52,6 @@ struct st_fragment_program struct gl_fragment_program Base; GLuint serialNo; - GLuint input_to_slot[FRAG_ATTRIB_MAX]; /**< Maps FRAG_ATTRIB_x to slot */ - GLuint num_input_slots; - ubyte input_semantic_name[PIPE_MAX_SHADER_INPUTS]; ubyte input_semantic_index[PIPE_MAX_SHADER_INPUTS]; @@ -168,8 +165,7 @@ st_reference_fragprog(struct st_context *st, extern void st_translate_fragment_program(struct st_context *st, - struct st_fragment_program *fp, - const GLuint inputMapping[]); + struct st_fragment_program *fp); /* Called after program string change, discard all previous -- cgit v1.2.3