fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-03 01:18:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: add KHR_no_error support to glTextureStorage*D()

Browse source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Samuel Pitoiset 2017-07-18 14:42:59 +02:00
parent bc38214d76
commit 3e637918ec
3 changed files with 55 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mapi/glapi/gen/ARB_direct_state_access.xml
View file

@ -331,14 +331,14 @@
<param name="size" type="GLsizeiptr" />
</function>
<function name="TextureStorage1D">
<function name="TextureStorage1D" no_error="true">
<param name="texture" type="GLuint" />
<param name="levels" type="GLsizei" />
<param name="internalformat" type="GLenum" />
<param name="width" type="GLsizei" />
</function>
<function name="TextureStorage2D">
<function name="TextureStorage2D" no_error="true">
<param name="texture" type="GLuint" />
<param name="levels" type="GLsizei" />
<param name="internalformat" type="GLenum" />
@ -346,7 +346,7 @@
<param name="height" type="GLsizei" />
</function>
<function name="TextureStorage3D">
<function name="TextureStorage3D" no_error="true">
<param name="texture" type="GLuint" />
<param name="levels" type="GLsizei" />
<param name="internalformat" type="GLenum" />

40
src/mesa/main/texstorage.c
View file

@ -600,6 +600,19 @@ texturestorage_error(GLuint dims, GLuint texture, GLsizei levels,
}
static void
texturestorage_no_error(GLuint dims, GLuint texture, GLsizei levels,
GLenum internalformat, GLsizei width, GLsizei height,
GLsizei depth)
{
GET_CURRENT_CONTEXT(ctx);
struct gl_texture_object *texObj = _mesa_lookup_texture(ctx, texture);
texture_storage_no_error(ctx, dims, texObj, texObj->Target,
levels, internalformat, width, height, depth, true);
}
void GLAPIENTRY
_mesa_TexStorage1D_no_error(GLenum target, GLsizei levels,
GLenum internalformat, GLsizei width)
@ -653,6 +666,14 @@ _mesa_TexStorage3D(GLenum target, GLsizei levels, GLenum internalformat,
}
void GLAPIENTRY
_mesa_TextureStorage1D_no_error(GLuint texture, GLsizei levels,
GLenum internalformat, GLsizei width)
{
texturestorage_no_error(1, texture, levels, internalformat, width, 1, 1);
}
void GLAPIENTRY
_mesa_TextureStorage1D(GLuint texture, GLsizei levels, GLenum internalformat,
GLsizei width)
@ -662,6 +683,15 @@ _mesa_TextureStorage1D(GLuint texture, GLsizei levels, GLenum internalformat,
}
void GLAPIENTRY
_mesa_TextureStorage2D_no_error(GLuint texture, GLsizei levels,
GLenum internalformat,
GLsizei width, GLsizei height)
{
texturestorage_no_error(2, texture, levels, internalformat, width, height, 1);
}
void GLAPIENTRY
_mesa_TextureStorage2D(GLuint texture, GLsizei levels,
GLenum internalformat,
@ -672,6 +702,16 @@ _mesa_TextureStorage2D(GLuint texture, GLsizei levels,
}
void GLAPIENTRY
_mesa_TextureStorage3D_no_error(GLuint texture, GLsizei levels,
GLenum internalformat, GLsizei width,
GLsizei height, GLsizei depth)
{
texturestorage_no_error(3, texture, levels, internalformat, width, height,
depth);
}
void GLAPIENTRY
_mesa_TextureStorage3D(GLuint texture, GLsizei levels, GLenum internalformat,
GLsizei width, GLsizei height, GLsizei depth)

12
src/mesa/main/texstorage.h
View file

@ -85,15 +85,27 @@ extern void GLAPIENTRY
_mesa_TexStorage3D(GLenum target, GLsizei levels, GLenum internalformat,
GLsizei width, GLsizei height, GLsizei depth);
void GLAPIENTRY
_mesa_TextureStorage1D_no_error(GLuint texture, GLsizei levels,
GLenum internalformat, GLsizei width);
extern void GLAPIENTRY
_mesa_TextureStorage1D(GLuint texture, GLsizei levels, GLenum internalformat,
GLsizei width);
void GLAPIENTRY
_mesa_TextureStorage2D_no_error(GLuint texture, GLsizei levels,
GLenum internalformat, GLsizei width,
GLsizei height);
extern void GLAPIENTRY
_mesa_TextureStorage2D(GLuint texture, GLsizei levels, GLenum internalformat,
GLsizei width, GLsizei height);
void GLAPIENTRY
_mesa_TextureStorage3D_no_error(GLuint texture, GLsizei levels,
GLenum internalformat, GLsizei width,
GLsizei height, GLsizei depth);
extern void GLAPIENTRY
_mesa_TextureStorage3D(GLuint texture, GLsizei levels, GLenum internalformat,