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

Fix GPUCMD_Add with more than 256 words (thanks to iMackshun for testing)

Browse Source
This commit is contained in:
fincs 2019-01-18 00:38:47 +01:00
parent 5f3b369a81
commit b9b4d486a3
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libctru/source/gpu/gpu.c
View File

@ -22,14 +22,13 @@ void GPUCMD_AddRawCommands(const u32* cmd, u32 size)
gpuCmdBufOffset+=size; gpuCmdBufOffset+=size;
} }
void GPUCMD_Add(u32 header, const u32* param, u32 paramlength) static void GPUCMD_AddInternal(u32 header, const u32* param, u32 paramlength)
{ {
if(!paramlength)paramlength=1;
if(!gpuCmdBuf || gpuCmdBufOffset+paramlength+1>gpuCmdBufSize) if(!gpuCmdBuf || gpuCmdBufOffset+paramlength+1>gpuCmdBufSize)
svcBreak(USERBREAK_PANIC); // Shouldn't happen. svcBreak(USERBREAK_PANIC); // Shouldn't happen.
paramlength--; paramlength--;
header|=(paramlength&0x7ff)<<20; header|=(paramlength&0xff)<<20;
gpuCmdBuf[gpuCmdBufOffset]=param ? param[0] : 0; gpuCmdBuf[gpuCmdBufOffset]=param ? param[0] : 0;
gpuCmdBuf[gpuCmdBufOffset+1]=header; gpuCmdBuf[gpuCmdBufOffset+1]=header;
@ -45,6 +44,20 @@ void GPUCMD_Add(u32 header, const u32* param, u32 paramlength)
if(paramlength&1)gpuCmdBuf[gpuCmdBufOffset++]=0x00000000; //alignment if(paramlength&1)gpuCmdBuf[gpuCmdBufOffset++]=0x00000000; //alignment
} }
void GPUCMD_Add(u32 header, const u32* param, u32 paramlength)
{
if(!paramlength)paramlength=1;
while(paramlength)
{
u32 remaining = paramlength > 0x100 ? 0x100 : paramlength;
GPUCMD_AddInternal(header, param, remaining);
param += remaining;
paramlength -= remaining;
if(header & BIT(31)) header += remaining;
}
}
void GPUCMD_Split(u32** addr, u32* size) void GPUCMD_Split(u32** addr, u32* size)
{ {
GPUCMD_AddWrite(GPUREG_FINALIZE, 0x12345678); GPUCMD_AddWrite(GPUREG_FINALIZE, 0x12345678);