[Mesa-dev] [PATCH 25/29] mesa: Use designated bool value to check texture unit completeness.
Mathias.Froehlich at gmx.net
Mathias.Froehlich at gmx.net
Tue Jun 14 05:00:11 UTC 2016
From: Mathias Fröhlich <mathias.froehlich at web.de>
The change helps to use the bitmask/ffs in the next change.
Reviewed-by: Brian Paul <brianp at vmware.com>
Signed-off-by: Mathias Fröhlich <Mathias.Froehlich at web.de>
---
src/mesa/main/texstate.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 9ee5c69..3543369 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -612,6 +612,7 @@ update_ff_texture_state(struct gl_context *ctx,
for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {
struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
GLuint texIndex;
+ bool complete;
if (texUnit->Enabled == 0x0)
continue;
@@ -649,6 +650,7 @@ update_ff_texture_state(struct gl_context *ctx,
* another unit, then the results of texture blending are
* undefined."
*/
+ complete = false;
for (texIndex = 0; texIndex < NUM_TEXTURE_TARGETS; texIndex++) {
if (texUnit->Enabled & (1 << texIndex)) {
struct gl_texture_object *texObj = texUnit->CurrentTex[texIndex];
@@ -660,12 +662,13 @@ update_ff_texture_state(struct gl_context *ctx,
}
if (_mesa_is_texture_complete(texObj, sampler)) {
_mesa_reference_texobj(&texUnit->_Current, texObj);
+ complete = true;
break;
}
}
}
- if (texIndex == NUM_TEXTURE_TARGETS)
+ if (!complete)
continue;
/* if we get here, we know this texture unit is enabled */
--
2.5.5
More information about the mesa-dev
mailing list