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

Timothy Arceri tarceri at kemper.freedesktop.org
Wed Jun 28 22:54:33 UTC 2017


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

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Wed Jun 28 13:47:42 2017 +1000

mesa: add KHR_no_error support for glLogicOp()

Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>

---

 src/mapi/glapi/gen/gl_API.xml | 2 +-
 src/mesa/main/blend.c         | 8 ++++++++
 src/mesa/main/blend.h         | 4 ++++
 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 a63fd3c918..b49ea91643 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -2551,7 +2551,7 @@
         <glx rop="160"/>
     </function>
 
-    <function name="LogicOp" es1="1.0">
+    <function name="LogicOp" es1="1.0" no_error="true">
         <param name="opcode" type="GLenum"/>
         <glx rop="161"/>
     </function>
diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c
index 541c24852d..3fa9678730 100644
--- a/src/mesa/main/blend.c
+++ b/src/mesa/main/blend.c
@@ -816,6 +816,14 @@ _mesa_LogicOp( GLenum opcode )
 
 
 void GLAPIENTRY
+_mesa_LogicOp_no_error(GLenum opcode)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   logic_op(ctx, opcode);
+}
+
+
+void GLAPIENTRY
 _mesa_IndexMask( GLuint mask )
 {
    GET_CURRENT_CONTEXT(ctx);
diff --git a/src/mesa/main/blend.h b/src/mesa/main/blend.h
index 675e50d388..b0a8cbd200 100644
--- a/src/mesa/main/blend.h
+++ b/src/mesa/main/blend.h
@@ -98,6 +98,10 @@ _mesa_LogicOp( GLenum opcode );
 
 
 extern void GLAPIENTRY
+_mesa_LogicOp_no_error(GLenum opcode);
+
+
+extern void GLAPIENTRY
 _mesa_IndexMask( GLuint mask );
 
 extern void GLAPIENTRY




More information about the mesa-commit mailing list