diff --git a/src/mapi/glapi/gen/GL3x.xml b/src/mapi/glapi/gen/GL3x.xml
index 63a57ebc1e2..d6040faa3e2 100644
--- a/src/mapi/glapi/gen/GL3x.xml
+++ b/src/mapi/glapi/gen/GL3x.xml
@@ -251,7 +251,7 @@
     <param name="mode" type="GLenum"/>
   </function>
 
-  <function name="EndConditionalRender">
+  <function name="EndConditionalRender" no_error="true">
   </function>
 
   <!-- These functions alias ones from GL_EXT_gpu_shader4 -->
diff --git a/src/mesa/main/condrender.c b/src/mesa/main/condrender.c
index 051cd8f9629..320003aa73f 100644
--- a/src/mesa/main/condrender.c
+++ b/src/mesa/main/condrender.c
@@ -146,6 +146,14 @@ end_conditional_render(struct gl_context *ctx)
 }
 
 
+void APIENTRY
+_mesa_EndConditionalRender_no_error(void)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   end_conditional_render(ctx);
+}
+
+
 void APIENTRY
 _mesa_EndConditionalRender(void)
 {
diff --git a/src/mesa/main/condrender.h b/src/mesa/main/condrender.h
index 6b761d1a1b0..e7672512f7e 100644
--- a/src/mesa/main/condrender.h
+++ b/src/mesa/main/condrender.h
@@ -37,6 +37,9 @@ _mesa_BeginConditionalRender_no_error(GLuint queryId, GLenum mode);
 extern void GLAPIENTRY
 _mesa_BeginConditionalRender(GLuint queryId, GLenum mode);
 
+void APIENTRY
+_mesa_EndConditionalRender_no_error(void);
+
 extern void APIENTRY
 _mesa_EndConditionalRender(void);