diff options
| author | Mathias Fröhlich <mathias.froehlich@web.de> | 2016-05-22 14:10:19 +0200 |
|---|---|---|
| committer | Mathias Fröhlich <mathias.froehlich@web.de> | 2016-06-16 05:50:55 +0200 |
| commit | 11a5b776c20a9f9dd7fd822d56e3a8a979278151 (patch) | |
| tree | 4de20acc1e1eeb7fb48c428f93a432901379f6f6 /src/mesa/main/texstate.c | |
| parent | c14ec9aafa156c01fabf14d5f75cfe6fc4302480 (diff) | |
| download | external_mesa3d-11a5b776c20a9f9dd7fd822d56e3a8a979278151.zip external_mesa3d-11a5b776c20a9f9dd7fd822d56e3a8a979278151.tar.gz external_mesa3d-11a5b776c20a9f9dd7fd822d56e3a8a979278151.tar.bz2 | |
mesa: Use designated bool value to check texture unit completeness.
The change helps to use the bitmask/ffs in the next change.
Reviewed-by: Brian Paul <brianp@vmware.com>
Signed-off-by: Mathias Fröhlich <Mathias.Froehlich@web.de>
Diffstat (limited to 'src/mesa/main/texstate.c')
| -rw-r--r-- | src/mesa/main/texstate.c | 5 |
1 files changed, 4 insertions, 1 deletions
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 */ |