include surface.offset in address calculations

[mesa.git] / src / mesa / pipe / softpipe / sp_state.h

diff --git a/src/mesa/pipe/softpipe/sp_state.h b/src/mesa/pipe/softpipe/sp_state.h
index 38a212b79ad98eb1858353c2fa24cb9bc4650696..3c572cdb6a406516cfb7c2bc9e2b274de0d248b1 100644 (file)
--- a/src/mesa/pipe/softpipe/sp_state.h
+++ b/src/mesa/pipe/softpipe/sp_state.h
@@ -56,8 +56,14 @@ void softpipe_set_clip_state( struct pipe_context *,
 void softpipe_set_depth_test_state( struct pipe_context *,
                                     const struct pipe_depth_state * );
 
-void softpipe_set_viewport_state( struct pipe_context *,
-                                  const struct pipe_viewport_state * );
+void softpipe_set_fs_state( struct pipe_context *,
+                          const struct pipe_fs_state * );
+
+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_setup_state( struct pipe_context *,
                              const struct pipe_setup_state * );
@@ -66,18 +72,15 @@ void softpipe_set_sampler_state( struct pipe_context *,
                                  GLuint unit,
                                  const struct pipe_sampler_state * );
 
+void softpipe_set_stencil_state( struct pipe_context *,
+                                 const struct pipe_stencil_state * );
+
 void softpipe_set_texture_state( struct pipe_context *,
                                  GLuint unit,
-                                 struct pipe_texture_object * );
+                                 struct pipe_mipmap_tree * );
 
-void softpipe_set_scissor_state( struct pipe_context *,
-                                 const struct pipe_scissor_state * );
-
-void softpipe_set_fs_state( struct pipe_context *,
-                          const struct pipe_fs_state * );
-
-void softpipe_set_polygon_stipple( struct pipe_context *,
-                                 const struct pipe_poly_stipple * );
+void softpipe_set_viewport_state( struct pipe_context *,
+                                  const struct pipe_viewport_state * );
 
 void softpipe_update_derived( struct softpipe_context *softpipe );