From: Brian Paul <brianp@vmware.com>
Date: Mon, 23 Aug 2010 00:48:28 +0000 (-0600)
Subject: st/mesa: clean-up pipe_get_transfer() calls
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ed57286b75e337b29204cc998462a50a6fe47bc2;p=mesa.git

st/mesa: clean-up pipe_get_transfer() calls
---

diff --git a/src/mesa/state_tracker/st_cb_readpixels.c b/src/mesa/state_tracker/st_cb_readpixels.c
index b8493dab93f..d5f5d422749 100644
--- a/src/mesa/state_tracker/st_cb_readpixels.c
+++ b/src/mesa/state_tracker/st_cb_readpixels.c
@@ -74,10 +74,10 @@ st_read_stencil_pixels(GLcontext *ctx, GLint x, GLint y,
 
    /* Create a read transfer from the renderbuffer's texture */
 
-   pt = pipe_get_transfer(st_context(ctx)->pipe, strb->texture,
-				       0, 0, 0,
-				       PIPE_TRANSFER_READ, x, y,
-				       width, height);
+   pt = pipe_get_transfer(pipe, strb->texture,
+                          0, 0, 0,  /* face, level, zslice */
+                          PIPE_TRANSFER_READ,
+                          x, y, width, height);
 
    /* map the stencil buffer */
    stmap = pipe_transfer_map(pipe, pt);
@@ -230,10 +230,10 @@ st_fast_readpixels(GLcontext *ctx, struct st_renderbuffer *strb,
          y = strb->texture->height0 - y - height;
       }
 
-      trans = pipe_get_transfer(st_context(ctx)->pipe, strb->texture,
-					     0, 0, 0,
-					     PIPE_TRANSFER_READ, x, y,
-					     width, height);
+      trans = pipe_get_transfer(pipe, strb->texture,
+                                0, 0, 0,  /* face, level, zslice */
+                                PIPE_TRANSFER_READ,
+                                x, y, width, height);
       if (!trans) {
          return GL_FALSE;
       }
@@ -394,10 +394,10 @@ st_readpixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
    }
 
    /* Create a read transfer from the renderbuffer's texture */
-   trans = pipe_get_transfer(st_context(ctx)->pipe, strb->texture,
-					  0, 0, 0,
-					  PIPE_TRANSFER_READ, x, y,
-					  width, height);
+   trans = pipe_get_transfer(pipe, strb->texture,
+                             0, 0, 0,  /* face, level, zslice */
+                             PIPE_TRANSFER_READ,
+                             x, y, width, height);
 
    /* determine bottom-to-top vs. top-to-bottom order */
    if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) {