Mesa (master): mesa: simplify get_tex_images_for_clear()
Brian Paul
brianp at kemper.freedesktop.org
Thu Jul 6 22:41:53 UTC 2017
Module: Mesa
Branch: master
Commit: 7cc6ee56c657782fe218aaf3dbc46905f4663c21
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7cc6ee56c657782fe218aaf3dbc46905f4663c21
Author: Brian Paul <brianp at vmware.com>
Date: Wed Jul 5 14:48:33 2017 -0600
mesa: simplify get_tex_images_for_clear()
Get rid of redundant code.
Reviewed-by: Charmaine Lee <charmainel at vmware.com>
---
src/mesa/main/teximage.c | 33 ++++++++++++++-------------------
1 file changed, 14 insertions(+), 19 deletions(-)
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 7b5df54ca1..5e13025ed1 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -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;
-
- 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;
- }
- }
-
- return MAX_FACES;
+ target = GL_TEXTURE_CUBE_MAP_POSITIVE_X;
+ numFaces = MAX_FACES;
+ }
+ else {
+ target = texObj->Target;
+ numFaces = 1;
}
- 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;
+ 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 1;
+ return numFaces;
}
void GLAPIENTRY
More information about the mesa-commit
mailing list