OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use smooth shaded triangles always. Fix SoF bug.

Browse Source
This commit is contained in:
Keith Whitwell
2000-04-19 23:58:31 +00:00
parent 71dea349d2
commit 0f32948dab
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/mesa/drivers/glide/fxsetup.c
View File

@@ -183,7 +183,7 @@ static GLuint fxGetTexSetConfiguration(GLcontext *ctx,
GLuint envmode=0; GLuint envmode=0;
GLuint ifmt=0; GLuint ifmt=0;
if((ctx->Light.ShadeModel==GL_SMOOTH) || if((ctx->Light.ShadeModel==GL_SMOOTH) || 1 ||
(ctx->Point.SmoothFlag) || (ctx->Point.SmoothFlag) ||
(ctx->Line.SmoothFlag) || (ctx->Line.SmoothFlag) ||
(ctx->Polygon.SmoothFlag)) (ctx->Polygon.SmoothFlag))
@@ -191,11 +191,13 @@ static GLuint fxGetTexSetConfiguration(GLcontext *ctx,
else else
unitsmode|=FX_UM_ALPHA_CONSTANT; unitsmode|=FX_UM_ALPHA_CONSTANT;
if(ctx->Light.ShadeModel==GL_SMOOTH) if(ctx->Light.ShadeModel==GL_SMOOTH || 1)
unitsmode|=FX_UM_COLOR_ITERATED; unitsmode|=FX_UM_COLOR_ITERATED;
else else
unitsmode|=FX_UM_COLOR_CONSTANT; unitsmode|=FX_UM_COLOR_CONSTANT;
/* /*
OpenGL Feeds Texture 0 into Texture 1 OpenGL Feeds Texture 0 into Texture 1
Glide Feeds Texture 1 into Texture 0 Glide Feeds Texture 1 into Texture 0
@@ -476,8 +478,8 @@ static void fxSetupTextureSingleTMU_NoLock(GLcontext *ctx, GLuint textureset)
else else
unitsmode=fxGetTexSetConfiguration(ctx,NULL,tObj); unitsmode=fxGetTexSetConfiguration(ctx,NULL,tObj);
if(fxMesa->lastUnitsMode==unitsmode) /* if(fxMesa->lastUnitsMode==unitsmode) */
return; /* return; */
fxMesa->lastUnitsMode=unitsmode; fxMesa->lastUnitsMode=unitsmode;
@@ -555,9 +557,8 @@ static void fxSetupTextureSingleTMU_NoLock(GLcontext *ctx, GLuint textureset)
FXTRUE); FXTRUE);
ctx->Driver.MultipassFunc = fxMultipassBlend; ctx->Driver.MultipassFunc = fxMultipassBlend;
#else #else
#ifndef FX_SILENT if (MESA_VERBOSE&VERBOSE_DRIVER)
/*fprintf(stderr,"fx Driver: GL_BLEND not yet supported\n");*/ fprintf(stderr,"fx Driver: GL_BLEND not yet supported\n");
#endif
#endif #endif
break; break;
case GL_REPLACE: case GL_REPLACE:
@@ -588,9 +589,9 @@ static void fxSetupTextureSingleTMU_NoLock(GLcontext *ctx, GLuint textureset)
FXFALSE); FXFALSE);
break; break;
default: default:
#ifndef FX_SILENT if (MESA_VERBOSE&VERBOSE_DRIVER)
fprintf(stderr,"fx Driver: %x Texture.EnvMode not yet supported\n",ctx->Texture.Unit[textureset].EnvMode); fprintf(stderr, "fx Driver: %x Texture.EnvMode not yet supported\n",
#endif ctx->Texture.Unit[textureset].EnvMode);
break; break;
} }
@@ -764,8 +765,8 @@ static void fxSetupTextureDoubleTMU_NoLock(GLcontext *ctx)
unitsmode=fxGetTexSetConfiguration(ctx,tObj0,tObj1); unitsmode=fxGetTexSetConfiguration(ctx,tObj0,tObj1);
if(fxMesa->lastUnitsMode==unitsmode) /* if(fxMesa->lastUnitsMode==unitsmode) */
return; /* return; */
fxMesa->lastUnitsMode=unitsmode; fxMesa->lastUnitsMode=unitsmode;
@@ -1030,7 +1031,7 @@ static void fxSetupTextureNone_NoLock(GLcontext *ctx)
fprintf(stderr,"fxmesa: fxSetupTextureNone(...)\n"); fprintf(stderr,"fxmesa: fxSetupTextureNone(...)\n");
} }
if((ctx->Light.ShadeModel==GL_SMOOTH) || if((ctx->Light.ShadeModel==GL_SMOOTH) || 1 ||
(ctx->Point.SmoothFlag) || (ctx->Point.SmoothFlag) ||
(ctx->Line.SmoothFlag) || (ctx->Line.SmoothFlag) ||
(ctx->Polygon.SmoothFlag)) (ctx->Polygon.SmoothFlag))
@@ -1038,7 +1039,7 @@ static void fxSetupTextureNone_NoLock(GLcontext *ctx)
else else
locala=GR_COMBINE_LOCAL_CONSTANT; locala=GR_COMBINE_LOCAL_CONSTANT;
if(ctx->Light.ShadeModel==GL_SMOOTH) if(ctx->Light.ShadeModel==GL_SMOOTH || 1)
localc=GR_COMBINE_LOCAL_ITERATED; localc=GR_COMBINE_LOCAL_ITERATED;
else else
localc=GR_COMBINE_LOCAL_CONSTANT; localc=GR_COMBINE_LOCAL_CONSTANT;