softpipe: make clip state functions static

This commit is contained in:
Brian Paul
2010-09-25 14:15:11 -06:00
parent 5b2406c0b9
commit 63a5b7d7cc
3 changed files with 26 additions and 26 deletions
+1 -5
View File
@@ -229,18 +229,14 @@ softpipe_create_context( struct pipe_screen *screen,
/* state setters */
softpipe_init_blend_funcs(&softpipe->pipe);
softpipe_init_clip_funcs(&softpipe->pipe);
softpipe_init_rasterizer_funcs(&softpipe->pipe);
softpipe_init_sampler_funcs(&softpipe->pipe);
softpipe_init_shader_funcs(&softpipe->pipe);
softpipe_init_streamout_funcs(&softpipe->pipe);
softpipe_init_vertex_funcs(&softpipe->pipe);
softpipe->pipe.set_clip_state = softpipe_set_clip_state;
softpipe->pipe.set_framebuffer_state = softpipe_set_framebuffer_state;
softpipe->pipe.set_polygon_stipple = softpipe_set_polygon_stipple;
softpipe->pipe.set_scissor_state = softpipe_set_scissor_state;
softpipe->pipe.set_viewport_state = softpipe_set_viewport_state;
softpipe->pipe.draw_vbo = softpipe_draw_vbo;
softpipe->pipe.draw_stream_output = softpipe_draw_stream_output;
+3 -13
View File
@@ -118,6 +118,9 @@ struct sp_so_state {
void
softpipe_init_blend_funcs(struct pipe_context *pipe);
void
softpipe_init_clip_funcs(struct pipe_context *pipe);
void
softpipe_init_sampler_funcs(struct pipe_context *pipe);
@@ -131,25 +134,12 @@ softpipe_init_streamout_funcs(struct pipe_context *pipe);
void softpipe_set_framebuffer_state( struct pipe_context *,
const struct pipe_framebuffer_state * );
void softpipe_set_clip_state( struct pipe_context *,
const struct pipe_clip_state * );
void
softpipe_init_shader_funcs(struct pipe_context *pipe);
void
softpipe_init_vertex_funcs(struct pipe_context *pipe);
void softpipe_set_polygon_stipple( struct pipe_context *,
const struct pipe_poly_stipple * );
void softpipe_set_scissor_state( struct pipe_context *,
const struct pipe_scissor_state * );
void softpipe_set_viewport_state( struct pipe_context *,
const struct pipe_viewport_state * );
void softpipe_update_derived( struct softpipe_context *softpipe );
+22 -8
View File
@@ -32,8 +32,9 @@
#include "draw/draw_context.h"
void softpipe_set_clip_state( struct pipe_context *pipe,
const struct pipe_clip_state *clip )
static void
softpipe_set_clip_state(struct pipe_context *pipe,
const struct pipe_clip_state *clip)
{
struct softpipe_context *softpipe = softpipe_context(pipe);
@@ -42,8 +43,9 @@ void softpipe_set_clip_state( struct pipe_context *pipe,
}
void softpipe_set_viewport_state( struct pipe_context *pipe,
const struct pipe_viewport_state *viewport )
static void
softpipe_set_viewport_state(struct pipe_context *pipe,
const struct pipe_viewport_state *viewport)
{
struct softpipe_context *softpipe = softpipe_context(pipe);
@@ -55,8 +57,9 @@ void softpipe_set_viewport_state( struct pipe_context *pipe,
}
void softpipe_set_scissor_state( struct pipe_context *pipe,
const struct pipe_scissor_state *scissor )
static void
softpipe_set_scissor_state(struct pipe_context *pipe,
const struct pipe_scissor_state *scissor)
{
struct softpipe_context *softpipe = softpipe_context(pipe);
@@ -67,8 +70,9 @@ void softpipe_set_scissor_state( struct pipe_context *pipe,
}
void softpipe_set_polygon_stipple( struct pipe_context *pipe,
const struct pipe_poly_stipple *stipple )
static void
softpipe_set_polygon_stipple(struct pipe_context *pipe,
const struct pipe_poly_stipple *stipple)
{
struct softpipe_context *softpipe = softpipe_context(pipe);
@@ -77,3 +81,13 @@ void softpipe_set_polygon_stipple( struct pipe_context *pipe,
softpipe->poly_stipple = *stipple; /* struct copy */
softpipe->dirty |= SP_NEW_STIPPLE;
}
void
softpipe_init_clip_funcs(struct pipe_context *pipe)
{
pipe->set_clip_state = softpipe_set_clip_state;
pipe->set_viewport_state = softpipe_set_viewport_state;
pipe->set_scissor_state = softpipe_set_scissor_state;
pipe->set_polygon_stipple = softpipe_set_polygon_stipple;
}