Merge branch 'master' into gallium-sampler-view

[mesa.git] / src / gallium / drivers / r300 / r300_blit.c

diff --git a/src/gallium/drivers/r300/r300_blit.c b/src/gallium/drivers/r300/r300_blit.c
index b7ad6b2020608169d2939ef541537aa1945e3585..a60b12844d6398b32816ad9681020ffd2f255cf1 100644 (file)
--- a/src/gallium/drivers/r300/r300_blit.c
+++ b/src/gallium/drivers/r300/r300_blit.c
@@ -113,9 +113,9 @@ static void r300_hw_copy(struct pipe_context* pipe,
     util_blitter_save_fragment_sampler_states(
         r300->blitter, state->sampler_count, (void**)state->sampler_states);
 
-    util_blitter_save_fragment_sampler_textures(
-        r300->blitter, state->texture_count,
-        (struct pipe_texture**)state->textures);
+    util_blitter_save_fragment_sampler_views(
+        r300->blitter, r300->fragment_sampler_view_count,
+        r300->fragment_sampler_views);
 
     /* Do a copy */
     util_blitter_copy(r300->blitter,