---
src/gallium/auxiliary/pipebuffer/pb_buffer.h | 24 ++
.../auxiliary/pipebuffer/pb_buffer_fenced.c| 32 ++--
.../auxiliary/pipebuffer/pb_buffer_malloc.c|8 ++--
src/gallium/auxiliary/pipebuffer/pb_bufmgr_cache.c | 30 +-
src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c | 30 +-
src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c| 10 +++---
.../auxiliary/pipebuffer/pb_bufmgr_ondemand.c |8 ++--
src/gallium/auxiliary/pipebuffer/pb_bufmgr_pool.c | 18 +-
src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c | 18 +-
src/gallium/winsys/r600/drm/r600_hw_context.c |2 +-
src/gallium/winsys/radeon/drm/radeon_drm_bo.c | 18 +-
src/gallium/winsys/svga/drm/vmw_buffer.c |8 ++--
src/gallium/winsys/svga/drm/vmw_context.c |2 +-
13 files changed, 102 insertions(+), 106 deletions(-)
diff --git a/src/gallium/auxiliary/pipebuffer/pb_buffer.h
b/src/gallium/auxiliary/pipebuffer/pb_buffer.h
index 5a13f39..a5ec93c 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_buffer.h
+++ b/src/gallium/auxiliary/pipebuffer/pb_buffer.h
@@ -97,14 +97,10 @@ typedef unsigned pb_size;
*/
struct pb_buffer
{
- /* This used to be a pipe_buffer struct:
-*/
- struct {
- struct pipe_reference reference;
- unsigned size;
- unsigned alignment;
- unsigned usage;
- } base;
+ struct pipe_reference reference;
+ unsigned size;
+ unsigned alignment;
+ unsigned usage;
/**
* Pointer to the virtual function table.
@@ -169,7 +165,7 @@ pb_map(struct pb_buffer *buf,
assert(buf);
if(!buf)
return NULL;
- assert(pipe_is_referenced(&buf->base.reference));
+ assert(pipe_is_referenced(&buf->reference));
return buf->vtbl->map(buf, flags, flush_ctx);
}
@@ -180,7 +176,7 @@ pb_unmap(struct pb_buffer *buf)
assert(buf);
if(!buf)
return;
- assert(pipe_is_referenced(&buf->base.reference));
+ assert(pipe_is_referenced(&buf->reference));
buf->vtbl->unmap(buf);
}
@@ -196,11 +192,11 @@ pb_get_base_buffer( struct pb_buffer *buf,
offset = 0;
return;
}
- assert(pipe_is_referenced(&buf->base.reference));
+ assert(pipe_is_referenced(&buf->reference));
assert(buf->vtbl->get_base_buffer);
buf->vtbl->get_base_buffer(buf, base_buf, offset);
assert(*base_buf);
- assert(*offset < (*base_buf)->base.size);
+ assert(*offset < (*base_buf)->size);
}
@@ -232,7 +228,7 @@ pb_destroy(struct pb_buffer *buf)
assert(buf);
if(!buf)
return;
- assert(!pipe_is_referenced(&buf->base.reference));
+ assert(!pipe_is_referenced(&buf->reference));
buf->vtbl->destroy(buf);
}
@@ -242,7 +238,7 @@ pb_reference(struct pb_buffer **dst,
{
struct pb_buffer *old = *dst;
- if (pipe_reference(&(*dst)->base.reference, &src->base.reference))
+ if (pipe_reference(&(*dst)->reference, &src->reference))
pb_destroy( old );
*dst = src;
}
diff --git a/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
index c310f28..9e0cace 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
@@ -210,8 +210,8 @@ fenced_manager_dump_locked(struct fenced_manager
*fenced_mgr)
assert(!fenced_buf->fence);
debug_printf("%10p %7u %8u %7s\n",
(void *) fenced_buf,
- fenced_buf->base.base.size,
- p_atomic_read(&fenced_buf->base.base.reference.count),
+ fenced_buf->base.size,
+ p_atomic_read(&fenced_buf->base.reference.count),
fenced_buf->buffer ? "gpu" : (fenced_buf->data ? "cpu" :
"none"));
curr = next;
next = curr->next;
@@ -226,8 +226,8 @@ fenced_manager_dump_locked(struct fenced_manager
*fenced_mgr)
signaled = ops->fence_signalled(ops, fenced_buf->fence, 0);
debug_printf("%10p %7u %8u %7s %10p %s\n",
(void *) fenced_buf,
- fenced_buf->base.base.size,
- p_atomic_read(&fenced_buf->base.base.reference.count),
+ fenced_buf->base.size,
+ p_atomic_read(&fenced_buf->base.reference.count),
"gpu",
(void *) fenced_buf->fence,
signaled == 0 ? "y" : "n");
@@ -244,7 +244,7 @@ static INLINE void
fenced_buffer_destroy_locked(struct fenced_manager *fenced_mgr,
struct fenced_buffer *fenced_buf)
{
- assert(!pipe_is_referenced(&fenced_buf->base.base.reference));
+ assert(!pipe_is_referenced(&fenced_buf->base.reference));
assert(!fenced_buf->fence);
assert(fenced_buf->head.prev);
@@ -269,11 +269,11 @@ static INLINE void
fenced_buffer_add_locked(