rename vars, clean-up formatting

1 files changed, 20 insertions, 13 deletions

diff --git a/src/mesa/pipe/softpipe/sp_state_fs.c b/src/mesa/pipe/softpipe/sp_state_fs.c
index f72a91485f..830c873b25 100644
--- a/src/mesa/pipe/softpipe/sp_state_fs.c
+++ b/src/mesa/pipe/softpipe/sp_state_fs.c
@@ -38,8 +38,9 @@
 #include "pipe/tgsi/exec/tgsi_sse2.h"
 
 
-void * softpipe_create_fs_state(struct pipe_context *pipe,
-                                const struct pipe_shader_state *templ)
+void *
+softpipe_create_fs_state(struct pipe_context *pipe,
+                         const struct pipe_shader_state *templ)
 {
    struct softpipe_context *softpipe = softpipe_context(pipe);
    struct sp_fragment_shader_state *state;
@@ -78,7 +79,8 @@ void * softpipe_create_fs_state(struct pipe_context *pipe,
 }
 
 
-void softpipe_bind_fs_state(struct pipe_context *pipe, void *fs)
+void
+softpipe_bind_fs_state(struct pipe_context *pipe, void *fs)
 {
    struct softpipe_context *softpipe = softpipe_context(pipe);
 
@@ -88,10 +90,10 @@ void softpipe_bind_fs_state(struct pipe_context *pipe, void *fs)
 }
 
 
-void softpipe_delete_fs_state(struct pipe_context *pipe,
-                              void *shader)
+void
+softpipe_delete_fs_state(struct pipe_context *pipe, void *fs)
 {
-   struct sp_fragment_shader_state *state = shader;
+   struct sp_fragment_shader_state *state = fs;
 
 #if defined(__i386__) || defined(__386__)
    x86_release_func( &state->sse2_program );
@@ -101,8 +103,9 @@ void softpipe_delete_fs_state(struct pipe_context *pipe,
 }
 
 
-void * softpipe_create_vs_state(struct pipe_context *pipe,
-                                const struct pipe_shader_state *templ)
+void *
+softpipe_create_vs_state(struct pipe_context *pipe,
+                         const struct pipe_shader_state *templ)
 {
    struct softpipe_context *softpipe = softpipe_context(pipe);
    struct sp_vertex_shader_state *state;
@@ -125,7 +128,8 @@ void * softpipe_create_vs_state(struct pipe_context *pipe,
 }
 
 
-void softpipe_bind_vs_state(struct pipe_context *pipe, void *vs)
+void
+softpipe_bind_vs_state(struct pipe_context *pipe, void *vs)
 {
    struct softpipe_context *softpipe = softpipe_context(pipe);
 
@@ -137,7 +141,8 @@ void softpipe_bind_vs_state(struct pipe_context *pipe, void *vs)
 }
 
 
-void softpipe_delete_vs_state(struct pipe_context *pipe, void *vs)
+void
+softpipe_delete_vs_state(struct pipe_context *pipe, void *vs)
 {
    struct softpipe_context *softpipe = softpipe_context(pipe);
 
@@ -149,9 +154,11 @@ void softpipe_delete_vs_state(struct pipe_context *pipe, void *vs)
 }
 
 
-void softpipe_set_constant_buffer(struct pipe_context *pipe,
-                                  uint shader, uint index,
-                                  const struct pipe_constant_buffer *buf)
+
+void
+softpipe_set_constant_buffer(struct pipe_context *pipe,
+                             uint shader, uint index,
+                             const struct pipe_constant_buffer *buf)
 {
    struct softpipe_context *softpipe = softpipe_context(pipe);
    struct pipe_winsys *ws = pipe->winsys;