GPU : cleanup

diff --git a/gpu/source/main.c b/gpu/source/main.c
index 64dc01131d1b2d3d4c96c2d6ec9da552eb2ba938..b126d0e6b7e8475daedefaa71882b0a0027abdb4 100644 (file)
--- a/gpu/source/main.c
+++ b/gpu/source/main.c
@@ -102,12 +102,16 @@ int main()
                if(status==APP_RUNNING)
                {
                        u32 PAD=hidSharedMem[7];
-                       GPU_SetCommandBuffer(gpuCmd, gpuCmdSize, 0);
                        
                        u32 regData=PAD|0x01000000;
                        GSPGPU_WriteHWRegs(NULL, 0x202A04, &regData, 4);
 
-                       GPU_RunCommandBuffer(gxCmdBuf);
+                       GPUCMD_SetBuffer(gpuCmd, gpuCmdSize, 0);
+                       
+                       GPUCMD_AddSingleParam(0x0008025E, 0x00000000);
+
+                       GPUCMD_Finalize();
+                       GPUCMD_Run(gxCmdBuf);
 
                        swapBuffers();
                }

diff --git a/libctru/include/ctr/GPU.h b/libctru/include/ctr/GPU.h
index 6af3acd97c82e09e421b1a0f7d1b47faae34fb8c..7c9efb88dbae9e6df7a80d1367ab9d5ed491a9a3 100644 (file)
--- a/libctru/include/ctr/GPU.h
+++ b/libctru/include/ctr/GPU.h
@@ -2,8 +2,11 @@
 #define GPU_H
 
 void GPU_Init(Handle *gsphandle);
-void GPU_SetCommandBuffer(u32* adr, u32 size, u32 offset);
-void GPU_RunCommandBuffer(u32* gxbuf);
-void GPU_AddCommand(u32* cmd, u32 length);
+
+void GPUCMD_SetBuffer(u32* adr, u32 size, u32 offset);
+void GPUCMD_Run(u32* gxbuf);
+void GPUCMD_Add(u32 cmd, u32* param, u32 paramlength);
+void GPUCMD_AddSingleParam(u32 cmd, u32 param);
+void GPUCMD_Finalize();
 
 #endif

diff --git a/libctru/source/GPU.c b/libctru/source/GPU.c
index c9bc999076d16d1306f7f71e59c580ab750f2a35..09ec10efeb1ae98dfac23943dac04f3c01704c5d 100644 (file)
--- a/libctru/source/GPU.c
+++ b/libctru/source/GPU.c
@@ -7,112 +7,65 @@
 #include <ctr/GPU.h>
 #include <ctr/svc.h>
 
-const u32 gpuRegInitTable[]={0x1EF01000, 0x00000000,
-                                               0x1EF01080, 0x12345678,
-                                               0x1EF010C0, 0xFFFFFFF0,
-                                               0x1EF010D0, 0x00000001};
-
-const u32 gpuRegTopScreenInitTable[]={0x1EF00400, 0x000001C2,
-                                                               0x1EF00404, 0x000000D1,
-                                                               0x1EF00408, 0x000001C1,
-                                                               0x1EF0040C, 0x000001C1,
-                                                               0x1EF00410, 0x00000000,
-                                                               0x1EF00414, 0x000000CF,
-                                                               0x1EF00418, 0x000000D1,
-                                                               0x1EF0041C, 0x01C501C1,
-                                                               0x1EF00420, 0x00010000,
-                                                               0x1EF00424, 0x0000019D,
-                                                               0x1EF00428, 0x00000002,
-                                                               0x1EF0042C, 0x00000192,
-                                                               0x1EF00430, 0x00000192,
-                                                               0x1EF00434, 0x00000192,
-                                                               0x1EF00438, 0x00000001,
-                                                               0x1EF0043C, 0x00000002,
-                                                               0x1EF00440, 0x01960192,
-                                                               0x1EF00444, 0x00000000,
-                                                               0x1EF00448, 0x00000000,
-                                                               0x1EF0045C, 0x019000F0,
-                                                               0x1EF00460, 0x01C100D1,
-                                                               0x1EF00464, 0x01920002,
-                                                               0x1EF00470, 0x00080340,
-                                                               0x1EF0049C, 0x00000000,
-
-                                                               0x1EF00468, 0x18300000,
-                                                               0x1EF0046C, 0x18300000,
-                                                               0x1EF00494, 0x18300000,
-                                                               0x1EF00498, 0x18300000,
-                                                               0x1EF00478, 0x18300000};
-
 u32* gpuCmdBuf;
 u32 gpuCmdBufSize;
 u32 gpuCmdBufOffset;
 
