Mesa (master): mesa: add KHR_no_error support for glStencilOp()
Samuel Pitoiset
hakzsam at kemper.freedesktop.org
Wed Jun 21 06:50:49 UTC 2017
Module: Mesa
Branch: master
Commit: 26fbdb12f4eadcf7b736bef6e546e489baa7e4af
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=26fbdb12f4eadcf7b736bef6e546e489baa7e4af
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date: Tue Jun 20 18:41:19 2017 +0200
mesa: add KHR_no_error support for glStencilOp()
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
---
src/mapi/glapi/gen/gl_API.xml | 2 +-
src/mesa/main/stencil.c | 8 ++++++++
src/mesa/main/stencil.h | 2 ++
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index dd64fe27b6..8784f0537f 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -2563,7 +2563,7 @@
<glx rop="162"/>
</function>
- <function name="StencilOp" es1="1.0" es2="2.0">
+ <function name="StencilOp" es1="1.0" es2="2.0" no_error="true">
<param name="fail" type="GLenum"/>
<param name="zfail" type="GLenum"/>
<param name="zpass" type="GLenum"/>
diff --git a/src/mesa/main/stencil.c b/src/mesa/main/stencil.c
index 7913bb176e..4bd7b8803e 100644
--- a/src/mesa/main/stencil.c
+++ b/src/mesa/main/stencil.c
@@ -367,6 +367,14 @@ stencil_op(struct gl_context *ctx, GLenum fail, GLenum zfail, GLenum zpass)
void GLAPIENTRY
+_mesa_StencilOp_no_error(GLenum fail, GLenum zfail, GLenum zpass)
+{
+ GET_CURRENT_CONTEXT(ctx);
+ stencil_op(ctx, fail, zfail, zpass);
+}
+
+
+void GLAPIENTRY
_mesa_StencilOp(GLenum fail, GLenum zfail, GLenum zpass)
{
GET_CURRENT_CONTEXT(ctx);
diff --git a/src/mesa/main/stencil.h b/src/mesa/main/stencil.h
index 5425065a7c..ccb8646918 100644
--- a/src/mesa/main/stencil.h
+++ b/src/mesa/main/stencil.h
@@ -51,6 +51,8 @@ _mesa_StencilFunc(GLenum func, GLint ref, GLuint mask);
extern void GLAPIENTRY
_mesa_StencilMask( GLuint mask );
+void GLAPIENTRY
+_mesa_StencilOp_no_error(GLenum fail, GLenum zfail, GLenum zpass);
extern void GLAPIENTRY
_mesa_StencilOp(GLenum fail, GLenum zfail, GLenum zpass);
More information about the mesa-commit
mailing list