fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: Cosmetic changes in legal_texobj_target

Browse source 
Use bool instead of GLboolean and constify ctx.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Ian Romanick 2016-08-18 09:57:54 +01:00
parent d79c950eeb
commit daf1a61e11
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,19 +48,19 @@
* This is a bit different than legal_teximage_target() when it comes
* to cube maps.
*/
static GLboolean
legal_texobj_target(struct gl_context *ctx, GLuint dims, GLenum target)
static bool
legal_texobj_target(const struct gl_context *ctx, GLuint dims, GLenum target)
{
if (dims < 1 || dims > 3) {
_mesa_problem(ctx, "invalid dims=%u in legal_texobj_target()", dims);
return GL_FALSE;
return false;
}
switch (dims) {
case 2:
switch (target) {
case GL_TEXTURE_2D:
return GL_TRUE;
return true;
case GL_TEXTURE_CUBE_MAP:
return ctx->Extensions.ARB_texture_cube_map;
}
@ -68,7 +68,7 @@ legal_texobj_target(struct gl_context *ctx, GLuint dims, GLenum target)
case 3:
switch (target) {
case GL_TEXTURE_3D:
return GL_TRUE;
return true;
case GL_TEXTURE_2D_ARRAY:
return ctx->Extensions.EXT_texture_array;
}
@ -76,21 +76,21 @@ legal_texobj_target(struct gl_context *ctx, GLuint dims, GLenum target)
}
if (!_mesa_is_desktop_gl(ctx))
return GL_FALSE;
return false;
switch (dims) {
case 1:
switch (target) {
case GL_TEXTURE_1D:
case GL_PROXY_TEXTURE_1D:
return GL_TRUE;
return true;
default:
return GL_FALSE;
return false;
}
case 2:
switch (target) {
case GL_PROXY_TEXTURE_2D:
return GL_TRUE;
return true;
case GL_PROXY_TEXTURE_CUBE_MAP:
return ctx->Extensions.ARB_texture_cube_map;
case GL_TEXTURE_RECTANGLE:
@ -100,19 +100,19 @@ legal_texobj_target(struct gl_context *ctx, GLuint dims, GLenum target)
case GL_PROXY_TEXTURE_1D_ARRAY:
return ctx->Extensions.EXT_texture_array;
default:
return GL_FALSE;
return false;
}
case 3:
switch (target) {
case GL_PROXY_TEXTURE_3D:
return GL_TRUE;
return true;
case GL_PROXY_TEXTURE_2D_ARRAY:
return ctx->Extensions.EXT_texture_array;
case GL_TEXTURE_CUBE_MAP_ARRAY:
case GL_PROXY_TEXTURE_CUBE_MAP_ARRAY:
return ctx->Extensions.ARB_texture_cube_map_array;
default:
return GL_FALSE;
return false;
}
default:
unreachable("impossible dimensions");