r300g: use the new vertex buffer manager

[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 57f48229b2e016b44718df7dab527f7da9f40abe..1dfbc1399ba63b234c355e40df40d3f02624b92d 100644 (file)
--- a/src/gallium/drivers/r300/r300_screen_buffer.h
+++ b/src/gallium/drivers/r300/r300_screen_buffer.h
@@ -46,34 +46,31 @@ struct r300_buffer_range {
 /* Vertex buffer. */
 struct r300_buffer
 {
-    struct u_resource b;
+    struct u_vbuf_resource b;
 
     uint32_t magic;
 
     struct r300_winsys_buffer *buf;
+    struct r300_winsys_cs_buffer *cs_buf;
 
-    void *user_buffer;
-    struct r300_buffer_range ranges[R300_BUFFER_MAX_RANGES];
-    unsigned num_ranges;
+    enum r300_buffer_domain domain;
+
+    uint8_t *constant_buffer;
 };
 
 /* 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);
 
 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);
+                                             void *ptr, unsigned size,
+                                             unsigned bind);
 
 unsigned r300_buffer_is_referenced(struct pipe_context *context,
                                   struct pipe_resource *buf,
@@ -83,52 +80,7 @@ unsigned r300_buffer_is_referenced(struct pipe_context *context,
 
 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;
-}
-
-static INLINE boolean r300_add_buffer(struct r300_winsys_screen *rws,
-                                     struct pipe_resource *buffer,
-                                     int rd, int wr)
-{
-    struct r300_buffer *buf = r300_buffer(buffer);
-
-    if (!buf->buf)
-       return true;
-
-    return rws->add_buffer(rws, buf->buf, rd, wr);
-}
-
-static INLINE boolean r300_add_texture(struct r300_winsys_screen *rws,
-                                      struct r300_texture *tex,
-                                      int rd, int wr)
-{
-    return rws->add_buffer(rws, tex->buffer, rd, wr);
-}
-
-static INLINE void r300_buffer_write_reloc(struct r300_winsys_screen *rws,
-                                     struct r300_buffer *buf,
-                                     uint32_t rd, uint32_t wd, uint32_t flags)
-{
-    if (!buf->buf)
-       return;
-
-    rws->write_cs_reloc(rws, buf->buf, rd, wd, flags);
-}
-
-static INLINE void r300_texture_write_reloc(struct r300_winsys_screen *rws,
-                                           struct r300_texture *texture,
-                                           uint32_t rd, uint32_t wd, uint32_t flags)
-{
-    rws->write_cs_reloc(rws, texture->buffer, rd, wd, flags);
+    return (struct r300_buffer *)buffer;
 }
 
 #endif