ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DS GX: Add texformat enum

This commit is contained in:
Vicki Pfau 2021-12-25 03:03:07 -08:00
parent 517dfe12ee
commit 4beb293ac1
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/mgba/internal/ds/gx.h
View File

@ -100,6 +100,17 @@ enum DSGXCommand {
DS_GX_CMD_MAX
};
enum DSGXTexFormat {
DS_GX_TEX_NONE = 0,
DS_GX_TEX_A3I5 = 1,
DS_GX_TEX_IDX2 = 2,
DS_GX_TEX_IDX4 = 3,
DS_GX_TEX_IDX8 = 4,
DS_GX_TEX_COMPRESSED = 5,
DS_GX_TEX_A5I3 = 6,
DS_GX_TEX_RGBA = 7
};
#pragma pack(push, 1)
struct DSGXEntry {
uint8_t command;

16
src/ds/gx/software.c
View File

@ -143,44 +143,44 @@ static color_t _lookupColor(struct DSGXSoftwareRenderer* renderer, struct DSGXSo
pa = (pa << 1) + 1;
}
switch (poly->texFormat) {
case 0:
case DS_GX_TEX_NONE:
default:
return _finishColor(ep->cr, ep->cg, ep->cb, pa);
case 1:
case DS_GX_TEX_A3I5:
texel = ((uint8_t*) poly->texBase)[texelCoord];
ta = (texel >> 5) & 0x7;
ta = (ta << 2) + (ta >> 1);
texel &= 0x1F;
break;
case 2:
case DS_GX_TEX_IDX2:
texel = ((uint8_t*) poly->texBase)[texelCoord >> 2];
if (texelCoord & 0x3) {
texel >>= 2 * (texelCoord & 0x3);
}
texel &= 0x3;
break;
case 3:
case DS_GX_TEX_IDX4:
texel = ((uint8_t*) poly->texBase)[texelCoord >> 1];
if (texelCoord & 0x1) {
texel >>= 4;
}
texel &= 0xF;
break;
case 4:
case DS_GX_TEX_IDX8:
texel = ((uint8_t*) poly->texBase)[texelCoord];
break;
case 5:
case DS_GX_TEX_COMPRESSED:
texelCoord = (s & ~3) + (t & 3) + (t >> 2) * poly->texW;
texel = ((uint8_t*) poly->texBase)[texelCoord];
texel >>= (s & 3) * 2;
texel &= 3;
break;
case 6:
case DS_GX_TEX_A5I3:
texel = ((uint8_t*) poly->texBase)[texelCoord];
ta = (texel >> 3) & 0x1F;
texel &= 0x7;
break;
case 7:
case DS_GX_TEX_RGBA:
texel = poly->texBase[texelCoord];
break;
}