u_vbuf_mgr: cleanup original vs real vertex buffer arrays

[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 1dfbc1399ba63b234c355e40df40d3f02624b92d..360ec509cc53d645b6f9259af3d2dfe7f7fa15b7 100644 (file)
--- a/src/gallium/drivers/r300/r300_screen_buffer.h
+++ b/src/gallium/drivers/r300/r300_screen_buffer.h
@@ -32,38 +32,14 @@
 #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_vbuf_resource b;
-
-    uint32_t magic;
-
-    struct r300_winsys_buffer *buf;
-    struct r300_winsys_cs_buffer *cs_buf;
-
-    enum r300_buffer_domain domain;
-
-    uint8_t *constant_buffer;
-};
-
 /* Functions. */
 
 void r300_upload_index_buffer(struct r300_context *r300,
                              struct pipe_resource **index_buffer,
                              unsigned index_size, unsigned *start,
-                             unsigned count);
+                             unsigned count, uint8_t *ptr);
 
 struct pipe_resource *r300_buffer_create(struct pipe_screen *screen,
                                         const struct pipe_resource *templ);
@@ -72,10 +48,6 @@ struct pipe_resource *r300_user_buffer_create(struct pipe_screen *screen,
                                              void *ptr, unsigned size,
                                              unsigned bind);
 
-unsigned r300_buffer_is_referenced(struct pipe_context *context,
-                                  struct pipe_resource *buf,
-                                   enum r300_reference_domain domain);
-
 /* Inline functions. */
 
 static INLINE struct r300_buffer *r300_buffer(struct pipe_resource *buffer)