summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mesa/state_tracker/st_program.c5
-rw-r--r--src/mesa/state_tracker/st_program.h2
2 files changed, 2 insertions, 5 deletions
diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index 4d1ef1bf3d..3648ded8a1 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -315,7 +315,7 @@ st_translate_vertex_program(struct st_context *st,
* \param tokensOut destination for TGSI tokens
* \return pointer to cached pipe_shader object.
*/
-const struct cso_fragment_shader *
+void
st_translate_fragment_program(struct st_context *st,
struct st_fragment_program *stfp,
const GLuint inputMapping[])
@@ -325,7 +325,6 @@ st_translate_fragment_program(struct st_context *st,
GLuint outputMapping[FRAG_RESULT_MAX];
GLuint defaultInputMapping[FRAG_ATTRIB_MAX];
struct pipe_shader_state fs;
- const struct cso_fragment_shader *cso;
GLuint interpMode[16]; /* XXX size? */
GLuint attr;
const GLbitfield inputsRead = stfp->Base.Base.InputsRead;
@@ -475,7 +474,5 @@ st_translate_fragment_program(struct st_context *st,
if (TGSI_DEBUG)
tgsi_dump( fs.tokens, 0/*TGSI_DUMP_VERBOSE*/ );
-
- return cso;
}
diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h
index dced31e88e..e58b8a1851 100644
--- a/src/mesa/state_tracker/st_program.h
+++ b/src/mesa/state_tracker/st_program.h
@@ -111,7 +111,7 @@ st_vertex_program( struct gl_vertex_program *vp )
}
-extern const struct cso_fragment_shader *
+extern void
st_translate_fragment_program(struct st_context *st,
struct st_fragment_program *fp,
const GLuint inputMapping[]);