summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary/pipebuffer/pb_buffer.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-08-28 18:59:32 +1000
committerDave Airlie <airlied@redhat.com>2010-09-12 13:32:43 +1000
commitb5fcf0c8e07e666523b007fab1d0fc18c2c89241 (patch)
tree2cd8fdfbe697531b04a9912e296df70d554db509 /src/gallium/auxiliary/pipebuffer/pb_buffer.h
parent95555ed03e95f7472ad1f6c4b43e0aa7aaa13f93 (diff)
downloadexternal_mesa3d-b5fcf0c8e07e666523b007fab1d0fc18c2c89241.zip
external_mesa3d-b5fcf0c8e07e666523b007fab1d0fc18c2c89241.tar.gz
external_mesa3d-b5fcf0c8e07e666523b007fab1d0fc18c2c89241.tar.bz2
pb: add void * for flush ctx to mapping functions
If the buffer we are attempting to map is referenced by the unsubmitted command stream for this context, we need to flush the command stream, however to do that we need to be able to access the context at the lowest level map function, currently we set the buffer in the toplevel map, but this racy between context. (we probably have a lot more issues than that.) I'll look into a proper solution as suggested by jrfonseca when I get some time.
Diffstat (limited to 'src/gallium/auxiliary/pipebuffer/pb_buffer.h')
-rw-r--r--src/gallium/auxiliary/pipebuffer/pb_buffer.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/pipebuffer/pb_buffer.h b/src/gallium/auxiliary/pipebuffer/pb_buffer.h
index a6c50dc..5a13f39 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_buffer.h
+++ b/src/gallium/auxiliary/pipebuffer/pb_buffer.h
@@ -130,7 +130,7 @@ struct pb_vtbl
* flags is bitmask of PB_USAGE_CPU_READ/WRITE.
*/
void *(*map)( struct pb_buffer *buf,
- unsigned flags );
+ unsigned flags, void *flush_ctx );
void (*unmap)( struct pb_buffer *buf );
@@ -164,13 +164,13 @@ struct pb_vtbl
*/
static INLINE void *
pb_map(struct pb_buffer *buf,
- unsigned flags)
+ unsigned flags, void *flush_ctx)
{
assert(buf);
if(!buf)
return NULL;
assert(pipe_is_referenced(&buf->base.reference));
- return buf->vtbl->map(buf, flags);
+ return buf->vtbl->map(buf, flags, flush_ctx);
}