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

[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 b4776fa344e7c388a4efd8e24be63f0a316e5946..cafa9f96f20f957e5f8874541b6baca8b93c1708 100644 (file)
--- a/src/gallium/drivers/r300/r300_screen_buffer.h
+++ b/src/gallium/drivers/r300/r300_screen_buffer.h
@@ -52,7 +52,10 @@ struct r300_buffer
 
     struct r300_winsys_buffer *buf;
 
+    enum r300_buffer_domain domain;
+
     void *user_buffer;
+    void *constant_buffer;
     struct r300_buffer_range ranges[R300_BUFFER_MAX_RANGES];
     unsigned num_ranges;
 };
@@ -65,7 +68,7 @@ int r300_upload_index_buffer(struct r300_context *r300,
                             struct pipe_resource **index_buffer,
                             unsigned index_size,
                             unsigned start,
-                            unsigned count);
+                            unsigned count, unsigned *out_offset);
 
 struct pipe_resource *r300_buffer_create(struct pipe_screen *screen,
                                         const struct pipe_resource *templ);
@@ -95,44 +98,4 @@ 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,
-                                     enum r300_buffer_domain rd,
-                                      enum r300_buffer_domain 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,
-                                           enum r300_buffer_domain rd,
-                                            enum r300_buffer_domain wd,
-                                            uint32_t flags)
-{
-    rws->write_cs_reloc(rws, texture->buffer, rd, wd, flags);
-}
-
 #endif