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

mesa: use loop in pop_texture_group() to restore 4 combiner terms

Browse Source 
There's four combiner terms (not 3) with GL_NV_texture_env_combine4.
Use a loop to make the code a little more compact.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Brian Paul
2011-09-30 21:03:42 -06:00
parent 1f8f8aef7f
commit 986a9bb180
1 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/attrib.c
+13 -24
View File
@@ -733,30 +733,19 @@ pop_texture_group(struct gl_context *ctx, struct texture_state *texstate)
unit->Combine.ModeRGB);
_mesa_TexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA,
unit->Combine.ModeA);
_mesa_TexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB,
unit->Combine.SourceRGB[0]);
_mesa_TexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB,
unit->Combine.SourceRGB[1]);
_mesa_TexEnvi(GL_TEXTURE_ENV, GL_SOURCE2_RGB,
unit->Combine.SourceRGB[2]);
_mesa_TexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA,
unit->Combine.SourceA[0]);
_mesa_TexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_ALPHA,
unit->Combine.SourceA[1]);
_mesa_TexEnvi(GL_TEXTURE_ENV, GL_SOURCE2_ALPHA,
unit->Combine.SourceA[2]);
_mesa_TexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_RGB,
unit->Combine.OperandRGB[0]);
_mesa_TexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_RGB,
unit->Combine.OperandRGB[1]);
_mesa_TexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_RGB,
unit->Combine.OperandRGB[2]);
_mesa_TexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA,
unit->Combine.OperandA[0]);
_mesa_TexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_ALPHA,
unit->Combine.OperandA[1]);
_mesa_TexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_ALPHA,
unit->Combine.OperandA[2]);
{
GLuint i;
for (i = 0; i < MAX_COMBINER_TERMS; i++) {
_mesa_TexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB + i,
unit->Combine.SourceRGB[i]);
_mesa_TexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA + i,
unit->Combine.SourceA[i]);
_mesa_TexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_RGB + i,
unit->Combine.OperandRGB[i]);
_mesa_TexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA + i,
unit->Combine.OperandA[i]);
}
}
_mesa_TexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE,
1 << unit->Combine.ScaleShiftRGB);
_mesa_TexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE,