KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: add KHR_no_error support for FramebufferTexture*D functions 

Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Timothy Arceri 2017-05-08 11:10:58 +10:00
parent 20cabc2ac0
commit 276166c45b
3 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mapi/glapi/gen/ARB_framebuffer_object.xml
View File

@ -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"/>

30
src/mesa/main/fbobject.c
View File

@ -3368,6 +3368,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)
@ -3377,6 +3387,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)
@ -3386,6 +3406,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,

12
src/mesa/main/fbobject.h
View File

@ -215,15 +215,27 @@ _mesa_CheckFramebufferStatus(GLenum target);
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);