Mesa (gallium-resources): softpipe: use u_transfer helpers

[Keith Whitwell]

Module: Mesa
Branch: gallium-resources
Commit: f5ef219c3bed62b6a0da842e675fae16268e0fbe
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f5ef219c3bed62b6a0da842e675fae16268e0fbe

Author: Keith Whitwell <keithw at vmware.com>
Date:   Sun Mar 14 09:43:20 2010 +0000

softpipe: use u_transfer helpers

---

 src/gallium/drivers/softpipe/sp_texture.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/softpipe/sp_texture.c b/src/gallium/drivers/softpipe/sp_texture.c
index e174fe9..0d7f7cb 100644
--- a/src/gallium/drivers/softpipe/sp_texture.c
+++ b/src/gallium/drivers/softpipe/sp_texture.c
@@ -36,6 +36,7 @@
 #include "util/u_format.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
+#include "util/u_transfer.h"
 
 #include "sp_context.h"
 #include "sp_texture.h"
@@ -279,10 +280,10 @@ softpipe_get_transfer(struct pipe_context *pipe,
       enum pipe_format format = resource->format;
       int nblocksy = util_format_get_nblocksy(resource->format, 
 					      u_minify(resource->height0, sr.level));
-      pipe_resource_reference(&resource, resource);
+      pipe_resource_reference(&pt->resource, resource);
       pt->box = *box;
       pt->stride = sptex->stride[sr.level];
-      //pt->usage = usage;
+      pt->usage = usage;
       //pt->face = face;
       //pt->level = level;
 
@@ -413,6 +414,9 @@ softpipe_init_texture_funcs(struct pipe_context *pipe)
    pipe->transfer_destroy = softpipe_transfer_destroy;
    pipe->transfer_map = softpipe_transfer_map;
    pipe->transfer_unmap = softpipe_transfer_unmap;
+
+   pipe->transfer_inline_write = u_transfer_inline_write;
+   pipe->transfer_inline_read = u_transfer_inline_read;
 }
 
 void