Merge branch 'master' into gallium-sampler-view

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

diff --git a/src/gallium/drivers/llvmpipe/lp_setup.h b/src/gallium/drivers/llvmpipe/lp_setup.h
index 17c112b528933dc72483ab616fc45b0ccce371e9..72116b8c6c40dde77b1af27377b2d8552e39b32f 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_setup.h
+++ b/src/gallium/drivers/llvmpipe/lp_setup.h
@@ -120,8 +120,9 @@ lp_setup_set_scissor( struct setup_context *setup,
                       const struct pipe_scissor_state *scissor );
 
 void
-lp_setup_set_sampler_textures( struct setup_context *setup,
-                               unsigned num, struct pipe_texture **texture);
+lp_setup_set_fragment_sampler_views(struct setup_context *setup,
+                                    unsigned num,
+                                    struct pipe_sampler_view **views);
 
 unsigned
 lp_setup_is_texture_referenced( const struct setup_context *setup,