diff options
| author | coco875 <59367621+coco875@users.noreply.github.com> | 2025-07-03 12:38:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-03 06:38:28 -0600 |
| commit | 23b6478ce6ae4b264821e08875f17f80e6deec2e (patch) | |
| tree | 03b9788f04ff75d52d7b8be7d33a90f6e47306a9 /include | |
| parent | f9d2b51a53046b8ae9f15a11e969e466fa0e741a (diff) | |
Fix small mistake (#409)
* Update other_textures.yml
* Update menu_items.c
* remove mkload
---------
Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/mk64.h | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/include/mk64.h b/include/mk64.h index fabd57254..110db58af 100644 --- a/include/mk64.h +++ b/include/mk64.h @@ -142,39 +142,6 @@ void gSPInvalidateTexCache(Gfx* pkt, uintptr_t texAddr); #define TEXTURE_LOAD_FIX 2 #define TEXTURE_SIZE_FIX 1 -// Dumb hack to fix load tile size on higher than native resolutions -#define gMKLoadTextureTile(pkt, timg, fmt, siz, width, height, uls, ult, lrs, lrt, pal, cms, cmt, masks, maskt, \ - shifts, shiftt) \ - _DW({ \ - gDPSetTextureImage(pkt, fmt, siz, width, timg); \ - gDPSetTile(pkt, fmt, siz, (((((lrs) - (uls) + 1) * siz##_TILE_BYTES) + 7) >> 3), 0, G_TX_LOADTILE, 0, cmt, \ - maskt, shiftt, cms, masks, shifts); \ - gDPLoadSync(pkt); \ - gDPLoadTile(pkt, G_TX_LOADTILE, (uls) << G_TEXTURE_IMAGE_FRAC, (ult) << G_TEXTURE_IMAGE_FRAC, \ - (lrs) << G_TEXTURE_IMAGE_FRAC, (lrt + TEXTURE_LOAD_FIX) << G_TEXTURE_IMAGE_FRAC); \ - gDPPipeSync(pkt); \ - gDPSetTile(pkt, fmt, siz, (((((lrs) - (uls) + 1) * siz##_LINE_BYTES) + 7) >> 3), 0, G_TX_RENDERTILE, pal, cmt, \ - maskt, shiftt, cms, masks, shifts); \ - gDPSetTileSize(pkt, G_TX_RENDERTILE, (uls) << G_TEXTURE_IMAGE_FRAC, (ult) << G_TEXTURE_IMAGE_FRAC, \ - (lrs) << G_TEXTURE_IMAGE_FRAC, (lrt - TEXTURE_SIZE_FIX) << G_TEXTURE_IMAGE_FRAC); \ - }) - -#define gMKLoadTextureTile_4b(pkt, timg, fmt, width, height, uls, ult, lrs, lrt, pal, cms, cmt, masks, maskt, shifts, \ - shiftt) \ - _DW({ \ - gDPSetTextureImage(pkt, fmt, G_IM_SIZ_8b, ((width) >> 1), timg); \ - gDPSetTile(pkt, fmt, G_IM_SIZ_8b, (((((lrs) - (uls) + 1) >> 1) + 7) >> 3), 0, G_TX_LOADTILE, 0, cmt, maskt, \ - shiftt, cms, masks, shifts); \ - gDPLoadSync(pkt); \ - gDPLoadTile(pkt, G_TX_LOADTILE, (uls) << (G_TEXTURE_IMAGE_FRAC - 1), (ult) << (G_TEXTURE_IMAGE_FRAC), \ - (lrs) << (G_TEXTURE_IMAGE_FRAC - 1), (lrt + TEXTURE_LOAD_FIX) << (G_TEXTURE_IMAGE_FRAC)); \ - gDPPipeSync(pkt); \ - gDPSetTile(pkt, fmt, G_IM_SIZ_4b, (((((lrs) - (uls) + 1) >> 1) + 7) >> 3), 0, G_TX_RENDERTILE, pal, cmt, \ - maskt, shiftt, cms, masks, shifts); \ - gDPSetTileSize(pkt, G_TX_RENDERTILE, (uls) << G_TEXTURE_IMAGE_FRAC, (ult) << G_TEXTURE_IMAGE_FRAC, \ - (lrs) << G_TEXTURE_IMAGE_FRAC, (lrt - TEXTURE_SIZE_FIX) << G_TEXTURE_IMAGE_FRAC); \ - }) - #ifdef __cplusplus } #endif |