From 5b2406c0b9069363259a3d4b9486b081be5ade03 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Sat, 25 Sep 2010 14:12:12 -0600
Subject: softpipe: make stream out state functions static

---
 src/gallium/drivers/softpipe/sp_context.c  |  6 +-----
 src/gallium/drivers/softpipe/sp_state.h    | 18 +++---------------
 src/gallium/drivers/softpipe/sp_state_so.c | 24 ++++++++++++++++++++----
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/gallium/drivers/softpipe/sp_context.c b/src/gallium/drivers/softpipe/sp_context.c
index 346b56aab4..c2b3594202 100644
--- a/src/gallium/drivers/softpipe/sp_context.c
+++ b/src/gallium/drivers/softpipe/sp_context.c
@@ -232,19 +232,15 @@ softpipe_create_context( struct pipe_screen *screen,
    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.create_stream_output_state = softpipe_create_stream_output_state;
-   softpipe->pipe.bind_stream_output_state = softpipe_bind_stream_output_state;
-   softpipe->pipe.delete_stream_output_state = softpipe_delete_stream_output_state;
-
    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.set_stream_output_buffers = softpipe_set_stream_output_buffers;
 
    softpipe->pipe.draw_vbo = softpipe_draw_vbo;
    softpipe->pipe.draw_stream_output = softpipe_draw_stream_output;
diff --git a/src/gallium/drivers/softpipe/sp_state.h b/src/gallium/drivers/softpipe/sp_state.h
index 8c539ca25f..d6a435d2de 100644
--- a/src/gallium/drivers/softpipe/sp_state.h
+++ b/src/gallium/drivers/softpipe/sp_state.h
@@ -124,6 +124,9 @@ softpipe_init_sampler_funcs(struct pipe_context *pipe);
 void
 softpipe_init_rasterizer_funcs(struct pipe_context *pipe);
 
+void
+softpipe_init_streamout_funcs(struct pipe_context *pipe);
+
 
 void softpipe_set_framebuffer_state( struct pipe_context *,
                                      const struct pipe_framebuffer_state * );
@@ -176,20 +179,5 @@ softpipe_get_vertex_info(struct softpipe_context *softpipe);
 struct vertex_info *
 softpipe_get_vbuf_vertex_info(struct softpipe_context *softpipe);
 
-void *
-softpipe_create_stream_output_state(
-   struct pipe_context *pipe,
-   const struct pipe_stream_output_state *templ);
-void
-softpipe_bind_stream_output_state(struct pipe_context *pipe,
-                                  void *so);
-void
-softpipe_delete_stream_output_state(struct pipe_context *pipe, void *so);
-
-void
-softpipe_set_stream_output_buffers(struct pipe_context *pipe,
-                                   struct pipe_resource **buffers,
-                                   int *offsets,
-                                   int num_buffers);
 
 #endif
diff --git a/src/gallium/drivers/softpipe/sp_state_so.c b/src/gallium/drivers/softpipe/sp_state_so.c
index cfe23f9e84..ddfa3ef765 100644
--- a/src/gallium/drivers/softpipe/sp_state_so.c
+++ b/src/gallium/drivers/softpipe/sp_state_so.c
@@ -34,7 +34,7 @@
 #include "draw/draw_context.h"
 
 
-void *
+static void *
 softpipe_create_stream_output_state(struct pipe_context *pipe,
                                     const struct pipe_stream_output_state *templ)
 {
@@ -57,7 +57,8 @@ softpipe_create_stream_output_state(struct pipe_context *pipe,
    return so;
 }
 
-void
+
+static void
 softpipe_bind_stream_output_state(struct pipe_context *pipe,
                                   void *so)
 {
@@ -72,13 +73,15 @@ softpipe_bind_stream_output_state(struct pipe_context *pipe,
       draw_set_so_state(softpipe->draw, &sp_so->base);
 }
 
-void
+
+static void
 softpipe_delete_stream_output_state(struct pipe_context *pipe, void *so)
 {
    FREE( so );
 }
 
-void
+
+static void
 softpipe_set_stream_output_buffers(struct pipe_context *pipe,
                                    struct pipe_resource **buffers,
                                    int *offsets,
@@ -122,3 +125,16 @@ softpipe_set_stream_output_buffers(struct pipe_context *pipe,
 
    draw_set_mapped_so_buffers(softpipe->draw, map_buffers, num_buffers);
 }
+
+
+
+void
+softpipe_init_streamout_funcs(struct pipe_context *pipe)
+{
+   pipe->create_stream_output_state = softpipe_create_stream_output_state;
+   pipe->bind_stream_output_state = softpipe_bind_stream_output_state;
+   pipe->delete_stream_output_state = softpipe_delete_stream_output_state;
+
+   pipe->set_stream_output_buffers = softpipe_set_stream_output_buffers;
+}
+
-- 
cgit v1.2.3