r300g: various other cleanups

It seems to me that the resource management code is the most blurry.

Also some of my notes about fastfill are wrong, removing them too.

1 files changed, 51 insertions, 25 deletions

diff --git a/src/gallium/drivers/r300/r300_screen_buffer.h b/src/gallium/drivers/r300/r300_screen_buffer.h
index 9409bf3..82660d3 100644
--- a/src/gallium/drivers/r300/r300_screen_buffer.h
+++ b/src/gallium/drivers/r300/r300_screen_buffer.h
@@ -1,22 +1,49 @@
+/*
+ * Copyright 2010 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Dave Airlie
+ */
+
 #ifndef R300_SCREEN_BUFFER_H
 #define R300_SCREEN_BUFFER_H
+
 #include <stdio.h>
 #include "pipe/p_compiler.h"
 #include "pipe/p_state.h"
 #include "util/u_transfer.h"
-#include "r300_screen.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;
 };
-#define R300_BUFFER_MAX_RANGES 32
 
+/* Vertex buffer. */
 struct r300_buffer
 {
     struct u_resource b;
@@ -32,8 +59,27 @@ struct r300_buffer
     void *map;
 };
 
-static INLINE struct r300_buffer *
-r300_buffer(struct pipe_resource *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);
+
+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);
+
+/* Inline functions. */
+
+static INLINE struct r300_buffer *r300_buffer(struct pipe_resource *buffer)
 {
     if (buffer) {
 	assert(((struct r300_buffer *)buffer)->magic == R300_BUFFER_MAGIC);
@@ -42,8 +88,7 @@ r300_buffer(struct pipe_resource *buffer)
     return NULL;
 }
 
-static INLINE boolean 
-r300_buffer_is_user_buffer(struct pipe_resource *buffer)
+static INLINE boolean r300_buffer_is_user_buffer(struct pipe_resource *buffer)
 {
     return r300_buffer(buffer)->user_buffer ? true : false;
 }
@@ -60,7 +105,6 @@ static INLINE boolean r300_add_buffer(struct r300_winsys_screen *rws,
     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)
@@ -68,7 +112,6 @@ static INLINE boolean r300_add_texture(struct r300_winsys_screen *rws,
     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)
@@ -86,21 +129,4 @@ static INLINE void r300_texture_write_reloc(struct r300_winsys_screen *rws,
     rws->write_cs_reloc(rws, texture->buffer, rd, wd, flags);
 }
 
-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);
-
-
-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);
-
 #endif