summaryrefslogtreecommitdiff
path: root/src/gallium/auxiliary/util/u_simple_shaders.h
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2008-03-27 15:42:09 -0600
committerBrian <brian.paul@tungstengraphics.com>2008-03-27 15:43:32 -0600
commitdccbfd8bf0624250a435948029916073d3390191 (patch)
treea5a5854dd3cb58d92d9b459ad6eb198bbb31df94 /src/gallium/auxiliary/util/u_simple_shaders.h
parent89222ee49de340774279c9c0bf884649e66ad6df (diff)
gallium: return pipe_shader_state from the simple shader functions
Allows us to fix a mem leak (tokens array).
Diffstat (limited to 'src/gallium/auxiliary/util/u_simple_shaders.h')
-rw-r--r--src/gallium/auxiliary/util/u_simple_shaders.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/util/u_simple_shaders.h b/src/gallium/auxiliary/util/u_simple_shaders.h
index ca219a092c..8ca4977d71 100644
--- a/src/gallium/auxiliary/util/u_simple_shaders.h
+++ b/src/gallium/auxiliary/util/u_simple_shaders.h
@@ -34,6 +34,7 @@
struct pipe_context;
+struct pipe_shader_state;
#ifdef __cplusplus
@@ -45,15 +46,18 @@ extern void *
util_make_vertex_passthrough_shader(struct pipe_context *pipe,
uint num_attribs,
const uint *semantic_names,
- const uint *semantic_indexes);
+ const uint *semantic_indexes,
+ struct pipe_shader_state *shader);
extern void *
-util_make_fragment_tex_shader(struct pipe_context *pipe);
+util_make_fragment_tex_shader(struct pipe_context *pipe,
+ struct pipe_shader_state *shader);
extern void *
-util_make_fragment_passthrough_shader(struct pipe_context *pipe);
+util_make_fragment_passthrough_shader(struct pipe_context *pipe,
+ struct pipe_shader_state *shader);
#ifdef __cplusplus