Squashed commit of the following:

[mesa.git] / src / mesa / state_tracker / st_cb_blit.c

diff --git a/src/mesa/state_tracker/st_cb_blit.c b/src/mesa/state_tracker/st_cb_blit.c
index abf0ac0fc82c578a0b506328b9c790c2b5d94edd..0498080ccfc5ff3adf47e6405ecda1ee29806876 100644 (file)
--- a/src/mesa/state_tracker/st_cb_blit.c
+++ b/src/mesa/state_tracker/st_cb_blit.c
@@ -128,12 +128,12 @@ st_BlitFramebuffer(GLcontext *ctx,
                                            srcAtt->CubeMapFace,
                                            srcAtt->TextureLevel,
                                            srcAtt->Zoffset,
-                                           PIPE_BUFFER_USAGE_GPU_READ);
+                                           PIPE_BIND_BLIT_SOURCE);
          if(!srcSurf)
             return;
 
          util_blit_pixels(st->blit,
-                          srcSurf, st_get_stobj_sampler_view(srcObj, pipe),
+                          srcSurf, st_get_stobj_sampler_view(srcObj),
                           srcX0, srcY0, srcX1, srcY1,
                           dstSurf, dstX0, dstY0, dstX1, dstY1,
                           0.0, pFilter);