diff options
| author | Timothy Arceri <[email protected]> | 2017-05-08 11:52:45 +1000 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-05-17 10:12:03 +1000 |
| commit | 4e8aa4b9a205a21f1f87e29557e796d8664fa131 (patch) | |
| tree | afa9a6b6d16958f2148801547b065fc152bbb11f /src | |
| parent | f6229284e28e394838f656d0048d074281655f71 (diff) | |
mesa: add KHR_no_error support for FramebufferTexture
V3: use the frame_buffer_texture() helper
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mapi/glapi/gen/GL3x.xml | 2 | ||||
| -rw-r--r-- | src/mesa/main/fbobject.c | 9 | ||||
| -rw-r--r-- | src/mesa/main/fbobject.h | 3 |
3 files changed, 13 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/GL3x.xml b/src/mapi/glapi/gen/GL3x.xml index d2c768dd6fe..10c157e5f85 100644 --- a/src/mapi/glapi/gen/GL3x.xml +++ b/src/mapi/glapi/gen/GL3x.xml @@ -607,7 +607,7 @@ <param name="params" type="GLint64 *"/> </function> - <function name="FramebufferTexture" es2="3.2"> + <function name="FramebufferTexture" es2="3.2" 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 2c6c599731b..82fec792bbd 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -3555,6 +3555,15 @@ _mesa_NamedFramebufferTextureLayer(GLuint framebuffer, GLenum attachment, void GLAPIENTRY +_mesa_FramebufferTexture_no_error(GLenum target, GLenum attachment, + GLuint texture, GLint level) +{ + frame_buffer_texture(0, target, attachment, texture, level, 0, + "glFramebufferTexture", false, true, true); +} + + +void GLAPIENTRY _mesa_FramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level) { diff --git a/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h index a2f9264f8ea..1d064f8ee0a 100644 --- a/src/mesa/main/fbobject.h +++ b/src/mesa/main/fbobject.h @@ -258,6 +258,9 @@ _mesa_NamedFramebufferTextureLayer(GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer); extern void GLAPIENTRY +_mesa_FramebufferTexture_no_error(GLenum target, GLenum attachment, + GLuint texture, GLint level); +extern void GLAPIENTRY _mesa_FramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level); |