mesa: add KHR_no_error support for FramebufferTextureLayer

V3: use frame_buffer_texture_layer() helper

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

diff --git a/src/mapi/glapi/gen/ARB_framebuffer_object.xml b/src/mapi/glapi/gen/ARB_framebuffer_object.xml
index ce5e45d0cc813c929b7263bc64e3e13e52aa4bbf..76114eb32a219ad6f600cc7f41c442624fb08d65 100644 (file)
--- a/src/mapi/glapi/gen/ARB_framebuffer_object.xml
+++ b/src/mapi/glapi/gen/ARB_framebuffer_object.xml
@@ -246,7 +246,7 @@
        <glx rop="4323"/>
     </function>
 
-    <function name="FramebufferTextureLayer" es2="3.0">
+    <function name="FramebufferTextureLayer" es2="3.0" no_error="true">
         <param name="target" type="GLenum"/>
         <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 bdce10d8e6a56f9ecff2d2d9a00fae1b4f1d71f9..7af0df36775b0aa30da3df1cbce92c5009bb38c9 100644 (file)
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -3497,6 +3497,15 @@ frame_buffer_texture_layer(GLuint framebuffer, GLenum target,
                              level, layer, GL_FALSE);
 }
 
+void GLAPIENTRY
+_mesa_FramebufferTextureLayer_no_error(GLenum target, GLenum attachment,
+                                       GLuint texture, GLint level,
+                                       GLint layer)
+{
+   frame_buffer_texture_layer(0, target, attachment, texture, level, layer,
+                              "glFramebufferTextureLayer", false, true);
+}
+
 
 void GLAPIENTRY
 _mesa_FramebufferTextureLayer(GLenum target, GLenum attachment,

diff --git a/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h
index df1696d17ecf2b502b448dd5f2206c732813c8dc..7c32b87d74f4533f49091c8f0e8ed249dcd626ac 100644 (file)
--- a/src/mesa/main/fbobject.h
+++ b/src/mesa/main/fbobject.h
@@ -241,6 +241,10 @@ _mesa_FramebufferTexture3D(GLenum target, GLenum attachment,
                               GLint level, GLint layer);
 
 extern void GLAPIENTRY
+_mesa_FramebufferTextureLayer_no_error(GLenum target, GLenum attachment,
+                                       GLuint texture, GLint level,
+                                       GLint layer);
+extern void GLAPIENTRY
 _mesa_FramebufferTextureLayer(GLenum target, GLenum attachment,
                                  GLuint texture, GLint level, GLint layer);