AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa/main/ff_frag: Store nr_enabled_units only once.

Browse Source 
Signed-off-by: Gustaw Smolarczyk <wielkiegie@gmail.com>
Signed-off-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Gustaw Smolarczyk
2017-03-30 20:09:26 +02:00
committed by Marek Olšák
parent 0e89ab0d6e
commit a86891a9a9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/ff_fragment_shader.cpp
+4 -2
View File
@@ -396,8 +396,9 @@ static GLuint make_state_key( struct gl_context *ctx, struct state_key *key )
/* _NEW_TEXTURE_OBJECT */
mask = ctx->Texture._EnabledCoordUnits;
int i = -1;
while (mask) {
const int i = u_bit_scan(&mask);
i = u_bit_scan(&mask);
const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];
const struct gl_texture_object *texObj = texUnit->_Current;
const struct gl_tex_env_combine_state *comb = texUnit->_CurrentCombine;
@@ -411,7 +412,6 @@ static GLuint make_state_key( struct gl_context *ctx, struct state_key *key )
format = _mesa_texture_base_format(texObj);
key->unit[i].enabled = 1;
key->nr_enabled_units = i + 1;
inputs_referenced |= VARYING_BIT_TEX(i);
key->unit[i].source_index = _mesa_tex_target_to_index(ctx,
@@ -441,6 +441,8 @@ static GLuint make_state_key( struct gl_context *ctx, struct state_key *key )
}
}
key->nr_enabled_units = i + 1;
/* _NEW_LIGHT | _NEW_FOG */
if (texenv_doing_secondary_color(ctx)) {
key->separate_specular = 1;