gallium/util: add fast path for buffers in u_default_transfer_inline_write

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

diff --git a/src/gallium/drivers/r300/r300_screen_buffer.h b/src/gallium/drivers/r300/r300_screen_buffer.h
index 4f7c0ec87e5cb63534c8ac5f3966414b636f473b..360ec509cc53d645b6f9259af3d2dfe7f7fa15b7 100644 (file)
--- a/src/gallium/drivers/r300/r300_screen_buffer.h
+++ b/src/gallium/drivers/r300/r300_screen_buffer.h
@@ -32,69 +32,27 @@
 #include "util/u_transfer.h"
 
 #include "r300_screen.h"
-#include "r300_winsys.h"
 #include "r300_context.h"
 
-#define R300_BUFFER_MAGIC 0xabcd1234
-#define R300_BUFFER_MAX_RANGES 32
-
-struct r300_buffer_range {
-    uint32_t start;
-    uint32_t end;
-};
-
-/* Vertex buffer. */
-struct r300_buffer
-{
-    struct u_resource b;
-
-    uint32_t magic;
-
-    struct r300_winsys_buffer *buf;
-
-    enum r300_buffer_domain domain;
-
-    void *user_buffer;
-    struct r300_buffer_range ranges[R300_BUFFER_MAX_RANGES];
-    unsigned num_ranges;
-};
-
 /* Functions. */
 
-int r300_upload_user_buffers(struct r300_context *r300);
-
-int r300_upload_index_buffer(struct r300_context *r300,
-                            struct pipe_resource **index_buffer,
-                            unsigned index_size,
-                            unsigned start,
-                            unsigned count);
+void r300_upload_index_buffer(struct r300_context *r300,
+                             struct pipe_resource **index_buffer,
+                             unsigned index_size, unsigned *start,
+                             unsigned count, uint8_t *ptr);
 
 struct pipe_resource *r300_buffer_create(struct pipe_screen *screen,
                                         const struct pipe_resource *templ);
 
 struct pipe_resource *r300_user_buffer_create(struct pipe_screen *screen,
-                                             void *ptr,
-                                             unsigned bytes,
-                                             unsigned usage);
-
-unsigned r300_buffer_is_referenced(struct pipe_context *context,
-                                  struct pipe_resource *buf,
-                                   enum r300_reference_domain domain);
+                                             void *ptr, unsigned size,
+                                             unsigned bind);
 
 /* Inline functions. */
 
 static INLINE struct r300_buffer *r300_buffer(struct pipe_resource *buffer)
 {
-    if (buffer) {
-       assert(((struct r300_buffer *)buffer)->magic == R300_BUFFER_MAGIC);
-       return (struct r300_buffer *)buffer;
-    }
-    return NULL;
-}
-
-static INLINE boolean r300_buffer_is_user_buffer(struct pipe_resource *buffer)
-{
-    return r300_buffer(buffer)->user_buffer ? true : false;
+    return (struct r300_buffer *)buffer;
 }
 
 #endif