mesa: add KHR_no_error support for glBlendFunc*iARB()

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

diff --git a/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml b/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml
index 8c33fbf89b821929c3d218540d240e4f9fb35bcf..4d44adf1de94ae3bb8f0522076b10f84f1b9ab92 100644 (file)
--- a/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml
+++ b/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml
@@ -19,13 +19,13 @@
         <param name="modeA" type="GLenum"/>
     </function>
 
-    <function name="BlendFunciARB">
+    <function name="BlendFunciARB" no_error="true">
         <param name="buf" type="GLuint"/>
         <param name="src" type="GLenum"/>
         <param name="dst" type="GLenum"/>
     </function>
 
-    <function name="BlendFuncSeparateiARB">
+    <function name="BlendFuncSeparateiARB" no_error="true">
         <param name="buf" type="GLuint"/>
         <param name="srcRGB" type="GLenum"/>
         <param name="dstRGB" type="GLenum"/>

diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c
index ed519bcc0e086d070752ba40bed09937ea65b43d..8811ef9a339768564e51520df65ce8e5564e7b61 100644 (file)
--- a/src/mesa/main/blend.c
+++ b/src/mesa/main/blend.c
@@ -282,6 +282,14 @@ _mesa_BlendFuncSeparate( GLenum sfactorRGB, GLenum dfactorRGB,
 }
 
 
+void GLAPIENTRY
+_mesa_BlendFunciARB_no_error(GLuint buf, GLenum sfactor, GLenum dfactor)
+{
+   _mesa_BlendFuncSeparateiARB_no_error(buf, sfactor, dfactor, sfactor,
+                                        dfactor);
+}
+
+
 /**
  * Set blend source/dest factors for one color buffer/target.
  */
@@ -334,6 +342,16 @@ blend_func_separatei(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB,
 }
 
 
+void GLAPIENTRY
+_mesa_BlendFuncSeparateiARB_no_error(GLuint buf, GLenum sfactorRGB,
+                                     GLenum dfactorRGB, GLenum sfactorA,
+                                     GLenum dfactorA)
+{
+   blend_func_separatei(buf, sfactorRGB, dfactorRGB, sfactorA, dfactorA,
+                        true);
+}
+
+
 /**
  * Set separate blend source/dest factors for one color buffer/target.
  */

diff --git a/src/mesa/main/blend.h b/src/mesa/main/blend.h
index 8ab9e02fc13d18d7e06f92aa9bf142a8a37ed2e2..199345df600eff609c97d552dfdcf11d1c4268fb 100644 (file)
--- a/src/mesa/main/blend.h
+++ b/src/mesa/main/blend.h
@@ -49,10 +49,16 @@ _mesa_BlendFuncSeparate( GLenum sfactorRGB, GLenum dfactorRGB,
                             GLenum sfactorA, GLenum dfactorA );
 
 
+extern void GLAPIENTRY
+_mesa_BlendFunciARB_no_error(GLuint buf, GLenum sfactor, GLenum dfactor);
 extern void GLAPIENTRY
 _mesa_BlendFunciARB(GLuint buf, GLenum sfactor, GLenum dfactor);
 
 
+extern void GLAPIENTRY
+_mesa_BlendFuncSeparateiARB_no_error(GLuint buf, GLenum sfactorRGB,
+                                     GLenum dfactorRGB, GLenum sfactorA,
+                                     GLenum dfactorA);
 extern void GLAPIENTRY
 _mesa_BlendFuncSeparateiARB(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB,
                          GLenum sfactorA, GLenum dfactorA);