-Result writeRegisterValues(Handle* handle, u32* table, u32 num)
-{
-       if(!table || !num)return -1;
-       int i;
-       Result ret;
-       for(i=0;i<num;i++)
-       {
-               if((ret=GSPGPU_WriteHWRegs(handle, GSP_REBASE_REG(table[0]), &table[1], 4)))return ret;
-               table+=2;
-       }
-       return 0;
-}
-
 void GPU_Init(Handle *gsphandle)
 {
-       u32 data;
-       u32 mask;
-
-       writeRegisterValues(gsphandle, (u32*)gpuRegInitTable, sizeof(gpuRegInitTable)/8);
-       writeRegisterValues(gsphandle, (u32*)gpuRegTopScreenInitTable, sizeof(gpuRegTopScreenInitTable)/8);
-
-       data=0x00;
-       mask=0xFF00;
-       GSPGPU_WriteHWRegsWithMask(gsphandle, GSP_REBASE_REG(0x1EF00C18), &data, 4, &mask, 4);
-       
-       data=0x70100;
-       GSPGPU_WriteHWRegs(gsphandle, GSP_REBASE_REG(0x1EF00004), &data, 4);
-
-       data=0x00;
-       mask=0xFF;
-       GSPGPU_WriteHWRegsWithMask(gsphandle, GSP_REBASE_REG(0x1EF0001C), &data, 4, &mask, 4);
-
-       mask=0xFF;
-       GSPGPU_WriteHWRegsWithMask(gsphandle, GSP_REBASE_REG(0x1EF0002C), &data, 4, &mask, 4);
-       
-       data=0x22221200;
-       GSPGPU_WriteHWRegsWithMask(gsphandle, GSP_REBASE_REG(0x1EF00050), &data, 4, &mask, 4);
-
-       data=0x0000FF52;
-       mask=0x00FF52FF;
-       GSPGPU_WriteHWRegsWithMask(gsphandle, GSP_REBASE_REG(0x1EF00054), &data, 4, &mask, 4);
-       
-       data=0x10501;
-       GSPGPU_WriteHWRegs(gsphandle, GSP_REBASE_REG(0x1EF00474), &data, 4);
-
        gpuCmdBuf=NULL;
        gpuCmdBufSize=0;
        gpuCmdBufOffset=0;
 }
 
-void GPU_SetCommandBuffer(u32* adr, u32 size, u32 offset)
+void GPUCMD_SetBuffer(u32* adr, u32 size, u32 offset)
 {
        gpuCmdBuf=adr;
        gpuCmdBufSize=size;
        gpuCmdBufOffset=offset;
 }
 
-void GPU_RunCommandBuffer(u32* gxbuf)
+void GPUCMD_Run(u32* gxbuf)
+{
+       GX_SetCommandList_First(gxbuf, gpuCmdBuf, gpuCmdBufOffset*4, NULL, 0, NULL, 0);
+       GX_SetCommandList_Last(gxbuf, gpuCmdBuf, gpuCmdBufOffset*4, 0x0);
+}
+
+void GPUCMD_Add(u32 cmd, u32* param, u32 paramlength)
+{
+       u32 zero=0x0;
+
+       if(!param || !paramlength)
+       {
+               paramlength=1;
+               param=&zero;
+       }
+
+       if(!gpuCmdBuf || gpuCmdBufOffset+paramlength+1>gpuCmdBufSize)return;
+
+       paramlength--;
+       cmd|=(paramlength&0x7ff)<<20;
+
+       gpuCmdBuf[gpuCmdBufOffset]=param[0];
+       gpuCmdBuf[gpuCmdBufOffset+1]=cmd;
+
+       if(paramlength)memcpy(&gpuCmdBuf[gpuCmdBufOffset+2], &param[1], paramlength*4);
+
+       gpuCmdBufOffset+=paramlength+2;
+
+       if(paramlength&1)gpuCmdBuf[gpuCmdBufOffset++]=0x00000000; //alignment
+}
+
+void GPUCMD_AddSingleParam(u32 cmd, u32 param)
 {
-       GX_SetCommandList_Last(gxbuf, gpuCmdBuf, gpuCmdBufOffset*4, 0x3);
+       GPUCMD_Add(cmd, &param, 1);
 }
 
-void GPU_AddCommand(u32* cmd, u32 length)
+void GPUCMD_Finalize()
 {
-       if(!cmd || !gpuCmdBuf || gpuCmdBufOffset+length>gpuCmdBufSize)return;
+       u32 cmd[2];
 
-       memcpy(&gpuCmdBuf[gpuCmdBufOffset], cmd, length*4);
-       gpuCmdBufOffset+=length;
+       GPUCMD_AddSingleParam(0x000F0111, 0x00000001);
+       GPUCMD_AddSingleParam(0x000F0110, 0x00000001);
+       GPUCMD_AddSingleParam(0x000F0010, 0x12345678);
 }