mesa: simplify error check in _mesa_MapBufferRange()

This commit is contained in:
Brian Paul
2011-05-18 08:14:32 -06:00
parent 496bf04905
commit 707eadcb7f

View File

@@ -1416,15 +1416,14 @@ _mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
return NULL; return NULL;
} }
if (access & GL_MAP_READ_BIT) { if ((access & GL_MAP_READ_BIT) &&
if ((access & GL_MAP_INVALIDATE_RANGE_BIT) || (access & (GL_MAP_INVALIDATE_RANGE_BIT |
(access & GL_MAP_INVALIDATE_BUFFER_BIT) || GL_MAP_INVALIDATE_BUFFER_BIT |
(access & GL_MAP_UNSYNCHRONIZED_BIT)) { GL_MAP_UNSYNCHRONIZED_BIT))) {
_mesa_error(ctx, GL_INVALID_OPERATION, _mesa_error(ctx, GL_INVALID_OPERATION,
"glMapBufferRange(invalid access flags)"); "glMapBufferRange(invalid access flags)");
return NULL; return NULL;
} }
}
if ((access & GL_MAP_FLUSH_EXPLICIT_BIT) && if ((access & GL_MAP_FLUSH_EXPLICIT_BIT) &&
((access & GL_MAP_WRITE_BIT) == 0)) { ((access & GL_MAP_WRITE_BIT) == 0)) {