diff options
| author | Timothy Arceri <[email protected]> | 2017-05-08 11:10:58 +1000 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-05-11 13:53:39 +1000 |
| commit | 276166c45b5733137f2e562bd0aca84c8652124b (patch) | |
| tree | 522152cfd75c7eb8573f094e7e900d3e310a72bc | |
| parent | 20cabc2ac02a38cc08b313d74d6d6cee9c806555 (diff) | |
mesa: add KHR_no_error support for FramebufferTexture*D functions
Reviewed-by: Eric Anholt <[email protected]>
| -rw-r--r-- | src/mapi/glapi/gen/ARB_framebuffer_object.xml | 6 | ||||
| -rw-r--r-- | src/mesa/main/fbobject.c | 30 | ||||
| -rw-r--r-- | src/mesa/main/fbobject.h | 12 |
3 files changed, 45 insertions, 3 deletions
diff --git a/src/mapi/glapi/gen/ARB_framebuffer_object.xml b/src/mapi/glapi/gen/ARB_framebuffer_object.xml index 1573e7e969c..ce5e45d0cc8 100644 --- a/src/mapi/glapi/gen/ARB_framebuffer_object.xml +++ b/src/mapi/glapi/gen/ARB_framebuffer_object.xml @@ -218,7 +218,7 @@ <glx vendorpriv="1427"/> </function> - <function name="FramebufferTexture1D"> + <function name="FramebufferTexture1D" no_error="true"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="textarget" type="GLenum"/> @@ -227,7 +227,7 @@ <glx rop="4321"/> </function> - <function name="FramebufferTexture2D" es2="2.0"> + <function name="FramebufferTexture2D" es2="2.0" no_error="true"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="textarget" type="GLenum"/> @@ -236,7 +236,7 @@ <glx rop="4322"/> </function> - <function name="FramebufferTexture3D"> + <function name="FramebufferTexture3D" no_error="true"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="textarget" type="GLenum"/> diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index 636cdd84707..afecdad720c 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -3369,6 +3369,16 @@ framebuffer_texture_with_dims(int dims, GLenum target, void GLAPIENTRY +_mesa_FramebufferTexture1D_no_error(GLenum target, GLenum attachment, + GLenum textarget, GLuint texture, + GLint level) +{ + framebuffer_texture_with_dims_no_error(target, attachment, textarget, + texture, level, 0); +} + + +void GLAPIENTRY _mesa_FramebufferTexture1D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level) { @@ -3378,6 +3388,16 @@ _mesa_FramebufferTexture1D(GLenum target, GLenum attachment, void GLAPIENTRY +_mesa_FramebufferTexture2D_no_error(GLenum target, GLenum attachment, + GLenum textarget, GLuint texture, + GLint level) +{ + framebuffer_texture_with_dims_no_error(target, attachment, textarget, + texture, level, 0); +} + + +void GLAPIENTRY _mesa_FramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level) { @@ -3387,6 +3407,16 @@ _mesa_FramebufferTexture2D(GLenum target, GLenum attachment, void GLAPIENTRY +_mesa_FramebufferTexture3D_no_error(GLenum target, GLenum attachment, + GLenum textarget, GLuint texture, + GLint level, GLint layer) +{ + framebuffer_texture_with_dims_no_error(target, attachment, textarget, + texture, level, layer); +} + + +void GLAPIENTRY _mesa_FramebufferTexture3D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint layer) diff --git a/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h index d0f905e46b0..df1696d17ec 100644 --- a/src/mesa/main/fbobject.h +++ b/src/mesa/main/fbobject.h @@ -216,14 +216,26 @@ extern GLenum GLAPIENTRY _mesa_CheckNamedFramebufferStatus(GLuint framebuffer, GLenum target); extern void GLAPIENTRY +_mesa_FramebufferTexture1D_no_error(GLenum target, GLenum attachment, + GLenum textarget, GLuint texture, + GLint level); +extern void GLAPIENTRY _mesa_FramebufferTexture1D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); extern void GLAPIENTRY +_mesa_FramebufferTexture2D_no_error(GLenum target, GLenum attachment, + GLenum textarget, GLuint texture, + GLint level); +extern void GLAPIENTRY _mesa_FramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); extern void GLAPIENTRY +_mesa_FramebufferTexture3D_no_error(GLenum target, GLenum attachment, + GLenum textarget, GLuint texture, + GLint level, GLint layer); +extern void GLAPIENTRY _mesa_FramebufferTexture3D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint layer); |