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

mesa: simplify get_tex_images_for_clear()

Browse source 
Get rid of redundant code.

Reviewed-by: Charmaine Lee <charmainel@vmware.com>
This commit is contained in:
Brian Paul 2017-07-05 14:48:33 -06:00
parent f3a608d9f9
commit 7cc6ee56c6
1 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/mesa/main/teximage.c
View file

@ -4378,7 +4378,7 @@ get_tex_images_for_clear(struct gl_context *ctx,
struct gl_texture_image **texImages)
{
GLenum target;
int i;
int numFaces, i;
if (level < 0 || level >= MAX_TEXTURE_LEVELS) {
_mesa_error(ctx, GL_INVALID_OPERATION, "%s(invalid level)", function);
@ -4386,28 +4386,23 @@ get_tex_images_for_clear(struct gl_context *ctx,
}
if (texObj->Target == GL_TEXTURE_CUBE_MAP) {
for (i = 0; i < MAX_FACES; i++) {
target = GL_TEXTURE_CUBE_MAP_POSITIVE_X + i;
target = GL_TEXTURE_CUBE_MAP_POSITIVE_X;
numFaces = MAX_FACES;
}
else {
target = texObj->Target;
numFaces = 1;
}
texImages[i] = _mesa_select_tex_image(texObj, target, level);
if (texImages[i] == NULL) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"%s(invalid level)", function);
return 0;
}
for (i = 0; i < numFaces; i++) {
texImages[i] = _mesa_select_tex_image(texObj, target + i, level);
if (texImages[i] == NULL) {
_mesa_error(ctx, GL_INVALID_OPERATION, "%s(invalid level)", function);
return 0;
}
return MAX_FACES;
}
texImages[0] = _mesa_select_tex_image(texObj, texObj->Target, level);
if (texImages[0] == NULL) {
_mesa_error(ctx, GL_INVALID_OPERATION, "%s(invalid level)", function);
return 0;
}
return 1;
return numFaces;
}
void GLAPIENTRY