summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-10-18 11:09:12 -0600
committerBrian <brian.paul@tungstengraphics.com>2007-10-18 11:41:13 -0600
commit447c93dd1b3bb31fe19fa81b32d1c3c62ab65c54 (patch)
tree9b3f323b26ff2a63d3debe1a1e77fe16341cb61e
parentb21f4ac15fc190b474e1686d50a6992caed9c388 (diff)
Change type of shader->executable field from void * to generic function pointer.
Fix warnings in draw_create_vertex_shader()
-rw-r--r--src/mesa/pipe/draw/draw_vertex_shader.c10
-rw-r--r--src/mesa/pipe/p_state.h2
2 files changed, 7 insertions, 5 deletions
diff --git a/src/mesa/pipe/draw/draw_vertex_shader.c b/src/mesa/pipe/draw/draw_vertex_shader.c
index 8519daf17c..fd0183f8cd 100644
--- a/src/mesa/pipe/draw/draw_vertex_shader.c
+++ b/src/mesa/pipe/draw/draw_vertex_shader.c
@@ -212,12 +212,14 @@ draw_create_vertex_shader(struct draw_context *draw,
vs->state = shader;
#if defined(__i386__) || defined(__386__)
if (draw->use_sse) {
- x86_init_func( &shader->sse2_program );
+ /* cast-away const */
+ struct pipe_shader_state *sh = (struct pipe_shader_state *) shader;
- tgsi_emit_sse2( shader->tokens, &shader->sse2_program );
+ x86_init_func( &sh->sse2_program );
- ((struct pipe_shader_state *)shader)->executable = (void *)
- x86_get_func( &shader->sse2_program );
+ tgsi_emit_sse2( sh->tokens, &sh->sse2_program );
+
+ sh->executable = x86_get_func( &sh->sse2_program );
}
#endif
diff --git a/src/mesa/pipe/p_state.h b/src/mesa/pipe/p_state.h
index da62aa1b27..1c3b2811a4 100644
--- a/src/mesa/pipe/p_state.h
+++ b/src/mesa/pipe/p_state.h
@@ -148,7 +148,7 @@ struct pipe_shader_state {
#if defined(__i386__) || defined(__386__)
struct x86_function sse2_program;
#endif
- void *executable;
+ void (*executable)();
ubyte num_inputs;
ubyte num_outputs;