From 5c8252ba6f7e43c563b7011facbbe4ef013e76c6 Mon Sep 17 00:00:00 2001
From: Timothy Arceri <tarceri@itsqueeze.com>
Date: Mon, 15 May 2017 10:41:23 +1000
Subject: [PATCH] mesa: add KHR_no_error support for glBlendFunc*iARB()
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---
 src/mapi/glapi/gen/ARB_draw_buffers_blend.xml |  4 ++--
 src/mesa/main/blend.c                         | 18 ++++++++++++++++++
 src/mesa/main/blend.h                         |  6 ++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml b/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml
index 8c33fbf89b8..4d44adf1de9 100644
--- 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 ed519bcc0e0..8811ef9a339 100644
--- 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 8ab9e02fc13..199345df600 100644
--- 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);
-- 
2.30.2