Mesa (master): mesa: add KHR_no_error support for glStencilOpSeparate()

Samuel Pitoiset hakzsam at kemper.freedesktop.org
Wed Jun 21 06:50:49 UTC 2017


Module: Mesa
Branch: master
Commit: b9e2d5c18d3edc7cdd2e8df3d6d0aae7daeff57e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b9e2d5c18d3edc7cdd2e8df3d6d0aae7daeff57e

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Tue Jun 20 18:24:47 2017 +0200

mesa: add KHR_no_error support for glStencilOpSeparate()

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       | 9 +++++++++
 src/mesa/main/stencil.h       | 3 +++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index a0b93cb149..513b57aab3 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -5279,7 +5279,7 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="StencilOpSeparate" es2="2.0">
+    <function name="StencilOpSeparate" es2="2.0" no_error="true">
         <param name="face" type="GLenum"/>
         <param name="sfail" type="GLenum"/>
         <param name="zfail" type="GLenum"/>
diff --git a/src/mesa/main/stencil.c b/src/mesa/main/stencil.c
index fa68fa1bd0..d7e9419401 100644
--- a/src/mesa/main/stencil.c
+++ b/src/mesa/main/stencil.c
@@ -430,6 +430,15 @@ stencil_op_separate(struct gl_context *ctx, GLenum face, GLenum sfail,
 
 
 void GLAPIENTRY
+_mesa_StencilOpSeparate_no_error(GLenum face, GLenum sfail, GLenum zfail,
+                                 GLenum zpass)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   stencil_op_separate(ctx, face, sfail, zfail, zpass);
+}
+
+
+void GLAPIENTRY
 _mesa_StencilOpSeparate(GLenum face, GLenum sfail, GLenum zfail, GLenum zpass)
 {
    GET_CURRENT_CONTEXT(ctx);
diff --git a/src/mesa/main/stencil.h b/src/mesa/main/stencil.h
index af7067381c..87708e009c 100644
--- a/src/mesa/main/stencil.h
+++ b/src/mesa/main/stencil.h
@@ -56,6 +56,9 @@ _mesa_StencilOp( GLenum fail, GLenum zfail, GLenum zpass );
 extern void GLAPIENTRY
 _mesa_ActiveStencilFaceEXT(GLenum face);
 
+void GLAPIENTRY
+_mesa_StencilOpSeparate_no_error(GLenum face, GLenum fail, GLenum zfail,
+                                 GLenum zpass);
 
 extern void GLAPIENTRY
 _mesa_StencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass);




More information about the mesa-commit mailing list