diff options
author | Samuel Pitoiset <[email protected]> | 2017-06-26 14:49:51 +0200 |
---|---|---|
committer | Samuel Pitoiset <[email protected]> | 2017-06-28 10:25:13 +0200 |
commit | f543107256ab9d901cfea82fed9ab2e0c5fc40ec (patch) | |
tree | e6cd54627d847f8de03b33fcd39c6bd4841bac3d | |
parent | dd71fd1dd3518c435fc3d143d80b844d77035cbc (diff) |
mesa: add KHR_no_error support for glFenceSync()
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
-rw-r--r-- | src/mapi/glapi/gen/ARB_sync.xml | 2 | ||||
-rw-r--r-- | src/mesa/main/syncobj.c | 8 | ||||
-rw-r--r-- | src/mesa/main/syncobj.h | 3 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/ARB_sync.xml b/src/mapi/glapi/gen/ARB_sync.xml index 141d5aeef3c..f1463f11a86 100644 --- a/src/mapi/glapi/gen/ARB_sync.xml +++ b/src/mapi/glapi/gen/ARB_sync.xml @@ -39,7 +39,7 @@ --> - <function name="FenceSync" es2="3.0"> + <function name="FenceSync" es2="3.0" no_error="true"> <param name="condition" type="GLenum"/> <param name="flags" type="GLbitfield"/> <return type="GLsync"/> diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c index 4278827b11d..9c165314bf3 100644 --- a/src/mesa/main/syncobj.c +++ b/src/mesa/main/syncobj.c @@ -292,6 +292,14 @@ fence_sync(struct gl_context *ctx, GLenum condition, GLbitfield flags) GLsync GLAPIENTRY +_mesa_FenceSync_no_error(GLenum condition, GLbitfield flags) +{ + GET_CURRENT_CONTEXT(ctx); + return fence_sync(ctx, condition, flags); +} + + +GLsync GLAPIENTRY _mesa_FenceSync(GLenum condition, GLbitfield flags) { GET_CURRENT_CONTEXT(ctx); diff --git a/src/mesa/main/syncobj.h b/src/mesa/main/syncobj.h index 426959f6b2e..2b50d062b13 100644 --- a/src/mesa/main/syncobj.h +++ b/src/mesa/main/syncobj.h @@ -60,6 +60,9 @@ _mesa_IsSync(GLsync sync); extern void GLAPIENTRY _mesa_DeleteSync(GLsync sync); +GLsync GLAPIENTRY +_mesa_FenceSync_no_error(GLenum condition, GLbitfield flags); + extern GLsync GLAPIENTRY _mesa_FenceSync(GLenum condition, GLbitfield flags); |