diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2026-09-25 19:15:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-09-25 19:15:55 -0400 |
| commit | 2fbb91bbe2fb7c20b44af5f9f0511f4969dd37a8 (patch) | |
| tree | 9508706465c91158963197e02af563ea1cdf7cf2 /include/JSystem/J3DGraphBase | |
| parent | 96bbf3e97e11f8b3cd1ad758652834f7bb7a67cc (diff) | |
| parent | 94fb9e0e41cc678c0f91843bb783facce3410b44 (diff) | |
Merge pull request #1218 from SuperDude88/main
More Consistent Macro Usage
Diffstat (limited to 'include/JSystem/J3DGraphBase')
| -rw-r--r-- | include/JSystem/J3DGraphBase/J3DStruct.h | 8 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphBase/J3DTransform.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/JSystem/J3DGraphBase/J3DStruct.h b/include/JSystem/J3DGraphBase/J3DStruct.h index c219877d..e624205c 100644 --- a/include/JSystem/J3DGraphBase/J3DStruct.h +++ b/include/JSystem/J3DGraphBase/J3DStruct.h @@ -157,7 +157,7 @@ struct J3DIndTexOrderInfo { }; struct J3DTevSwapModeInfo { - /* 0x0 */ u8 mRasSel ALIGN_DECL(4); + /* 0x0 */ ALIGN_DECL(4, u8 mRasSel); /* 0x1 */ u8 mTexSel; }; @@ -192,7 +192,7 @@ struct J3DTevStageInfo { }; struct J3DIndTevStageInfo { - /* 0x0 */ u8 mIndStage ALIGN_DECL(4); + /* 0x0 */ ALIGN_DECL(4, u8 mIndStage); /* 0x1 */ u8 mIndFormat; /* 0x2 */ u8 mBiasSel; /* 0x3 */ u8 mMtxSel; @@ -210,7 +210,7 @@ struct J3DTexCoordInfo { mTexGenMtx = other.mTexGenMtx; } - /* 0x0 */ u8 mTexGenType ALIGN_DECL(4); + /* 0x0 */ ALIGN_DECL(4, u8 mTexGenType); /* 0x1 */ u8 mTexGenSrc; /* 0x2 */ u8 mTexGenMtx; }; @@ -235,7 +235,7 @@ struct J3DBlendInfo { }; struct J3DTevOrderInfo { - /* 0x0 */ u8 mTexCoord ALIGN_DECL(2); + /* 0x0 */ ALIGN_DECL(2, u8 mTexCoord); /* 0x1 */ u8 mTexMap; /* 0x2 */ u8 mColorChan; }; diff --git a/include/JSystem/J3DGraphBase/J3DTransform.h b/include/JSystem/J3DGraphBase/J3DTransform.h index d6f24aff..30a65c20 100644 --- a/include/JSystem/J3DGraphBase/J3DTransform.h +++ b/include/JSystem/J3DGraphBase/J3DTransform.h @@ -42,7 +42,7 @@ void J3DPSMtx33Copy(Mtx3P src, Mtx3P dst); void J3DPSMtx33CopyFrom34(MtxP src, Mtx3P dst); void J3DPSMtxArrayConcat(Mtx, Mtx, Mtx, u32); -inline void J3DPSMulMtxVec(register MtxP mtx, register Vec* vec, register Vec* dst) { +inline void J3DPSMulMtxVec(__REGISTER MtxP mtx, __REGISTER Vec* vec, __REGISTER Vec* dst) { #ifdef __MWERKS__ asm { psq_l f0, 0(vec), 0, 0 @@ -69,7 +69,7 @@ inline void J3DPSMulMtxVec(register MtxP mtx, register Vec* vec, register Vec* d #endif } -inline void J3DPSMulMtxVec(register MtxP mtx, register S16Vec* vec, register S16Vec* dst) { +inline void J3DPSMulMtxVec(__REGISTER MtxP mtx, __REGISTER S16Vec* vec, __REGISTER S16Vec* dst) { #ifdef __MWERKS__ asm { psq_l f0, 0(vec), 0, 7 @@ -97,7 +97,7 @@ inline void J3DPSMulMtxVec(register MtxP mtx, register S16Vec* vec, register S16 } // regalloc issues -inline void J3DPSMulMtxVec(register Mtx3P mtx, register Vec* vec, register Vec* dst) { +inline void J3DPSMulMtxVec(__REGISTER Mtx3P mtx, __REGISTER Vec* vec, __REGISTER Vec* dst) { #ifdef __MWERKS__ asm { lis r6, PSMulUnit01@ha @@ -129,7 +129,7 @@ inline void J3DPSMulMtxVec(register Mtx3P mtx, register Vec* vec, register Vec* } // regalloc issues -inline void J3DPSMulMtxVec(register Mtx3P mtx, register S16Vec* vec, register S16Vec* dst) { +inline void J3DPSMulMtxVec(__REGISTER Mtx3P mtx, __REGISTER S16Vec* vec, __REGISTER S16Vec* dst) { #ifdef __MWERKS__ asm { lis r6, PSMulUnit01@ha |