diff options
| author | Timothy Arceri <[email protected]> | 2017-05-08 11:24:07 +1000 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-05-17 10:12:03 +1000 |
| commit | e75e8d6c94cf319aa597221966b31ccf89b629f2 (patch) | |
| tree | 3d2f81eff1f858a67db40c32d9932da68e1a255c | |
| parent | f6198e9146b5115676ae89d9515fc5d9e8693c05 (diff) | |
mesa: add KHR_no_error support for FramebufferTextureLayer
V3: use frame_buffer_texture_layer() helper
Reviewed-by: Nicolai Hähnle <[email protected]>
| -rw-r--r-- | src/mapi/glapi/gen/ARB_framebuffer_object.xml | 2 | ||||
| -rw-r--r-- | src/mesa/main/fbobject.c | 9 | ||||
| -rw-r--r-- | src/mesa/main/fbobject.h | 4 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/ARB_framebuffer_object.xml b/src/mapi/glapi/gen/ARB_framebuffer_object.xml index ce5e45d0cc8..76114eb32a2 100644 --- 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 bdce10d8e6a..7af0df36775 100644 --- 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 df1696d17ec..7c32b87d74f 100644 --- 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); |