Merge remote branch 'origin/master' into nv50-compiler

[mesa.git] / src / gallium / drivers / r300 / r300_transfer.h

diff --git a/src/gallium/drivers/r300/r300_transfer.h b/src/gallium/drivers/r300/r300_transfer.h
index 79baf6d0480be841b90a2ad2bb088dbbd75db0b0..0d32a68d1fa2bec851b147b0756bfe59ffdbb89b 100644 (file)
--- a/src/gallium/drivers/r300/r300_transfer.h
+++ b/src/gallium/drivers/r300/r300_transfer.h
@@ -24,10 +24,28 @@
 #ifndef R300_TRANSFER
 #define R300_TRANSFER
 
-#include "pipe/p_screen.h"
+#include "pipe/p_context.h"
 
 struct r300_context;
 
-void r300_init_transfer_functions(struct r300_context *r300ctx);
+struct pipe_transfer*
+r300_texture_get_transfer(struct pipe_context *ctx,
+                         struct pipe_resource *texture,
+                         struct pipe_subresource sr,
+                         unsigned usage,
+                         const struct pipe_box *box);
+
+void
+r300_texture_transfer_destroy(struct pipe_context *ctx,
+                             struct pipe_transfer *trans);
+
+void*
+r300_texture_transfer_map(struct pipe_context *ctx,
+                         struct pipe_transfer *transfer);
+
+void
+r300_texture_transfer_unmap(struct pipe_context *ctx,
+                           struct pipe_transfer *transfer);
+
 
 #endif