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 58dec8539b668e390ca58518edbf75019fc3ce49..1dfbc1399ba63b234c355e40df40d3f02624b92d 100644 (file)
--- a/src/gallium/drivers/r300/r300_screen_buffer.h
+++ b/src/gallium/drivers/r300/r300_screen_buffer.h
@@ -46,7 +46,7 @@ struct r300_buffer_range {
 /* Vertex buffer. */
 struct r300_buffer
 {
-    struct u_resource b;
+    struct u_vbuf_resource b;
 
     uint32_t magic;
 
@@ -55,15 +55,11 @@ struct r300_buffer
 
     enum r300_buffer_domain domain;
 
-    uint8_t *user_buffer;
     uint8_t *constant_buffer;
 };
 
 /* Functions. */
 
-void r300_upload_user_buffers(struct r300_context *r300,
-                             int min_index, int max_index);
-
 void r300_upload_index_buffer(struct r300_context *r300,
                              struct pipe_resource **index_buffer,
                              unsigned index_size, unsigned *start,
@@ -87,9 +83,4 @@ static INLINE struct r300_buffer *r300_buffer(struct pipe_resource *buffer)
     return (struct r300_buffer *)buffer;
 }
 
-static INLINE boolean r300_is_user_buffer(struct pipe_resource *buffer)
-{
-    return r300_buffer(buffer)->user_buffer ? true : false;
-}
-
 #endif