mesa: add KHR_no_error support for NamedFramebufferTexture

V3: use frame_buffer_texture() helper

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

diff --git a/src/mapi/glapi/gen/ARB_direct_state_access.xml b/src/mapi/glapi/gen/ARB_direct_state_access.xml
index 2f3d60fecf7bf3275986b1e3872e86700a7a50ef..2f2ba20b7d47779f463416a61b55aaf373d9c483 100644 (file)
--- 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 82fec792bbd719b7cb4e7358dc6d7ae66c1d38cc..74b38180900412d4ca044a8e0ab252cde9d403a5 100644 (file)
--- 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 1d064f8ee0a7dcc0c6997dc533533caceb9a0e42..1c9056dae7e2bcb2ed3939ba3f60028bc449dc30 100644 (file)
--- 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);