X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fr300%2Fr300_screen_buffer.h;h=cafa9f96f20f957e5f8874541b6baca8b93c1708;hb=db92a03aacc0c0e13377af4f54ef5303400b4810;hp=ff355858704c5bf8da95abbc6454ea602ded1507;hpb=bcc13b74443137043e8a34f8cb64a5add0d8af93;p=mesa.git

diff --git a/src/gallium/drivers/r300/r300_screen_buffer.h b/src/gallium/drivers/r300/r300_screen_buffer.h
index ff355858704..cafa9f96f20 100644
--- a/src/gallium/drivers/r300/r300_screen_buffer.h
+++ b/src/gallium/drivers/r300/r300_screen_buffer.h
@@ -55,6 +55,7 @@ struct r300_buffer
     enum r300_buffer_domain domain;
 
     void *user_buffer;
+    void *constant_buffer;
     struct r300_buffer_range ranges[R300_BUFFER_MAX_RANGES];
     unsigned num_ranges;
 };
@@ -67,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);
@@ -97,23 +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);
-}
-
 #endif