Squashed commit of the following:

[mesa.git] / src / gallium / drivers / llvmpipe / lp_state.h

diff --git a/src/gallium/drivers/llvmpipe/lp_state.h b/src/gallium/drivers/llvmpipe/lp_state.h
index be02e97648e7d10be355207cbceb5bfa871ec99f..d89c28a2af2223ee43baa84e644f74d57ef14528 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_state.h
+++ b/src/gallium/drivers/llvmpipe/lp_state.h
@@ -67,6 +67,7 @@ struct lp_fragment_shader;
 struct lp_fragment_shader_variant_key
 {
    struct pipe_depth_state depth;
+   struct pipe_stencil_state stencil[2];
    struct pipe_alpha_state alpha;
    struct pipe_blend_state blend;
    enum pipe_format zsbuf_format;
@@ -169,7 +170,7 @@ void llvmpipe_set_clip_state( struct pipe_context *,
 
 void llvmpipe_set_constant_buffer(struct pipe_context *,
                                   uint shader, uint index,
-                                  struct pipe_buffer *buf);
+                                  struct pipe_resource *buf);
 
 void *llvmpipe_create_fs_state(struct pipe_context *,
                                const struct pipe_shader_state *);
@@ -203,7 +204,7 @@ llvmpipe_set_vertex_sampler_views(struct pipe_context *,
 
 struct pipe_sampler_view *
 llvmpipe_create_sampler_view(struct pipe_context *pipe,
-                            struct pipe_texture *texture,
+                            struct pipe_resource *texture,
                             const struct pipe_sampler_view *templ);
 
 void
@@ -226,12 +227,12 @@ void llvmpipe_draw_arrays(struct pipe_context *pipe, unsigned mode,
                             unsigned start, unsigned count);
 
 void llvmpipe_draw_elements(struct pipe_context *pipe,
-                              struct pipe_buffer *indexBuffer,
+                              struct pipe_resource *indexBuffer,
                               unsigned indexSize,
                               unsigned mode, unsigned start, unsigned count);
 void
 llvmpipe_draw_range_elements(struct pipe_context *pipe,
-                             struct pipe_buffer *indexBuffer,
+                             struct pipe_resource *indexBuffer,
                              unsigned indexSize,
                              unsigned min_index,
                              unsigned max_index,