summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2017-06-20 18:41:19 +0200
committerSamuel Pitoiset <[email protected]>2017-06-21 08:47:26 +0200
commit26fbdb12f4eadcf7b736bef6e546e489baa7e4af (patch)
tree62dd0433025a2402c7d012663123ceff792906a0
parent540766257041b47b2eae28045b3c8043aa19cd8c (diff)
mesa: add KHR_no_error support for glStencilOp()
Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Timothy Arceri <[email protected]>
-rw-r--r--src/mapi/glapi/gen/gl_API.xml2
-rw-r--r--src/mesa/main/stencil.c8
-rw-r--r--src/mesa/main/stencil.h2
3 files changed, 11 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index dd64fe27b6a..8784f0537f5 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 7913bb176e7..4bd7b8803ef 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 5425065a7ca..ccb86469189 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);