mesa: add KHR_no_error support for glLogicOp()

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

diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index a63fd3c918f9020b954065d142bf82815199b695..b49ea916432d449dc55de0709b8b83df0a38b48d 100644 (file)
--- 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 541c24852d594192aef5684a2352e371d2d537ee..3fa9678730d3ef6fd0fde5992e70f10d4012d812 100644 (file)
--- a/src/mesa/main/blend.c
+++ b/src/mesa/main/blend.c
@@ -815,6 +815,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 )
 {

diff --git a/src/mesa/main/blend.h b/src/mesa/main/blend.h
index 675e50d3886062a8e4d56e74adcf88c7feed256c..b0a8cbd200b4ae1d24ba7b0eb7bb9b9613376dd2 100644 (file)
--- a/src/mesa/main/blend.h
+++ b/src/mesa/main/blend.h
@@ -97,6 +97,10 @@ extern void GLAPIENTRY
 _mesa_LogicOp( GLenum opcode );
 
 
+extern void GLAPIENTRY
+_mesa_LogicOp_no_error(GLenum opcode);
+
+
 extern void GLAPIENTRY
 _mesa_IndexMask( GLuint mask );