From 3336d248e833280badcae52909b5b2e69f359d8b Mon Sep 17 00:00:00 2001
From: Timothy Arceri <tarceri@itsqueeze.com>
Date: Mon, 8 May 2017 12:01:33 +1000
Subject: [PATCH] mesa: add KHR_no_error support for NamedFramebufferTexture
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

V3: use frame_buffer_texture() helper

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---
 src/mapi/glapi/gen/ARB_direct_state_access.xml | 2 +-
 src/mesa/main/fbobject.c                       | 8 ++++++++
 src/mesa/main/fbobject.h                       | 3 +++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/mapi/glapi/gen/ARB_direct_state_access.xml b/src/mapi/glapi/gen/ARB_direct_state_access.xml
index 2f3d60fecf7..2f2ba20b7d4 100644
--- a/src/mapi/glapi/gen/ARB_direct_state_access.xml
+++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml
@@ -171,7 +171,7 @@
       <param name="param" type="GLint" />
    </function>
 
-   <function name="NamedFramebufferTexture">
+   <function name="NamedFramebufferTexture" no_error="true">
       <param name="framebuffer" type="GLuint" />
       <param name="attachment" type="GLenum" />
       <param name="texture" type="GLuint" />
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 82fec792bbd..74b38180900 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -3571,6 +3571,14 @@ _mesa_FramebufferTexture(GLenum target, GLenum attachment,
                         "glFramebufferTexture", false, false, true);
 }
 
+void GLAPIENTRY
+_mesa_NamedFramebufferTexture_no_error(GLuint framebuffer, GLenum attachment,
+                                       GLuint texture, GLint level)
+{
+   frame_buffer_texture(framebuffer, 0, attachment, texture, level, 0,
+                        "glNamedFramebufferTexture", true, true, true);
+}
+
 
 void GLAPIENTRY
 _mesa_NamedFramebufferTexture(GLuint framebuffer, GLenum attachment,
diff --git a/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h
index 1d064f8ee0a..1c9056dae7e 100644
--- a/src/mesa/main/fbobject.h
+++ b/src/mesa/main/fbobject.h
@@ -265,6 +265,9 @@ _mesa_FramebufferTexture(GLenum target, GLenum attachment,
                          GLuint texture, GLint level);
 
 extern void GLAPIENTRY
+_mesa_NamedFramebufferTexture_no_error(GLuint framebuffer, GLenum attachment,
+                                       GLuint texture, GLint level);
+extern void GLAPIENTRY
 _mesa_NamedFramebufferTexture(GLuint framebuffer, GLenum attachment,
                               GLuint texture, GLint level);
 
-- 
2.30.2