diff options
| author | Timothy Arceri <[email protected]> | 2017-05-08 11:37:33 +1000 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-05-17 10:12:03 +1000 |
| commit | 4e125c4da60ba5cbc1f197bb68b089b286684f64 (patch) | |
| tree | f399dd625aef3ce6701d353ecf74a60e5ae54f1b | |
| parent | e75e8d6c94cf319aa597221966b31ccf89b629f2 (diff) | |
mesa: add KHR_no_error support for NamedFramebufferTextureLayer
v3: use frame_buffer_texture_layer() helper
Reviewed-by: Nicolai Hähnle <[email protected]>
| -rw-r--r-- | src/mapi/glapi/gen/ARB_direct_state_access.xml | 2 | ||||
| -rw-r--r-- | src/mesa/main/fbobject.c | 12 | ||||
| -rw-r--r-- | src/mesa/main/fbobject.h | 5 |
3 files changed, 18 insertions, 1 deletions
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 @@ <param name="level" type="GLint" /> </function> - <function name="NamedFramebufferTextureLayer"> + <function name="NamedFramebufferTextureLayer" 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 7af0df36775..8e25dfacbef 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -3517,6 +3517,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); |