diff options
| author | Timothy Arceri <[email protected]> | 2017-05-08 12:01:33 +1000 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-05-17 10:12:03 +1000 |
| commit | 3336d248e833280badcae52909b5b2e69f359d8b (patch) | |
| tree | bd14c757b3d3cf191abf87d3552a0d556435046b | |
| parent | 4e8aa4b9a205a21f1f87e29557e796d8664fa131 (diff) | |
mesa: add KHR_no_error support for NamedFramebufferTexture
V3: use frame_buffer_texture() 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 | 8 | ||||
| -rw-r--r-- | src/mesa/main/fbobject.h | 3 |
3 files changed, 12 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 2f3d60fecf7..2f2ba20b7d4 100644 --- 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 82fec792bbd..74b38180900 100644 --- 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 1d064f8ee0a..1c9056dae7e 100644 --- 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); |