Rename __GXData -> gx, fix more clangd warnings

zeldaret · Nov 7, 2024 · 990068e · 990068e
1 parent 050cc12
commit 990068e
Show file tree

Hide file tree

Showing 19 changed files with 547 additions and 539 deletions.
diff --git a/include/dolphin/gx/GXBump.h b/include/dolphin/gx/GXBump.h
@@ -16,6 +16,8 @@ void GXSetIndTexOrder(GXIndTexStageID stage, GXTexCoordID coord, GXTexMapID map)
 void GXSetNumIndStages(u8 num);
 void GXSetTevDirect(GXTevStageID stage);
 void GXSetTevIndWarp(GXTevStageID tevStage, GXIndTexStageID texStage, GXBool, GXBool, GXIndTexMtxID mtxID); // Might be incorrect
+void __GXFlushTextureState();
+void __GXUpdateBPMask();
 
 #ifdef __cplusplus
 };

diff --git a/include/dolphin/gx/GXInit.h b/include/dolphin/gx/GXInit.h
@@ -127,7 +127,7 @@ typedef struct _GXData {
 
 STATIC_ASSERT(sizeof(GXData) == 0x4F8);
 
-extern GXData* const __GXData;
+extern GXData* const gx;
 
 // Define register addresses.
 #define GX_CP_ADDR  (0x0C000000)
@@ -151,14 +151,14 @@ extern vu16* __memReg;
 #define GX_SET_PI_REG(offset, val)  (*(vu32*)((vu32*)(__piReg) + (offset)) = val)
 
 inline void GXSetWasteFlags() {
-    GXData* data = __GXData;
+    GXData* data = gx;
     data->dirtyState |= GX_DIRTY_SU_TEX | GX_DIRTY_BP_MASK;
     data->bpSentNot = 0;
 }
 
 static inline void set_x2(u16 value)
 {
-    __GXData->bpSentNot = value;
+    gx->bpSentNot = value;
 }
 
 #ifdef __cplusplus

diff --git a/include/dolphin/gx/GXTexture.h b/include/dolphin/gx/GXTexture.h
@@ -38,7 +38,7 @@ GXTlutRegionCallback GXSetTlutRegionCallback(GXTlutRegionCallback callback);
 void GXSetTexCoordScaleManually(GXTexCoordID coord, GXBool enable, u16 s_scale, u16 t_scale);
 void GXSetTexCoordBias(GXTexCoordID coord, GXBool s_enable, GXBool t_enable);
 
-void __SetSURegs();
+void __SetSURegs(u32 texImgIndex, u32 setUpRegIndex);
 void __GXSetSUTexRegs();
 void __GXSetTmemConfig(u32);
 

diff --git a/include/dolphin/vi/vi.h b/include/dolphin/vi/vi.h
@@ -137,6 +137,7 @@ void* VIGetCurrentFrameBuffer();
 void VISetBlack(BOOL);
 u32 VIGetRetraceCount();
 u32 VIGetDTVStatus();
+u32 VIGetTvFormat();
 
 vu16 __VIRegs[59] AT_ADDRESS(0xCC002000);