llvmpipe: make rasterizer-related functions static, clean-up initializations

This commit is contained in:
Brian Paul
2010-04-28 14:19:15 -06:00
parent 965a604306
commit 8975ade13b
3 changed files with 17 additions and 18 deletions
+1 -4
View File
@@ -100,10 +100,6 @@ llvmpipe_create_context( struct pipe_screen *screen, void *priv )
llvmpipe->pipe.destroy = llvmpipe_destroy;
/* state setters */
llvmpipe->pipe.create_rasterizer_state = llvmpipe_create_rasterizer_state;
llvmpipe->pipe.bind_rasterizer_state = llvmpipe_bind_rasterizer_state;
llvmpipe->pipe.delete_rasterizer_state = llvmpipe_delete_rasterizer_state;
llvmpipe->pipe.set_framebuffer_state = llvmpipe_set_framebuffer_state;
llvmpipe->pipe.clear = llvmpipe_clear;
@@ -117,6 +113,7 @@ llvmpipe_create_context( struct pipe_screen *screen, void *priv )
llvmpipe_init_vertex_funcs(llvmpipe);
llvmpipe_init_fs_funcs(llvmpipe);
llvmpipe_init_vs_funcs(llvmpipe);
llvmpipe_init_rasterizer_funcs(llvmpipe);
llvmpipe_init_context_resource_funcs( &llvmpipe->pipe );
/*
+3 -10
View File
@@ -121,16 +121,6 @@ struct lp_velems_state
};
void *
llvmpipe_create_rasterizer_state(struct pipe_context *,
const struct pipe_rasterizer_state *);
void
llvmpipe_bind_rasterizer_state(struct pipe_context *, void *);
void
llvmpipe_delete_rasterizer_state(struct pipe_context *, void *);
void
llvmpipe_set_framebuffer_state(struct pipe_context *,
const struct pipe_framebuffer_state *);
@@ -162,5 +152,8 @@ llvmpipe_init_fs_funcs(struct llvmpipe_context *llvmpipe);
void
llvmpipe_init_vs_funcs(struct llvmpipe_context *llvmpipe);
void
llvmpipe_init_rasterizer_funcs(struct llvmpipe_context *llvmpipe);
#endif
@@ -34,7 +34,7 @@
void *
static void *
llvmpipe_create_rasterizer_state(struct pipe_context *pipe,
const struct pipe_rasterizer_state *rast)
{
@@ -46,7 +46,7 @@ llvmpipe_create_rasterizer_state(struct pipe_context *pipe,
void
static void
llvmpipe_bind_rasterizer_state(struct pipe_context *pipe, void *handle)
{
struct llvmpipe_context *llvmpipe = llvmpipe_context(pipe);
@@ -79,10 +79,19 @@ llvmpipe_bind_rasterizer_state(struct pipe_context *pipe, void *handle)
}
void llvmpipe_delete_rasterizer_state(struct pipe_context *pipe,
void *rasterizer)
static void
llvmpipe_delete_rasterizer_state(struct pipe_context *pipe,
void *rasterizer)
{
FREE( rasterizer );
}
void
llvmpipe_init_rasterizer_funcs(struct llvmpipe_context *llvmpipe)
{
llvmpipe->pipe.create_rasterizer_state = llvmpipe_create_rasterizer_state;
llvmpipe->pipe.bind_rasterizer_state = llvmpipe_bind_rasterizer_state;
llvmpipe->pipe.delete_rasterizer_state = llvmpipe_delete_rasterizer_state;
}