summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTimothy Arceri <tarceri@itsqueeze.com>2017-05-04 13:31:27 +1000
committerTimothy Arceri <tarceri@itsqueeze.com>2017-05-07 15:29:33 +1000
commitbbae62c714b8e4b74ab8e4105ca5a6bff40ba5ce (patch)
tree489f2dc5dc59960d2a9f91dd5cc92dd74dc6387e /src
parent0b2e4da80a00a2d40c82f39b5d369664b63ef8b4 (diff)
mesa: add KHR_no_error support for unmap buffer functions
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src')
-rw-r--r--src/mapi/glapi/gen/ARB_direct_state_access.xml2
-rw-r--r--src/mapi/glapi/gen/gl_API.xml2
-rw-r--r--src/mesa/main/bufferobj.c19
-rw-r--r--src/mesa/main/bufferobj.h4
4 files changed, 25 insertions, 2 deletions
diff --git a/src/mapi/glapi/gen/ARB_direct_state_access.xml b/src/mapi/glapi/gen/ARB_direct_state_access.xml
index b147e7252e0..fe5a7e92143 100644
--- a/src/mapi/glapi/gen/ARB_direct_state_access.xml
+++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml
@@ -115,7 +115,7 @@
<param name="access" type="GLbitfield" />
</function>
- <function name="UnmapNamedBuffer">
+ <function name="UnmapNamedBuffer" no_error="true">
<return type="GLboolean" />
<param name="buffer" type="GLuint" />
</function>
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 29e4ba43de6..a304ac0e4d9 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -5104,7 +5104,7 @@
<glx ignore="true"/>
</function>
- <function name="UnmapBuffer" es2="3.0">
+ <function name="UnmapBuffer" es2="3.0" no_error="true">
<param name="target" type="GLenum"/>
<return type="GLboolean"/>
<glx ignore="true"/>
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 0fdb623b4b1..6fa32e90fda 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -2067,6 +2067,16 @@ validate_and_unmap_buffer(struct gl_context *ctx,
}
GLboolean GLAPIENTRY
+_mesa_UnmapBuffer_no_error(GLenum target)
+{
+ GET_CURRENT_CONTEXT(ctx);
+ struct gl_buffer_object **bufObjPtr = get_buffer_target(ctx, target);
+ struct gl_buffer_object *bufObj = *bufObjPtr;
+
+ return unmap_buffer(ctx, bufObj);
+}
+
+GLboolean GLAPIENTRY
_mesa_UnmapBuffer(GLenum target)
{
GET_CURRENT_CONTEXT(ctx);
@@ -2080,6 +2090,15 @@ _mesa_UnmapBuffer(GLenum target)
}
GLboolean GLAPIENTRY
+_mesa_UnmapNamedBuffer_no_error(GLuint buffer)
+{
+ GET_CURRENT_CONTEXT(ctx);
+ struct gl_buffer_object *bufObj = _mesa_lookup_bufferobj(ctx, buffer);
+
+ return unmap_buffer(ctx, bufObj);
+}
+
+GLboolean GLAPIENTRY
_mesa_UnmapNamedBuffer(GLuint buffer)
{
GET_CURRENT_CONTEXT(ctx);
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index 30e3105ff66..d538d0f2ca5 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -253,9 +253,13 @@ _mesa_ClearNamedBufferSubData(GLuint buffer, GLenum internalformat,
const GLvoid *data);
GLboolean GLAPIENTRY
+_mesa_UnmapBuffer_no_error(GLenum target);
+GLboolean GLAPIENTRY
_mesa_UnmapBuffer(GLenum target);
GLboolean GLAPIENTRY
+_mesa_UnmapNamedBuffer_no_error(GLuint buffer);
+GLboolean GLAPIENTRY
_mesa_UnmapNamedBuffer(GLuint buffer);
void GLAPIENTRY