Fixed in my branch:
http://cgit.freedesktop.org/~mareko/mesa/log/?h=buffer-storage
Marek
On Sat, Feb 8, 2014 at 6:32 PM, Fredrik Höglund <fred...@kde.org> wrote:
> On Thursday 30 January 2014, Marek Olšák wrote:
>> From: Marek Olšák <marek.ol...@amd.com>
>>
>> ---
>> src/mesa/main/api_validate.c | 2 +-
>> src/mesa/main/bufferobj.c | 12 ++++++++----
>> src/mesa/main/bufferobj.h | 8 ++++++++
>> src/mesa/main/drawpix.c | 4 ++--
>> src/mesa/main/pbo.c | 4 ++--
>> src/mesa/main/readpix.c | 2 +-
>> src/mesa/main/texgetimage.c | 4 ++--
>> src/mesa/vbo/vbo_exec_array.c | 4 ++--
>> 8 files changed, 26 insertions(+), 14 deletions(-)
>>
>> diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
>> index 6945584..50fd757 100644
>> --- a/src/mesa/main/api_validate.c
>> +++ b/src/mesa/main/api_validate.c
>> @@ -865,7 +865,7 @@ valid_draw_indirect(struct gl_context *ctx,
>> return GL_FALSE;
>> }
>>
>> - if (_mesa_bufferobj_mapped(ctx->DrawIndirectBuffer)) {
>> + if (_mesa_check_disallowed_mapping(ctx->DrawIndirectBuffer)) {
>> _mesa_error(ctx, GL_INVALID_OPERATION,
>> "%s(DRAW_INDIRECT_BUFFER is mapped)", name);
>> return GL_FALSE;
>> diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
>> index ca0b5dd..2a642fe 100644
>> --- a/src/mesa/main/bufferobj.c
>> +++ b/src/mesa/main/bufferobj.c
>> @@ -269,6 +269,9 @@ buffer_object_subdata_range_good(struct gl_context *
>> ctx, GLenum target,
>> return NULL;
>> }
>>
>> + if (bufObj->AccessFlags & GL_MAP_PERSISTENT_BIT)
>> + return bufObj;
>> +
>> if (mappedRange) {
>> if (bufferobj_range_mapped(bufObj, offset, size)) {
>> _mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller);
>> @@ -1452,7 +1455,7 @@ _mesa_ClearBufferData(GLenum target, GLenum
>> internalformat, GLenum format,
>> return;
>> }
>>
>> - if (_mesa_bufferobj_mapped(bufObj)) {
>> + if (_mesa_check_disallowed_mapping(bufObj)) {
>> _mesa_error(ctx, GL_INVALID_OPERATION,
>> "glClearBufferData(buffer currently mapped)");
>> return;
>> @@ -1861,13 +1864,13 @@ _mesa_CopyBufferSubData(GLenum readTarget, GLenum
>> writeTarget,
>> if (!dst)
>> return;
>>
>> - if (_mesa_bufferobj_mapped(src)) {
>> + if (_mesa_check_disallowed_mapping(src)) {
>> _mesa_error(ctx, GL_INVALID_OPERATION,
>> "glCopyBufferSubData(readBuffer is mapped)");
>> return;
>> }
>>
>> - if (_mesa_bufferobj_mapped(dst)) {
>> + if (_mesa_check_disallowed_mapping(dst)) {
>> _mesa_error(ctx, GL_INVALID_OPERATION,
>> "glCopyBufferSubData(writeBuffer is mapped)");
>> return;
>> @@ -2793,7 +2796,8 @@ _mesa_InvalidateBufferSubData(GLuint buffer, GLintptr
>> offset,
>> * mapped by MapBuffer, or if the invalidate range intersects the
>> range
>> * currently mapped by MapBufferRange."
>> */
>> - if (bufferobj_range_mapped(bufObj, offset, length)) {
>> + if (!(bufObj->AccessFlags & GL_MAP_PERSISTENT_BIT) &&
>> + bufferobj_range_mapped(bufObj, offset, length)) {
>> _mesa_error(ctx, GL_INVALID_OPERATION,
>> "glInvalidateBufferSubData(intersection with mapped "
>> "range)");
>
> The mesa_bufferobj_mapped() call in _mesa_InvalidateBufferData() should
> also be changed to _mesa_check_disallowed_mapping().
>
> I would also replace the ARB_invalidate_subdata quotations with quotations
> from the GL 4.4 specification.
>
>> diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
>> index 174fd60..43795a9 100644
>> --- a/src/mesa/main/bufferobj.h
>> +++ b/src/mesa/main/bufferobj.h
>> @@ -44,6 +44,14 @@ _mesa_bufferobj_mapped(const struct gl_buffer_object *obj)
>> return obj->Pointer != NULL;
>> }
>>
>> +/** Cannot we use this buffer while mapped? */
>
> "Can we not"
>
>> +static inline GLboolean
>> +_mesa_check_disallowed_mapping(const struct gl_buffer_object *obj)
>> +{
>> + return _mesa_bufferobj_mapped(obj) &&
>> + !(obj->AccessFlags & GL_MAP_PERSISTENT_BIT);
>> +}
>> +
>> /**
>> * Is the given buffer object a user-created buffer object?
>> * Mesa uses default buffer objects in several places. Default buffers
>> diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
>> index 096615c..63e5870 100644
>> --- a/src/mesa/main/drawpix.c
>> +++ b/src/mesa/main/drawpix.c
>> @@ -151,7 +151,7 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
>> "glDrawPixels(invalid PBO access)");
>> goto end;
>> }
>> - if (_mesa_bufferobj_mapped(ctx->Unpack.BufferObj)) {
>> + if (_mesa_check_disallowed_mapping(ctx->Unpack.BufferObj)) {
>> /* buffer is mapped - that's an error */
>> _mesa_error(ctx, GL_INVALID_OPERATION,
>> "glDrawPixels(PBO is mapped)");
>> @@ -335,7 +335,7 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
>> "glBitmap(invalid PBO access)");
>> return;
>> }
>> - if (_mesa_bufferobj_mapped(ctx->Unpack.BufferObj)) {
>> + if (_mesa_check_disallowed_mapping(ctx->Unpack.BufferObj)) {
>> /* buffer is mapped - that's an error */
>> _mesa_error(ctx, GL_INVALID_OPERATION,
>> "glBitmap(PBO is mapped)");
>> 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;
>> diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c
>> index e163468..9baea31 100644
>> --- a/src/mesa/main/readpix.c
>> +++ b/src/mesa/main/readpix.c
>> @@ -1033,7 +1033,7 @@ _mesa_ReadnPixelsARB( GLint x, GLint y, GLsizei width,
>> GLsizei height,
>> }
>>
>> if (_mesa_is_bufferobj(ctx->Pack.BufferObj) &&
>> - _mesa_bufferobj_mapped(ctx->Pack.BufferObj)) {
>> + _mesa_check_disallowed_mapping(ctx->Pack.BufferObj)) {
>> /* buffer is mapped - that's an error */
>> _mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(PBO is mapped)");
>> return;
>> diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
>> index 133fa53..b21aa2c 100644
>> --- a/src/mesa/main/texgetimage.c
>> +++ b/src/mesa/main/texgetimage.c
>> @@ -861,7 +861,7 @@ getteximage_error_check(struct gl_context *ctx, GLenum
>> target, GLint level,
>>
>> if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
>> /* PBO should not be mapped */
>> - if (_mesa_bufferobj_mapped(ctx->Pack.BufferObj)) {
>> + if (_mesa_check_disallowed_mapping(ctx->Pack.BufferObj)) {
>> _mesa_error(ctx, GL_INVALID_OPERATION,
>> "glGetTexImage(PBO is mapped)");
>> return GL_TRUE;
>> @@ -1004,7 +1004,7 @@ getcompressedteximage_error_check(struct gl_context
>> *ctx, GLenum target,
>> }
>>
>> /* make sure PBO is not mapped */
>> - if (_mesa_bufferobj_mapped(ctx->Pack.BufferObj)) {
>> + if (_mesa_check_disallowed_mapping(ctx->Pack.BufferObj)) {
>> _mesa_error(ctx, GL_INVALID_OPERATION,
>> "glGetCompressedTexImage(PBO is mapped)");
>> return GL_TRUE;
>> diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
>> index 16aee3b..67fe0d4 100644
>> --- a/src/mesa/vbo/vbo_exec_array.c
>> +++ b/src/mesa/vbo/vbo_exec_array.c
>> @@ -53,7 +53,7 @@ check_buffers_are_unmapped(const struct gl_client_array
>> **inputs)
>> for (i = 0; i < VERT_ATTRIB_MAX; i++) {
>> if (inputs[i]) {
>> struct gl_buffer_object *obj = inputs[i]->BufferObj;
>> - assert(!_mesa_bufferobj_mapped(obj));
>> + assert(!_mesa_check_disallowed_mapping(obj));
>> (void) obj;
>> }
>> }
>> @@ -73,7 +73,7 @@ vbo_check_buffers_are_unmapped(struct gl_context *ctx)
>> /* check the current vertex arrays */
>> check_buffers_are_unmapped(exec->array.inputs);
>> /* check the current glBegin/glVertex/glEnd-style VBO */
>> - assert(!_mesa_bufferobj_mapped(exec->vtx.bufferobj));
>> + assert(!_mesa_check_disallowed_mapping(exec->vtx.bufferobj));
>> }
>>
>>
>>
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
