Mesa (master): r300g: don't use pipe_context::winsys

Marek Olšák mareko at kemper.freedesktop.org
Tue Jan 31 14:32:49 PST 2012


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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Tue Jan 31 07:44:22 2012 +0100

r300g: don't use pipe_context::winsys

---

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

diff --git a/src/gallium/drivers/r300/r300_transfer.c b/src/gallium/drivers/r300/r300_transfer.c
index 91e861a..10ff2b0 100644
--- a/src/gallium/drivers/r300/r300_transfer.c
+++ b/src/gallium/drivers/r300/r300_transfer.c
@@ -231,7 +231,6 @@ void* r300_texture_transfer_map(struct pipe_context *ctx,
 				struct pipe_transfer *transfer)
 {
     struct r300_context *r300 = r300_context(ctx);
-    struct radeon_winsys *rws = (struct radeon_winsys *)ctx->winsys;
     struct r300_transfer *r300transfer = r300_transfer(transfer);
     struct r300_resource *tex = r300_resource(transfer->resource);
     char *map;
@@ -240,13 +239,11 @@ void* r300_texture_transfer_map(struct pipe_context *ctx,
     if (r300transfer->linear_texture) {
         /* The detiled texture is of the same size as the region being mapped
          * (no offset needed). */
-        return rws->buffer_map(r300transfer->linear_texture->buf,
-                               r300->cs,
-                               transfer->usage);
+        return r300->rws->buffer_map(r300transfer->linear_texture->buf,
+				     r300->cs, transfer->usage);
     } else {
         /* Tiling is disabled. */
-        map = rws->buffer_map(tex->buf, r300->cs,
-                              transfer->usage);
+        map = r300->rws->buffer_map(tex->buf, r300->cs, transfer->usage);
 
         if (!map) {
             return NULL;



More information about the mesa-commit mailing list