r300g: remove r300_transfer::ctx
authorMarek Olšák <maraeo@gmail.com>
Sat, 17 Apr 2010 22:11:29 +0000 (00:11 +0200)
committerMarek Olšák <maraeo@gmail.com>
Sun, 18 Apr 2010 00:56:09 +0000 (02:56 +0200)
src/gallium/drivers/r300/r300_transfer.c

index e4df750..b795b2e 100644 (file)
@@ -35,9 +35,6 @@ struct r300_transfer {
     /* Parent class */
     struct pipe_transfer transfer;
 
-    /* Pipe context. */
-    struct pipe_context *ctx;
-
     /* Offset from start of buffer. */
     unsigned offset;
 
@@ -137,7 +134,6 @@ r300_texture_get_transfer(struct pipe_context *ctx,
         trans->transfer.sr = sr;
         trans->transfer.usage = usage;
         trans->transfer.box = *box;
-        trans->ctx = ctx;
 
         /* If the texture is tiled, we must create a temporary detiled texture
          * for this transfer. */
@@ -208,7 +204,7 @@ void r300_texture_transfer_destroy(struct pipe_context *ctx,
 
     if (r300transfer->detiled_texture) {
         if (trans->usage & PIPE_TRANSFER_WRITE) {
-            r300_copy_into_tiled_texture(r300transfer->ctx, r300transfer);
+            r300_copy_into_tiled_texture(ctx, r300transfer);
         }
 
         pipe_resource_reference(