port: don't use s32s for texture pointers

This commit is contained in:
fgsfds committed 2023-08-13 01:13:03 +02:00
1 parent 0f0e674f71
commit c007bee536
4 files changed
+14 -8

No files matched your search

+1 -1
View File
@@ -32,7 +32,7 @@ struct tex *texFindInPool(s32 texturenum, struct texpool *pool);
s32 texGetPoolFreeBytes(struct texpool *pool);
u8 *texGetPoolLeftPos(struct texpool *pool);
void texLoadFromDisplayList(Gfx *gdl, struct texpool *pool, s32 arg2);
void texLoad(s32 *updateword, struct texpool *pool, bool arg2);
void texLoad(texnum_t *updateword, struct texpool *pool, bool arg2);
void texLoadFromConfigs(struct textureconfig *configs, s32 numconfigs, struct texpool *pool, s32 arg3);
void texLoadFromTextureNum(u32 arg0, struct texpool *pool);
+9 -3
View File
@@ -30,6 +30,12 @@ typedef s32 MenuDialogHandlerResult;
typedef intptr_t MenuItemHandlerResult;
typedef s16 RoomNum;
#ifdef PLATFORM_N64
#define texnum_t s32
#else
#define texnum_t uintptr_t
#endif
// Float version of a graphics matrix, which has higher precision than an Mtx.
// Matrices are stored as Mtxfs then converted to an Mtx when passed to the GPU.
// Mtxs use a union and a long long int to force alignments. Mtxfs are not
@@ -3829,7 +3835,7 @@ struct menudata_training {
struct textureconfig {
union {
s32 texturenum;
texnum_t texturenum;
u8 *textureptr;
};
u8 width;
@@ -5767,8 +5773,8 @@ struct var8009dd78 {
};
struct texturepair {
s32 texturenum1;
s32 texturenum2;
texnum_t texturenum1;
texnum_t texturenum2;
};
struct collision {