summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/pbo.c
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2014-01-27 21:36:53 +0100
committerMarek Olšák <marek.olsak@amd.com>2014-02-25 16:04:22 +0100
commitd26a065b7496ef69754fde6e4d0006ccb76f7f3a (patch)
tree920ac8779887a57d9fb916cf9ddf95c1b4542981 /src/mesa/main/pbo.c
parent4f78e17f6d1dc1eacbb203ea7c5c76b20dc2a311 (diff)
downloadexternal_mesa3d-d26a065b7496ef69754fde6e4d0006ccb76f7f3a.zip
external_mesa3d-d26a065b7496ef69754fde6e4d0006ccb76f7f3a.tar.gz
external_mesa3d-d26a065b7496ef69754fde6e4d0006ccb76f7f3a.tar.bz2
mesa: allow buffers mapped with the persistent flag to be used by the GPU
v2: also fixed InvalidateBufferData, added citations from the 4.4 spec Reviewed-by: Fredrik Höglund <fredrik@kde.org>
Diffstat (limited to 'src/mesa/main/pbo.c')
-rw-r--r--src/mesa/main/pbo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/pbo.c b/src/mesa/main/pbo.c
index 400cec3..4a39404 100644
--- a/src/mesa/main/pbo.c
+++ b/src/mesa/main/pbo.c
@@ -201,7 +201,7 @@ _mesa_map_validate_pbo_source(struct gl_context *ctx,
return ptr;
}
- if (_mesa_bufferobj_mapped(unpack->BufferObj)) {
+ if (_mesa_check_disallowed_mapping(unpack->BufferObj)) {
/* buffer is already mapped - that's an error */
_mesa_error(ctx, GL_INVALID_OPERATION, "%s(PBO is mapped)", where);
return NULL;
@@ -297,7 +297,7 @@ _mesa_map_validate_pbo_dest(struct gl_context *ctx,
return ptr;
}
- if (_mesa_bufferobj_mapped(unpack->BufferObj)) {
+ if (_mesa_check_disallowed_mapping(unpack->BufferObj)) {
/* buffer is already mapped - that's an error */
_mesa_error(ctx, GL_INVALID_OPERATION, "%s(PBO is mapped)", where);
return NULL;