From 9a0b2033822cbc15181710ec80b2163447553038 Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Thu, 20 Jul 2017 11:07:57 +0200
Subject: [PATCH] mesa: add KHR_no_error support to glBeginConditionalRender()

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
---
 src/mapi/glapi/gen/GL3x.xml | 2 +-
 src/mesa/main/condrender.c  | 8 ++++++++
 src/mesa/main/condrender.h  | 3 +++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/mapi/glapi/gen/GL3x.xml b/src/mapi/glapi/gen/GL3x.xml
index e55b5bbe65e..63a57ebc1e2 100644
--- a/src/mapi/glapi/gen/GL3x.xml
+++ b/src/mapi/glapi/gen/GL3x.xml
@@ -246,7 +246,7 @@
 
   <!-- These functions alias ones from GL_NV_conditional_render -->
 
-  <function name="BeginConditionalRender">
+  <function name="BeginConditionalRender" no_error="true">
     <param name="query" type="GLuint"/>
     <param name="mode" type="GLenum"/>
   </function>
diff --git a/src/mesa/main/condrender.c b/src/mesa/main/condrender.c
index 95d6d6ad5f0..24a7f4b6945 100644
--- a/src/mesa/main/condrender.c
+++ b/src/mesa/main/condrender.c
@@ -104,6 +104,14 @@ begin_conditional_render(struct gl_context *ctx, GLuint queryId, GLenum mode,
 }
 
 
+void GLAPIENTRY
+_mesa_BeginConditionalRender_no_error(GLuint queryId, GLenum mode)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   begin_conditional_render(ctx, queryId, mode, true);
+}
+
+
 void GLAPIENTRY
 _mesa_BeginConditionalRender(GLuint queryId, GLenum mode)
 {
diff --git a/src/mesa/main/condrender.h b/src/mesa/main/condrender.h
index 90d7fb722c7..6b761d1a1b0 100644
--- a/src/mesa/main/condrender.h
+++ b/src/mesa/main/condrender.h
@@ -31,6 +31,9 @@
 #include "context.h"
 
 
+void GLAPIENTRY
+_mesa_BeginConditionalRender_no_error(GLuint queryId, GLenum mode);
+
 extern void GLAPIENTRY
 _mesa_BeginConditionalRender(GLuint queryId, GLenum mode);
 
-- 
2.30.2