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

texture base address alignment fix for dxt1 downloads.

Browse Source
This commit is contained in:
koolsmoky
2004-05-11 19:35:44 +00:00
parent 0b554c2612
commit 9ba0dc01b9
3 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
glide3x/h5/glide3/src/ditex.c
View File

@@ -1600,6 +1600,10 @@ _grTexTextureMemRequired( GrLOD_t small_lod, GrLOD_t large_lod,
switch(format) {
case GR_TEXFMT_ARGB_CMP_FXT1:
case GR_TEXFMT_ARGB_CMP_DXT1: /* HACK: align texture base address for
* the smallest mipmap.
* See grTexDownloadMipMapLevelPartial.
*/
/* In this case, do not mirror the aspect ratios, as the minimum
* size of a mipmap level is 8x4, so the tables are not symmetric
* w.r.t. sign of the aspect ratio, so keep the sign. */
@@ -1622,7 +1626,6 @@ _grTexTextureMemRequired( GrLOD_t small_lod, GrLOD_t large_lod,
}
break;
case GR_TEXFMT_ARGB_CMP_DXT1:
case GR_TEXFMT_ARGB_CMP_DXT2:
case GR_TEXFMT_ARGB_CMP_DXT3:
case GR_TEXFMT_ARGB_CMP_DXT4:
@@ -1715,6 +1718,9 @@ _grTexCalcBaseAddress( FxU32 start, GrLOD_t large_lod,
switch(format) {
case GR_TEXFMT_ARGB_CMP_FXT1:
case GR_TEXFMT_ARGB_CMP_DXT1: /* HACK: compensate for the hack to align the
* base address in _grTexTextureMemRequired.
*/
/* FXT1 format: Don't mirror the aspect ratios, because of the 8x4 limit */
if ( odd_even_mask == GR_MIPMAPLEVELMASK_BOTH ) {
sum_of_lod_sizes = _grMipMapOffsetCmp4Bit[aspect]
@@ -1731,7 +1737,6 @@ _grTexCalcBaseAddress( FxU32 start, GrLOD_t large_lod,
}
break;
case GR_TEXFMT_ARGB_CMP_DXT1:
case GR_TEXFMT_ARGB_CMP_DXT2:
case GR_TEXFMT_ARGB_CMP_DXT3:
case GR_TEXFMT_ARGB_CMP_DXT4:

37
glide3x/h5/glide3/src/gtexdl.c
View File

@@ -1133,12 +1133,16 @@ _grTexDownloadMipMapLevelPartialTiled(GrChipID_t tmu,
case 4:
{
texOffset += (t * texStrideBytes);
for(; t <= maxT; t+=2) {
LINEAR_WRITE_BEGIN(1, SSTCP_PKT5_LFB, texOffset, 0x0UL, 0x0UL);
LINEAR_WRITE_SET(texOffset, *src32);
for(; t <= maxT; t+=4) {
FxI32 s;
LINEAR_WRITE_BEGIN(2, SSTCP_PKT5_LFB, texOffset, 0x00UL, 0x00UL);
for (s = 0; s < 2; s++) {
LINEAR_WRITE_SET(texOffset, *src32);
src32++;
texOffset += texStrideBytes;
}
LINEAR_WRITE_END();
src32++;
texOffset += texStrideBytes;
}
}
break;
@@ -1506,12 +1510,10 @@ GR_ENTRY(grTexDownloadMipMapLevelPartial,
* 16 bytes (4x4x1) which also matches the alignment
* restriction.
*/
/* XXX: we can't skip this part for DXT1 because the smallest
* mipmap is 8 bytes (4x4x1/2).
/* Note: we skip this part for DXT1 and use the hack
* in _grTexTextureMemRequired to align the baseAddr.
*/
if(format != GR_TEXFMT_ARGB_CMP_FXT1 &&
format != GR_TEXFMT_ARGB_CMP_DXT2 && format != GR_TEXFMT_ARGB_CMP_DXT3 &&
format != GR_TEXFMT_ARGB_CMP_DXT4 && format != GR_TEXFMT_ARGB_CMP_DXT5 ) {
if(format != GR_TEXFMT_ARGB_CMP_FXT1 && format < GR_TEXFMT_ARGB_CMP_DXT1 ) {
const FxU32
aspectIndex = ((aspectRatio < GR_ASPECT_LOG2_1x1)
? -aspectRatio
@@ -1520,9 +1522,7 @@ GR_ENTRY(grTexDownloadMipMapLevelPartial,
? GR_LOD_LOG2_256 : thisLod + 1),
formatMult = _grBitsPerTexel[format];
FxU32
levelSize = ((format == GR_TEXFMT_ARGB_CMP_DXT1)
? (_grMipMapHostSizeDXT[aspectIndex][lodIndex] * formatMult) >> 3
: (_grMipMapHostSize[aspectIndex][lodIndex] * formatMult) >> 3); /* bytes */
levelSize = (_grMipMapHostSize[aspectIndex][lodIndex] * formatMult) >> 3; /* bytes */
GR_CHECK_F(FN_NAME, formatMult == 0, "invalid texture format");
@@ -1541,9 +1541,7 @@ GR_ENTRY(grTexDownloadMipMapLevelPartial,
* colon.
*/
while(maxLod < GR_LOD_LOG2_256) {
levelSize = ((format == GR_TEXFMT_ARGB_CMP_DXT1)
? (_grMipMapHostSizeDXT[aspectIndex][maxLod] * formatMult) >> 3
: (_grMipMapHostSize[aspectIndex][maxLod] * formatMult) >> 3); /* bytes */
levelSize = (_grMipMapHostSize[aspectIndex][maxLod] * formatMult) >> 3; /* bytes */
if (levelSize >= SST_TEXTURE_ALIGN) break;
// check on the Even/Odd mask to see if the mip-map affects this TMU
if((maxLod & 1) ? (evenOdd & GR_MIPMAPLEVELMASK_ODD) : (evenOdd & GR_MIPMAPLEVELMASK_EVEN))
@@ -1588,7 +1586,7 @@ GR_ENTRY(grTexDownloadMipMapLevelPartial,
FxU32
width, formatSel, widthSel, max_s;
/*
/*
* Interpretations:
* formatSel: Chooses among 4, 8, 16, and 32-bit download procedures.
* We want formatSel == log2(bitsPerTexel >> 2).
@@ -1641,9 +1639,8 @@ GR_ENTRY(grTexDownloadMipMapLevelPartial,
break;
}
if (max_s <= 0) max_s = 1;
if (widthSel > 3) widthSel = 4;
else if (widthSel <= 0) widthSel = 0;
if (max_s < 1) max_s = 1;
if (widthSel > 4) widthSel = 4;
gc->stats.texBytes += max_s * (max_t - t + 1) * 4;

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

@@ -97,15 +97,18 @@ _grTexDownload_Default_4_4(struct GrGC_s* gc, const FxU32 tmuBaseAddr,
FxI32
t = minT;
for (; t <= maxT; t+=2) {
FxU32 tex_address = tmuBaseAddr + (t << 1UL);
const FxU32 t0 = *src32;
LINEAR_WRITE_BEGIN(1, PACKET5_MODE, (FxU32)tex_address, 0x00UL, 0x00UL);
LINEAR_WRITE_SET(tex_address, t0);
for (; t <= maxT; t+=4) {
FxU32 tex_address = tmuBaseAddr + (t << 2UL);
FxI32 s;
LINEAR_WRITE_BEGIN(2, PACKET5_MODE, (FxU32)tex_address, 0x00UL, 0x00UL);
for (s = 0; s < 2; s++) {
const FxU32 t0 = *src32;
LINEAR_WRITE_SET(tex_address, t0);
tex_address++;
src32++;
}
LINEAR_WRITE_END();
tex_address++;
src32++;
}
#undef FN_NAME
}