r300g: implement MSAA

[mesa.git] / src / gallium / auxiliary / util / u_dynarray.h

diff --git a/src/gallium/auxiliary/util/u_dynarray.h b/src/gallium/auxiliary/util/u_dynarray.h
index 5d124832be34fc18279f2647e9ef2393503fef36..980cadf22d1b1e5eb7320dadce0dde5021ba7f9e 100644 (file)
--- a/src/gallium/auxiliary/util/u_dynarray.h
+++ b/src/gallium/auxiliary/util/u_dynarray.h
@@ -59,10 +59,10 @@ util_dynarray_fini(struct util_dynarray *buf)
    }
 }
 
+/* use util_dynarray_trim to reduce the allocated storage */
 static INLINE void *
-util_dynarray_grow(struct util_dynarray *buf, int size)
+util_dynarray_resize(struct util_dynarray *buf, unsigned newsize)
 {
-   unsigned newsize = buf->size + size;
    char *p;
    if(newsize > buf->capacity)
    {
@@ -78,16 +78,25 @@ util_dynarray_grow(struct util_dynarray *buf, int size)
    return p;
 }
 
+static INLINE void *
+util_dynarray_grow(struct util_dynarray *buf, int diff)
+{
+   return util_dynarray_resize(buf, buf->size + diff);
+}
+
 static INLINE void
 util_dynarray_trim(struct util_dynarray *buf)
 {
-   if(buf->size) {
-      buf->data = REALLOC(buf->data, buf->capacity, buf->size);
-      buf->capacity = buf->size;
-   } else {
-      FREE(buf->data);
-      buf->data = 0;
-      buf->capacity = 0;
+   if (buf->size != buf->capacity) {
+      if (buf->size) {
+         buf->data = REALLOC(buf->data, buf->capacity, buf->size);
+         buf->capacity = buf->size;
+      }
+      else {
+         FREE(buf->data);
+         buf->data = 0;
+         buf->capacity = 0;
+      }
    }
 }
 
@@ -97,6 +106,9 @@ util_dynarray_trim(struct util_dynarray *buf)
 #define util_dynarray_pop_ptr(buf, type) (type*)((char*)(buf)->data + ((buf)->size -= sizeof(type)))
 #define util_dynarray_pop(buf, type) *util_dynarray_pop_ptr(buf, type)
 #define util_dynarray_contains(buf, type) ((buf)->size >= sizeof(type))
+#define util_dynarray_element(buf, type, idx) ((type*)(buf)->data + (idx))
+#define util_dynarray_begin(buf) ((buf)->data)
+#define util_dynarray_end(buf) ((void*)util_dynarray_element((buf), char, (buf)->size))
 
 #endif /* U_DYNARRAY_H */