Mesa (master): r300g: remove r300_transfer::ctx

Marek Olšák mareko at kemper.freedesktop.org
Sun Apr 18 00:59:10 UTC 2010


Module: Mesa
Branch: master
Commit: 4185d9770f1e08f190a57547ca47a231b9c0d6d7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4185d9770f1e08f190a57547ca47a231b9c0d6d7

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sun Apr 18 00:11:29 2010 +0200

r300g: remove r300_transfer::ctx

---

 src/gallium/drivers/r300/r300_transfer.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_transfer.c b/src/gallium/drivers/r300/r300_transfer.c
index e4df750..b795b2e 100644
--- a/src/gallium/drivers/r300/r300_transfer.c
+++ b/src/gallium/drivers/r300/r300_transfer.c
@@ -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(




More information about the mesa-commit mailing list