st/mesa: inline st_prepare_fragment_program in st_translate_fragment_program

This reverts an unnecessary part of commit 4683529048 and fixes misrendering
and an assertion failure in Cogs.

Fixes freedesktop.org bug 39888.

Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Bryan Cain
2011-08-07 14:15:35 -05:00
parent 506de19549
commit ffb7d02154
2 changed files with 162 additions and 179 deletions

View File

@@ -85,21 +85,6 @@ struct st_fragment_program
{
struct gl_fragment_program Base;
struct glsl_to_tgsi_visitor* glsl_to_tgsi;
/** maps a Mesa FRAG_ATTRIB_x to a packed TGSI input index */
GLuint input_to_index[FRAG_ATTRIB_MAX];
/** maps a TGSI input index back to a Mesa FRAG_ATTRIB_x */
GLuint index_to_input[PIPE_MAX_SHADER_INPUTS];
ubyte input_semantic_name[PIPE_MAX_SHADER_INPUTS];
ubyte input_semantic_index[PIPE_MAX_SHADER_INPUTS];
GLuint num_inputs;
GLuint interp_mode[PIPE_MAX_SHADER_INPUTS]; /* XXX size? */
/** Maps FRAG_RESULT_x to slot */
GLuint result_to_output[FRAG_RESULT_MAX];
ubyte output_semantic_name[FRAG_RESULT_MAX];
ubyte output_semantic_index[FRAG_RESULT_MAX];
GLuint num_outputs;
struct pipe_shader_state tgsi;