From c244c25ce36f6920c25c8fd8f071038712004f14 Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Thu, 22 Jun 2017 15:51:46 +0200
Subject: [PATCH] mesa: add KHR_no_error support for glViewport()

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

diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 8784f0537f5..2cc66ac8b0f 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -2966,7 +2966,7 @@
         <glx rop="190"/>
     </function>
 
-    <function name="Viewport" es1="1.0" es2="2.0">
+    <function name="Viewport" es1="1.0" es2="2.0" no_error="true">
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
         <param name="width" type="GLsizei"/>
diff --git a/src/mesa/main/viewport.c b/src/mesa/main/viewport.c
index b18168a4d43..8c95bf472d8 100644
--- a/src/mesa/main/viewport.c
+++ b/src/mesa/main/viewport.c
@@ -118,6 +118,13 @@ viewport(struct gl_context *ctx, GLint x, GLint y, GLsizei width,
  * Flushes the vertices and calls _mesa_set_viewport() with the given
  * parameters.
  */
+void GLAPIENTRY
+_mesa_Viewport_no_error(GLint x, GLint y, GLsizei width, GLsizei height)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   viewport(ctx, x, y, width, height);
+}
+
 void GLAPIENTRY
 _mesa_Viewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
diff --git a/src/mesa/main/viewport.h b/src/mesa/main/viewport.h
index 570a23a23b2..b07410bf58a 100644
--- a/src/mesa/main/viewport.h
+++ b/src/mesa/main/viewport.h
@@ -31,6 +31,9 @@
 
 struct gl_context;
 
+void GLAPIENTRY
+_mesa_Viewport_no_error(GLint x, GLint y, GLsizei width, GLsizei height);
+
 extern void GLAPIENTRY
 _mesa_Viewport(GLint x, GLint y, GLsizei width, GLsizei height);
 
-- 
2.30.2