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

mesa: Use bitmask/ffs to iterate the enabled textures.

Browse source 
Replaces an iterate and test bit in a bitmask loop by a
loop only iterating over the bits set in the bitmask.

v2: Use _mesa_bit_scan{,64} instead of open coding.
v3: Use u_bit_scan{,64} instead of _mesa_bit_scan{,64}.

Reviewed-by: Brian Paul <brianp@vmware.com>
Signed-off-by: Mathias Fröhlich <Mathias.Froehlich@web.de>
This commit is contained in:
Mathias Fröhlich 2016-05-22 14:10:19 +02:00
parent 11a5b776c2
commit 34f741b080
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/mesa/main/texstate.c
View file

@ -38,6 +38,7 @@
#include "teximage.h" #include "teximage.h"
#include "texstate.h" #include "texstate.h"
#include "mtypes.h" #include "mtypes.h"
#include "util/bitscan.h"
#include "util/bitset.h" #include "util/bitset.h"
@ -611,7 +612,7 @@ update_ff_texture_state(struct gl_context *ctx,
for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) { for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {
struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit]; struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
GLuint texIndex; GLbitfield mask;
bool complete; bool complete;
if (texUnit->Enabled == 0x0) if (texUnit->Enabled == 0x0)
@ -651,20 +652,20 @@ update_ff_texture_state(struct gl_context *ctx,
* undefined." * undefined."
*/ */
complete = false; complete = false;
for (texIndex = 0; texIndex < NUM_TEXTURE_TARGETS; texIndex++) { mask = texUnit->Enabled;
if (texUnit->Enabled & (1 << texIndex)) { while (mask) {
struct gl_texture_object *texObj = texUnit->CurrentTex[texIndex]; const int texIndex = u_bit_scan(&mask);
struct gl_sampler_object *sampler = texUnit->Sampler ? struct gl_texture_object *texObj = texUnit->CurrentTex[texIndex];
texUnit->Sampler : &texObj->Sampler; struct gl_sampler_object *sampler = texUnit->Sampler ?
texUnit->Sampler : &texObj->Sampler;
if (!_mesa_is_texture_complete(texObj, sampler)) { if (!_mesa_is_texture_complete(texObj, sampler)) {
_mesa_test_texobj_completeness(ctx, texObj); _mesa_test_texobj_completeness(ctx, texObj);
} }
if (_mesa_is_texture_complete(texObj, sampler)) { if (_mesa_is_texture_complete(texObj, sampler)) {
_mesa_reference_texobj(&texUnit->_Current, texObj); _mesa_reference_texobj(&texUnit->_Current, texObj);
complete = true; complete = true;
break; break;
}
} }
} }