From 4e125c4da60ba5cbc1f197bb68b089b286684f64 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Mon, 8 May 2017 11:37:33 +1000 Subject: [PATCH] mesa: add KHR_no_error support for NamedFramebufferTextureLayer MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit v3: use frame_buffer_texture_layer() helper Reviewed-by: Nicolai Hähnle --- src/mapi/glapi/gen/ARB_direct_state_access.xml | 2 +- src/mesa/main/fbobject.c | 12 ++++++++++++ src/mesa/main/fbobject.h | 5 +++++ 3 files changed, 18 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 3cb486edab0..2f3d60fecf7 100644 --- a/src/mapi/glapi/gen/ARB_direct_state_access.xml +++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml @@ -178,7 +178,7 @@ - + diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index 7af0df36775..8e25dfacbef 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -3516,6 +3516,18 @@ _mesa_FramebufferTextureLayer(GLenum target, GLenum attachment, } +void GLAPIENTRY +_mesa_NamedFramebufferTextureLayer_no_error(GLuint framebuffer, + GLenum attachment, + GLuint texture, GLint level, + GLint layer) +{ + frame_buffer_texture_layer(framebuffer, 0, attachment, texture, level, + layer, "glNamedFramebufferTextureLayer", true, + true); +} + + void GLAPIENTRY _mesa_NamedFramebufferTextureLayer(GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer) diff --git a/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h index 7c32b87d74f..a2f9264f8ea 100644 --- a/src/mesa/main/fbobject.h +++ b/src/mesa/main/fbobject.h @@ -249,6 +249,11 @@ _mesa_FramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); extern void GLAPIENTRY +_mesa_NamedFramebufferTextureLayer_no_error(GLuint framebuffer, + GLenum attachment, + GLuint texture, GLint level, + GLint layer); +extern void GLAPIENTRY _mesa_NamedFramebufferTextureLayer(GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer); -- 2.30.2