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

swrast: minor improvements, clean-ups in texcombine code

Browse source
This commit is contained in:
Brian Paul 2009-03-09 21:20:25 -06:00
parent efe3d10aea
commit aef2e1c1dc
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/mesa/swrast/s_texcombine.c
View file

@ -189,15 +189,15 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
break; break;
case GL_SRC_ALPHA: case GL_SRC_ALPHA:
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
dst[i][RCOMP] = src[i][ACOMP]; dst[i][RCOMP] =
dst[i][GCOMP] = src[i][ACOMP]; dst[i][GCOMP] =
dst[i][BCOMP] = src[i][ACOMP]; dst[i][BCOMP] = src[i][ACOMP];
} }
break; break;
case GL_ONE_MINUS_SRC_ALPHA: case GL_ONE_MINUS_SRC_ALPHA:
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
dst[i][RCOMP] = 1.0F - src[i][ACOMP]; dst[i][RCOMP] =
dst[i][GCOMP] = 1.0F - src[i][ACOMP]; dst[i][GCOMP] =
dst[i][BCOMP] = 1.0F - src[i][ACOMP]; dst[i][BCOMP] = 1.0F - src[i][ACOMP];
} }
break; break;
@ -361,7 +361,7 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
(arg0[i][BCOMP] - 0.5F) * (arg1[i][BCOMP] - 0.5F)) (arg0[i][BCOMP] - 0.5F) * (arg1[i][BCOMP] - 0.5F))
* 4.0F; * 4.0F;
dot = CLAMP(dot, 0.0F, 1.0F); dot = CLAMP(dot, 0.0F, 1.0F);
rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = (GLfloat) dot; rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = dot;
} }
break; break;
case GL_DOT3_RGB: case GL_DOT3_RGB:
@ -373,7 +373,7 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
(arg0[i][BCOMP] - 0.5F) * (arg1[i][BCOMP] - 0.5F)) (arg0[i][BCOMP] - 0.5F) * (arg1[i][BCOMP] - 0.5F))
* 4.0F * scaleRGB; * 4.0F * scaleRGB;
dot = CLAMP(dot, 0.0, 1.0F); dot = CLAMP(dot, 0.0, 1.0F);
rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = (GLfloat) dot; rgba[i][RCOMP] = rgba[i][GCOMP] = rgba[i][BCOMP] = dot;
} }
break; break;
case GL_MODULATE_ADD_ATI: case GL_MODULATE_ADD_ATI:
@ -440,8 +440,7 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
switch (combine->ModeA) { switch (combine->ModeA) {
case GL_REPLACE: case GL_REPLACE:
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
GLfloat a = arg0[i][ACOMP] * scaleA; rgba[i][ACOMP] = arg0[i][ACOMP] * scaleA;
rgba[i][ACOMP] = (GLfloat) MIN2(a, 1.0F);
} }
break; break;
case GL_MODULATE: case GL_MODULATE:
@ -481,7 +480,7 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
} }
break; break;
case GL_INTERPOLATE: case GL_INTERPOLATE:
for (i=0; i<n; i++) { for (i = 0; i < n; i++) {
rgba[i][ACOMP] = (arg0[i][ACOMP] * arg2[i][ACOMP] + rgba[i][ACOMP] = (arg0[i][ACOMP] * arg2[i][ACOMP] +
arg1[i][ACOMP] * (1.0F - arg2[i][ACOMP])) arg1[i][ACOMP] * (1.0F - arg2[i][ACOMP]))
* scaleA; * scaleA;