chacha/glide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

added extra trilinear checks and 1chip x2fsaa for subsample lod dithering

Browse Source
This commit is contained in:
koolsmoky
2007-05-19 11:44:24 +00:00
parent 0e30810868
commit ee0637513a
2 changed files with 62 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
glide3x/h5/glide3/src/gsst.c
View File

@@ -2066,83 +2066,66 @@ GR_EXT_ENTRY(grSstWinOpenExt, GrContext_t, ( FxU32 hWnd,
{
gc->do2ppc = FXFALSE;
gc->bInfo->h3analogSli = 0 ;
if (gc->grPixelSize <= 2)
{
switch (gc->grSstRez)
{
case GR_RESOLUTION_1600x1200:
case GR_RESOLUTION_1600x1024:
case GR_RESOLUTION_1280x1024:
case GR_RESOLUTION_1280x960:
case GR_RESOLUTION_1152x864:
case GR_RESOLUTION_1024x768:
case GR_RESOLUTION_960x720:
case GR_RESOLUTION_800x600:
case GR_RESOLUTION_856x480:
case GR_RESOLUTION_640x480:
case GR_RESOLUTION_640x400:
case GR_RESOLUTION_640x350:
gc->do2ppc = FXTRUE;
break;
case GR_RESOLUTION_640x200:
case GR_RESOLUTION_512x384:
case GR_RESOLUTION_512x256:
case GR_RESOLUTION_400x300:
case GR_RESOLUTION_400x256:
case GR_RESOLUTION_320x240:
case GR_RESOLUTION_320x200:
gc->sliCount = 1 ;
gc->chipCount = 1 ;
gc->grPixelSample = 1 ;
break;
case GR_RESOLUTION_2048x2048:
case GR_RESOLUTION_2048x1536:
case GR_RESOLUTION_1920x1440:
case GR_RESOLUTION_1856x1392:
case GR_RESOLUTION_1792x1344:
default:
gc->bInfo->h3analogSli = 1 ;
break;
case GR_RESOLUTION_1600x1024:
gc->do2ppc = FXTRUE;
break;
case GR_RESOLUTION_1600x1200:
break;
case GR_RESOLUTION_1792x1344:
case GR_RESOLUTION_1856x1392:
case GR_RESOLUTION_1920x1440:
case GR_RESOLUTION_2048x1536:
case GR_RESOLUTION_2048x2048:
gc->bInfo->h3analogSli = 1 ;
break;
case GR_RESOLUTION_400x300:
case GR_RESOLUTION_320x200:
case GR_RESOLUTION_320x240:
case GR_RESOLUTION_400x256:
case GR_RESOLUTION_512x256:
case GR_RESOLUTION_512x384:
case GR_RESOLUTION_640x200:
gc->sliCount = 1 ;
gc->chipCount = 1 ;
gc->grPixelSample = 1 ;
default:
gc->do2ppc = FXTRUE;
break;
}
}
else if (gc->grPixelSize == 4)
{
switch (gc->grSstRez)
{
case GR_RESOLUTION_1280x1024:
case GR_RESOLUTION_1280x960:
case GR_RESOLUTION_1152x864:
case GR_RESOLUTION_1024x768:
case GR_RESOLUTION_960x720:
case GR_RESOLUTION_800x600:
case GR_RESOLUTION_856x480:
case GR_RESOLUTION_640x480:
case GR_RESOLUTION_640x400:
case GR_RESOLUTION_640x350:
gc->do2ppc = FXTRUE;
break;
case GR_RESOLUTION_640x200:
case GR_RESOLUTION_512x384:
case GR_RESOLUTION_512x256:
case GR_RESOLUTION_400x300:
case GR_RESOLUTION_400x256:
case GR_RESOLUTION_320x240:
case GR_RESOLUTION_320x200:
gc->sliCount = 1 ;
gc->chipCount = 1 ;
gc->grPixelSample = 1 ;
break;
case GR_RESOLUTION_2048x2048:
case GR_RESOLUTION_2048x1536:
case GR_RESOLUTION_1920x1440:
case GR_RESOLUTION_1856x1392:
case GR_RESOLUTION_1792x1344:
case GR_RESOLUTION_1600x1200:
case GR_RESOLUTION_1600x1024:
default:
gc->bInfo->h3analogSli = 1 ;
break;
case GR_RESOLUTION_1600x1024:
gc->bInfo->h3analogSli = 1 ;
gc->do2ppc = FXTRUE;
break;
case GR_RESOLUTION_1600x1200:
case GR_RESOLUTION_1792x1344:
case GR_RESOLUTION_1856x1392:
case GR_RESOLUTION_1920x1440:
case GR_RESOLUTION_2048x1536:
case GR_RESOLUTION_2048x2048:
gc->bInfo->h3analogSli = 1 ;
break;
case GR_RESOLUTION_400x300:
case GR_RESOLUTION_320x200:
case GR_RESOLUTION_320x240:
case GR_RESOLUTION_400x256:
case GR_RESOLUTION_512x256:
case GR_RESOLUTION_512x384:
case GR_RESOLUTION_640x200:
gc->sliCount = 1 ;
gc->chipCount = 1 ;
gc->grPixelSample = 1 ;
default:
break;
}
}

19
glide3x/h5/glide3/src/gtex.c
View File

@@ -884,8 +884,8 @@ _grTexCheckTriLinear(GrChipID_t tmu)
*
* Case 1 - TMU set for lod blending and has both even/odd levels
*/
if ((curTmu->textureMode & SST_TRILINEAR) &&
(curTmu->evenOdd == 3)) {
if (((curTmu->textureMode & SST_TRILINEAR) == SST_TRILINEAR) &&
(curTmu->evenOdd == GR_MIPMAPLEVELMASK_BOTH)) {
/* Check the 'other' tmu to see if it is active, if not then we
* are doing two pass trilinear so check that we have the
@@ -924,7 +924,7 @@ _grTexCheckTriLinear(GrChipID_t tmu)
FxU32 i;
for(i = 0; i < GLIDE_NUM_TMU; i++) {
evenOdd[i] = gc->state.shadow[i].tLOD & SST_LOD_ODD;
evenOdd[i] = gc->state.shadow.tmuState[i].tLOD & SST_LOD_ODD;
}
}
@@ -2565,8 +2565,10 @@ GR_ENTRY(grTexMipMapMode, void,
----------------------------------------------------------*/
tLod |= SST_TLOD_MINMAX_INT(gc->state.per_tmu[tmu].largeLod,
gc->state.per_tmu[tmu].smallLod);
if(_GlideRoot.environment.texSubLodDither && !lodBlend)
if(_GlideRoot.environment.texSubLodDither) {
gc->state.per_tmu[tmu].texSubLodDither = FXTRUE;
mmMode = GR_MIPMAP_NEAREST;
}
break;
default:
@@ -3734,6 +3736,7 @@ void g3LodBiasPerChip(GrChipID_t tmu, FxU32 tLod)
static FxI32 chipLodBias[2][2][4] =
/* 4.2 format for tLod register
* 1chip x2fsaa - no sli, 2 samples per chip
* 2chip x2fsaa - no sli, 1 sample per chip
* 2chip x4fsaa - no sli, 2 samples per chip
* 4chip x2fsaa - 2 way sli, 1 sample per sli unit
@@ -3760,10 +3763,12 @@ void g3LodBiasPerChip(GrChipID_t tmu, FxU32 tLod)
GR_BEGIN_NOFIFOCHECK("g3LodBiasPerChip", 88);
if( /*(_GlideRoot.environment.texSubLodDither != 1) ||*//* we won't get here if 0 */
(gc->sliCount == gc->chipCount) ||
(gc->windowed) )
((gc->sliCount == gc->chipCount) && (gc->grSamplesPerChip == 1)) ||
(gc->windowed) ||
(gc->state.per_tmu[tmu].evenOdd != 3) ||
(gc->state.tmuShadow[tmu].textureMode & SST_TRILINEAR) )
return;
/* sign extend it. */
oldLodBias = (((tLod & SST_LODBIAS) << (32-6-SST_LODBIAS_SHIFT)) >> (32-6-SST_LODBIAS_SHIFT));