Squashed commit of the following:

[mesa.git] / src / gallium / state_trackers / python / st_sample.c

diff --git a/src/gallium/state_trackers/python/st_sample.c b/src/gallium/state_trackers/python/st_sample.c
index 218a77fb0a1e7e9ad713d69b182e1974343a1b47..25bfbf1ab73d5991ede74566fa9394ae6025ebcb 100644 (file)
--- a/src/gallium/state_trackers/python/st_sample.c
+++ b/src/gallium/state_trackers/python/st_sample.c
@@ -546,22 +546,22 @@ st_sample_surface(struct pipe_context *pipe,
                   float *rgba,
                   boolean norm)
 {
-   struct pipe_texture *texture = surface->texture;
+   struct pipe_resource *texture = surface->texture;
    unsigned width = u_minify(texture->width0, surface->level);
    unsigned height = u_minify(texture->height0, surface->level);
    uint rgba_stride = width * 4;
    struct pipe_transfer *transfer;
    void *raw;
 
-   transfer = pipe->get_tex_transfer(pipe,
-                                     surface->texture,
-                                     surface->face,
-                                     surface->level,
-                                     surface->zslice,
-                                     PIPE_TRANSFER_WRITE,
-                                     0, 0,
-                                     width,
-                                     height);
+   transfer = pipe_get_transfer(pipe,
+                                surface->texture,
+                                surface->face,
+                                surface->level,
+                                surface->zslice,
+                                PIPE_TRANSFER_WRITE,
+                                0, 0,
+                                width,
+                                height);
    if (!transfer)
       return;
 
@@ -590,6 +590,6 @@ st_sample_surface(struct pipe_context *pipe,
 
       pipe->transfer_unmap(pipe, transfer);
    }
-   
-   pipe->tex_transfer_destroy(pipe, transfer);
+
+   pipe->transfer_destroy(pipe, transfer);
 }