DevKit7/libctru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed up DVLE_SendOutmap

Browse Source
This commit is contained in:
smea 2014-12-27 11:22:48 -08:00
parent e3017fa304
commit 05e886c9fa
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libctru/include/3ds/gpu/shdr.h
View File

@ -7,10 +7,13 @@ typedef enum{
typedef enum{ typedef enum{
RESULT_POSITION = 0x0, RESULT_POSITION = 0x0,
RESULT_NORMALQUAT = 0x1,
RESULT_COLOR = 0x2, RESULT_COLOR = 0x2,
RESULT_TEXCOORD0 = 0x3, RESULT_TEXCOORD0 = 0x3,
RESULT_TEXCOORD0W = 0x4,
RESULT_TEXCOORD1 = 0x5, RESULT_TEXCOORD1 = 0x5,
RESULT_TEXCOORD2 = 0x6 RESULT_TEXCOORD2 = 0x6,
RESULT_VIEW = 0x8
}SHDR_outType; }SHDR_outType;
typedef struct{ typedef struct{
@ -28,7 +31,8 @@ typedef struct{
typedef struct{ typedef struct{
u16 type; u16 type;
u16 regID; u16 regID;
u32 header; u8 mask;
u8 unk[3];
}DVLE_outEntry_s; }DVLE_outEntry_s;
typedef struct{ typedef struct{

23
libctru/source/gpu/shdr.c
View File

@ -119,19 +119,28 @@ void DVLE_SendOutmap(DVLE_s* dvle)
for(i=0;i<dvle->outTableSize;i++) for(i=0;i<dvle->outTableSize;i++)
{ {
u32* out=&param[dvle->outTableData[i].regID+1]; u32* out=&param[dvle->outTableData[i].regID+1];
u32 mask=0x00000000;
u8 tmpmask=dvle->outTableData[i].mask;
mask=(mask<<8)|((tmpmask&8)?0xFF:0x00);tmpmask<<=1;
mask=(mask<<8)|((tmpmask&8)?0xFF:0x00);tmpmask<<=1;
mask=(mask<<8)|((tmpmask&8)?0xFF:0x00);tmpmask<<=1;
mask=(mask<<8)|((tmpmask&8)?0xFF:0x00);tmpmask<<=1;
if(*out==0x1F1F1F1F)numAttr++; if(*out==0x1F1F1F1F)numAttr++;
//desc could include masking/swizzling info not currently taken into account u32 val=0x1F1F1F1F;
//also TODO : map out other output register values
switch(dvle->outTableData[i].type) switch(dvle->outTableData[i].type)
{ {
case RESULT_POSITION: *out=0x03020100; break; case RESULT_POSITION: val=0x03020100; break;
case RESULT_COLOR: *out=0x0B0A0908; break; case RESULT_NORMALQUAT: val=0x07060504; break;
case RESULT_TEXCOORD0: *out=0x1F1F0D0C; break; case RESULT_COLOR: val=0x0B0A0908; break;
case RESULT_TEXCOORD1: *out=0x1F1F0F0E; break; case RESULT_TEXCOORD0: val=0x1F1F0D0C; break;
case RESULT_TEXCOORD2: *out=0x1F1F1716; break; case RESULT_TEXCOORD0W: val=0x10101010; break;
case RESULT_TEXCOORD1: val=0x1F1F0F0E; break;
case RESULT_TEXCOORD2: val=0x1F1F1716; break;
case RESULT_VIEW: val=0x1F141312; break;
} }
*out=((*out)&~mask)|(val&mask);
attrMask|=1<<dvle->outTableData[i].regID; attrMask|=1<<dvle->outTableData[i].regID;
if(dvle->outTableData[i].regID+1>maxAttr)maxAttr=dvle->outTableData[i].regID+1; if(dvle->outTableData[i].regID+1>maxAttr)maxAttr=dvle->outTableData[i].regID+1;