diff options
| author | Timothy Arceri <[email protected]> | 2017-05-04 13:49:02 +1000 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-05-07 15:29:33 +1000 |
| commit | 426e4765d26d37ecda920cb8cccc0cba17def6fc (patch) | |
| tree | ac42c3e8c47893d6d4419deb75869d51a2d99a95 | |
| parent | 30d8dea6020ea49890c27c3cb26aa300c80161c9 (diff) | |
mesa: add KHR_no_error support for flush mapped buffer functions
Reviewed-by: Eric Anholt <[email protected]>
| -rw-r--r-- | src/mapi/glapi/gen/ARB_direct_state_access.xml | 2 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/ARB_map_buffer_range.xml | 2 | ||||
| -rw-r--r-- | src/mesa/main/bufferobj.c | 25 | ||||
| -rw-r--r-- | src/mesa/main/bufferobj.h | 7 |
4 files changed, 33 insertions, 3 deletions
diff --git a/src/mapi/glapi/gen/ARB_direct_state_access.xml b/src/mapi/glapi/gen/ARB_direct_state_access.xml index fe5a7e92143..03f6c8b6beb 100644 --- a/src/mapi/glapi/gen/ARB_direct_state_access.xml +++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml @@ -120,7 +120,7 @@ <param name="buffer" type="GLuint" /> </function> - <function name="FlushMappedNamedBufferRange"> + <function name="FlushMappedNamedBufferRange" no_error="true"> <param name="buffer" type="GLuint" /> <param name="offset" type="GLintptr" /> <param name="length" type="GLsizeiptr" /> diff --git a/src/mapi/glapi/gen/ARB_map_buffer_range.xml b/src/mapi/glapi/gen/ARB_map_buffer_range.xml index b79b70a3081..35a20bea6b8 100644 --- a/src/mapi/glapi/gen/ARB_map_buffer_range.xml +++ b/src/mapi/glapi/gen/ARB_map_buffer_range.xml @@ -23,7 +23,7 @@ <return type="GLvoid *"/> </function> - <function name="FlushMappedBufferRange" es2="3.0"> + <function name="FlushMappedBufferRange" es2="3.0" no_error="true"> <param name="target" type="GLenum"/> <param name="offset" type="GLintptr"/> <param name="length" type="GLsizeiptr"/> diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c index 75526b5e339..9e96f31017f 100644 --- a/src/mesa/main/bufferobj.c +++ b/src/mesa/main/bufferobj.c @@ -2831,6 +2831,19 @@ flush_mapped_buffer_range(struct gl_context *ctx, } void GLAPIENTRY +_mesa_FlushMappedBufferRange_no_error(GLenum target, GLintptr offset, + GLsizeiptr length) +{ + GET_CURRENT_CONTEXT(ctx); + struct gl_buffer_object **bufObjPtr = get_buffer_target(ctx, target); + struct gl_buffer_object *bufObj = *bufObjPtr; + + if (ctx->Driver.FlushMappedBufferRange) + ctx->Driver.FlushMappedBufferRange(ctx, offset, length, bufObj, + MAP_USER); +} + +void GLAPIENTRY _mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length) { @@ -2847,6 +2860,18 @@ _mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, } void GLAPIENTRY +_mesa_FlushMappedNamedBufferRange_no_error(GLuint buffer, GLintptr offset, + GLsizeiptr length) +{ + GET_CURRENT_CONTEXT(ctx); + struct gl_buffer_object *bufObj = _mesa_lookup_bufferobj(ctx, buffer); + + if (ctx->Driver.FlushMappedBufferRange) + ctx->Driver.FlushMappedBufferRange(ctx, offset, length, bufObj, + MAP_USER); +} + +void GLAPIENTRY _mesa_FlushMappedNamedBufferRange(GLuint buffer, GLintptr offset, GLsizeiptr length) { diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h index 44fcaaad860..c7c89a9375f 100644 --- a/src/mesa/main/bufferobj.h +++ b/src/mesa/main/bufferobj.h @@ -310,12 +310,17 @@ _mesa_MapNamedBuffer_no_error(GLuint buffer, GLenum access); void * GLAPIENTRY _mesa_MapNamedBuffer(GLuint buffer, GLenum access); - +void GLAPIENTRY +_mesa_FlushMappedBufferRange_no_error(GLenum target, GLintptr offset, + GLsizeiptr length); void GLAPIENTRY _mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length); void GLAPIENTRY +_mesa_FlushMappedNamedBufferRange_no_error(GLuint buffer, GLintptr offset, + GLsizeiptr length); +void GLAPIENTRY _mesa_FlushMappedNamedBufferRange(GLuint buffer, GLintptr offset, GLsizeiptr length); |