From bff01aa5bb75f53d568b8671813c64cc1be615c3 Mon Sep 17 00:00:00 2001 From: XProger Date: Thu, 30 Dec 2021 10:05:48 +0300 Subject: [PATCH] #368 rasterizer functions renaming --- .../gba/{rasterizeF_mode4.s => rasterizeF.s} | 4 +- .../{rasterizeFT_mode4.s => rasterizeFT.s} | 4 +- .../{rasterizeFTA_mode4.s => rasterizeFTA.s} | 4 +- .../gba/{rasterizeG_mode4.s => rasterizeG.s} | 4 +- .../{rasterizeGT_mode4.s => rasterizeGT.s} | 4 +- .../{rasterizeGTA_mode4.s => rasterizeGTA.s} | 4 +- .../gba/{rasterizeS_mode4.s => rasterizeS.s} | 4 +- src/platform/gba/rasterizer_mode13.h | 32 +++++----- src/platform/gba/rasterizer_mode4.h | 62 +++++++++---------- 9 files changed, 61 insertions(+), 61 deletions(-) rename src/platform/gba/{rasterizeF_mode4.s => rasterizeF.s} (98%) rename src/platform/gba/{rasterizeFT_mode4.s => rasterizeFT.s} (99%) rename src/platform/gba/{rasterizeFTA_mode4.s => rasterizeFTA.s} (99%) rename src/platform/gba/{rasterizeG_mode4.s => rasterizeG.s} (99%) rename src/platform/gba/{rasterizeGT_mode4.s => rasterizeGT.s} (99%) rename src/platform/gba/{rasterizeGTA_mode4.s => rasterizeGTA.s} (99%) rename src/platform/gba/{rasterizeS_mode4.s => rasterizeS.s} (98%) diff --git a/src/platform/gba/rasterizeF_mode4.s b/src/platform/gba/rasterizeF.s similarity index 98% rename from src/platform/gba/rasterizeF_mode4.s rename to src/platform/gba/rasterizeF.s index d7bf536..c3712fe 100644 --- a/src/platform/gba/rasterizeF_mode4.s +++ b/src/platform/gba/rasterizeF.s @@ -24,8 +24,8 @@ LMAP .req Lx pair .req DIVLUT blocks .req DIVLUT -.global rasterizeF_mode4_asm -rasterizeF_mode4_asm: +.global rasterizeF_asm +rasterizeF_asm: stmfd sp!, {r4-r11, lr} mov LMAP, #LMAP_ADDR diff --git a/src/platform/gba/rasterizeFT_mode4.s b/src/platform/gba/rasterizeFT.s similarity index 99% rename from src/platform/gba/rasterizeFT_mode4.s rename to src/platform/gba/rasterizeFT.s index 859715b..0dcc49a 100644 --- a/src/platform/gba/rasterizeFT_mode4.s +++ b/src/platform/gba/rasterizeFT.s @@ -80,8 +80,8 @@ SP_RDT = 12 #endif .endm -.global rasterizeFT_mode4_asm -rasterizeFT_mode4_asm: +.global rasterizeFT_asm +rasterizeFT_asm: stmfd sp!, {r4-r11, lr} sub sp, #16 // reserve stack space for [Ldx, Ldt, Rdx, Rdt] diff --git a/src/platform/gba/rasterizeFTA_mode4.s b/src/platform/gba/rasterizeFTA.s similarity index 99% rename from src/platform/gba/rasterizeFTA_mode4.s rename to src/platform/gba/rasterizeFTA.s index 010cfcf..a58ce2e 100644 --- a/src/platform/gba/rasterizeFTA_mode4.s +++ b/src/platform/gba/rasterizeFTA.s @@ -77,8 +77,8 @@ SP_RDT = 12 add tmp, #2 .endm -.global rasterizeFTA_mode4_asm -rasterizeFTA_mode4_asm: +.global rasterizeFTA_asm +rasterizeFTA_asm: stmfd sp!, {r4-r11, lr} sub sp, #16 // reserve stack space for [Ldx, Ldt, Rdx, Rdt] diff --git a/src/platform/gba/rasterizeG_mode4.s b/src/platform/gba/rasterizeG.s similarity index 99% rename from src/platform/gba/rasterizeG_mode4.s rename to src/platform/gba/rasterizeG.s index dec63f9..7707168 100644 --- a/src/platform/gba/rasterizeG_mode4.s +++ b/src/platform/gba/rasterizeG.s @@ -47,8 +47,8 @@ SP_RDG = 12 add g, dgdx .endm -.global rasterizeG_mode4_asm -rasterizeG_mode4_asm: +.global rasterizeG_asm +rasterizeG_asm: stmfd sp!, {r4-r11, lr} sub sp, #16 // reserve stack space for [Ldx, Ldg, Rdx, Rdg] diff --git a/src/platform/gba/rasterizeGT_mode4.s b/src/platform/gba/rasterizeGT.s similarity index 99% rename from src/platform/gba/rasterizeGT_mode4.s rename to src/platform/gba/rasterizeGT.s index 902200b..622f938 100644 --- a/src/platform/gba/rasterizeGT_mode4.s +++ b/src/platform/gba/rasterizeGT.s @@ -109,8 +109,8 @@ SP_RDT = 20 #endif .endm -.global rasterizeGT_mode4_asm -rasterizeGT_mode4_asm: +.global rasterizeGT_asm +rasterizeGT_asm: stmfd sp!, {r4-r11, lr} sub sp, #24 // reserve stack space for [Ldx, Ldg, Ldt, Rdx, Rdg, Rdt] diff --git a/src/platform/gba/rasterizeGTA_mode4.s b/src/platform/gba/rasterizeGTA.s similarity index 99% rename from src/platform/gba/rasterizeGTA_mode4.s rename to src/platform/gba/rasterizeGTA.s index 0ef5ad6..3dc0f1a 100644 --- a/src/platform/gba/rasterizeGTA_mode4.s +++ b/src/platform/gba/rasterizeGTA.s @@ -105,8 +105,8 @@ SP_RDT = 20 add ptr, #2 .endm -.global rasterizeGTA_mode4_asm -rasterizeGTA_mode4_asm: +.global rasterizeGTA_asm +rasterizeGTA_asm: stmfd sp!, {r4-r11, lr} sub sp, #24 // reserve stack space for [Ldx, Ldg, Ldt, Rdx, Rdg, Rdt] diff --git a/src/platform/gba/rasterizeS_mode4.s b/src/platform/gba/rasterizeS.s similarity index 98% rename from src/platform/gba/rasterizeS_mode4.s rename to src/platform/gba/rasterizeS.s index 380d660..74bd4eb 100644 --- a/src/platform/gba/rasterizeS_mode4.s +++ b/src/platform/gba/rasterizeS.s @@ -26,8 +26,8 @@ indexB .req DIVLUT .shadow_lightmap: .word lightmap + 0x1A00 -.global rasterizeS_mode4_asm -rasterizeS_mode4_asm: +.global rasterizeS_asm +rasterizeS_asm: stmfd sp!, {r4-r11, lr} ldr LMAP, .shadow_lightmap diff --git a/src/platform/gba/rasterizer_mode13.h b/src/platform/gba/rasterizer_mode13.h index 677273b..dc8e054 100644 --- a/src/platform/gba/rasterizer_mode13.h +++ b/src/platform/gba/rasterizer_mode13.h @@ -6,16 +6,16 @@ extern uint8 lightmap[256 * 32]; extern const uint8* tile; -#define rasterizeS rasterizeS_mode13_c -#define rasterizeF rasterizeF_mode13_c -#define rasterizeG rasterizeG_mode13_c -#define rasterizeFT rasterizeFT_mode13_c -#define rasterizeGT rasterizeGT_mode13_c -#define rasterizeFTA rasterizeFTA_mode13_c -#define rasterizeGTA rasterizeGTA_mode13_c -#define rasterizeSprite rasterizeSprite_mode13_c +#define rasterizeS rasterizeS_c +#define rasterizeF rasterizeF_c +#define rasterizeG rasterizeG_c +#define rasterizeFT rasterizeFT_c +#define rasterizeGT rasterizeGT_c +#define rasterizeFTA rasterizeFTA_c +#define rasterizeGTA rasterizeGTA_c +#define rasterizeSprite rasterizeSprite_c -void rasterizeS_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink* R) +void rasterizeS_c(uint16* pixel, const VertexLink* L, const VertexLink* R) { const uint8* ft_lightmap = &lightmap[0x1A00]; @@ -123,7 +123,7 @@ void rasterizeS_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink* R } } -void rasterizeF_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink* R, int32 index) +void rasterizeF_c(uint16* pixel, const VertexLink* L, const VertexLink* R, int32 index) { uint16 color = lightmap[(L->v.g << 8) | index]; color |= (color << 8); @@ -228,7 +228,7 @@ void rasterizeF_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink* R } } -void rasterizeG_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink* R, int32 index) +void rasterizeG_c(uint16* pixel, const VertexLink* L, const VertexLink* R, int32 index) { int32 Lh = 0, Rh = 0; int32 Lx, Rx, Ldx = 0, Rdx = 0; @@ -350,7 +350,7 @@ void rasterizeG_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink* R } } -void rasterizeFT_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink* R) +void rasterizeFT_c(uint16* pixel, const VertexLink* L, const VertexLink* R) { const uint8* ft_lightmap = &lightmap[L->v.g << 8]; @@ -477,7 +477,7 @@ void rasterizeFT_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink* } } -void rasterizeGT_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink* R) +void rasterizeGT_c(uint16* pixel, const VertexLink* L, const VertexLink* R) { #ifdef ALIGNED_LIGHTMAP ASSERT((intptr_t(lightmap) & 0xFFFF) == 0); // lightmap should be 64k aligned @@ -638,7 +638,7 @@ void rasterizeGT_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink* } } -void rasterizeFTA_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink* R) +void rasterizeFTA_c(uint16* pixel, const VertexLink* L, const VertexLink* R) { const uint8* ft_lightmap = &lightmap[L->v.g << 8]; @@ -784,12 +784,12 @@ void rasterizeFTA_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink* } } -void rasterizeGTA_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink* R) +void rasterizeGTA_c(uint16* pixel, const VertexLink* L, const VertexLink* R) { rasterizeFTA(pixel, L, R); } -void rasterizeSprite_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink* R) +void rasterizeSprite_c(uint16* pixel, const VertexLink* L, const VertexLink* R) { // TODO } diff --git a/src/platform/gba/rasterizer_mode4.h b/src/platform/gba/rasterizer_mode4.h index 2a2d8c9..f5309ec 100644 --- a/src/platform/gba/rasterizer_mode4.h +++ b/src/platform/gba/rasterizer_mode4.h @@ -9,34 +9,34 @@ extern const uint8* tile; #ifdef USE_ASM extern "C" { void rasterize_dummy(uint16* pixel, const VertexLink* L, const VertexLink* R); - void rasterizeS_mode4_asm(uint16* pixel, const VertexLink* L, const VertexLink* R); - void rasterizeF_mode4_asm(uint16* pixel, const VertexLink* L, const VertexLink* R, int32 index); - void rasterizeG_mode4_asm(uint16* pixel, const VertexLink* L, const VertexLink* R, int32 index); - void rasterizeFT_mode4_asm(uint16* pixel, const VertexLink* L, const VertexLink* R); - void rasterizeGT_mode4_asm(uint16* pixel, const VertexLink* L, const VertexLink* R); - void rasterizeFTA_mode4_asm(uint16* pixel, const VertexLink* L, const VertexLink* R); - void rasterizeGTA_mode4_asm(uint16* pixel, const VertexLink* L, const VertexLink* R); + void rasterizeS_asm(uint16* pixel, const VertexLink* L, const VertexLink* R); + void rasterizeF_asm(uint16* pixel, const VertexLink* L, const VertexLink* R, int32 index); + void rasterizeG_asm(uint16* pixel, const VertexLink* L, const VertexLink* R, int32 index); + void rasterizeFT_asm(uint16* pixel, const VertexLink* L, const VertexLink* R); + void rasterizeGT_asm(uint16* pixel, const VertexLink* L, const VertexLink* R); + void rasterizeFTA_asm(uint16* pixel, const VertexLink* L, const VertexLink* R); + void rasterizeGTA_asm(uint16* pixel, const VertexLink* L, const VertexLink* R); } - #define rasterizeS rasterizeS_mode4_asm - #define rasterizeF rasterizeF_mode4_asm - #define rasterizeG rasterizeG_mode4_asm - #define rasterizeFT rasterizeFT_mode4_asm - #define rasterizeGT rasterizeGT_mode4_asm - #define rasterizeFTA rasterizeFTA_mode4_asm - #define rasterizeGTA rasterizeGTA_mode4_asm - #define rasterizeSprite rasterizeSprite_mode4_c + #define rasterizeS rasterizeS_asm + #define rasterizeF rasterizeF_asm + #define rasterizeG rasterizeG_asm + #define rasterizeFT rasterizeFT_asm + #define rasterizeGT rasterizeGT_asm + #define rasterizeFTA rasterizeFTA_asm + #define rasterizeGTA rasterizeGTA_asm + #define rasterizeSprite rasterizeSprite_c #else - #define rasterizeS rasterizeS_mode4_c - #define rasterizeF rasterizeF_mode4_c - #define rasterizeG rasterizeG_mode4_c - #define rasterizeFT rasterizeFT_mode4_c - #define rasterizeGT rasterizeGT_mode4_c - #define rasterizeFTA rasterizeFTA_mode4_c - #define rasterizeGTA rasterizeGTA_mode4_c - #define rasterizeSprite rasterizeSprite_mode4_c + #define rasterizeS rasterizeS_c + #define rasterizeF rasterizeF_c + #define rasterizeG rasterizeG_c + #define rasterizeFT rasterizeFT_c + #define rasterizeGT rasterizeGT_c + #define rasterizeFTA rasterizeFTA_c + #define rasterizeGTA rasterizeGTA_c + #define rasterizeSprite rasterizeSprite_c -void rasterizeS_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* R) +void rasterizeS_c(uint16* pixel, const VertexLink* L, const VertexLink* R) { const uint8* ft_lightmap = &lightmap[0x1A00]; @@ -142,7 +142,7 @@ void rasterizeS_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* R) } } -void rasterizeF_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* R, int32 index) +void rasterizeF_c(uint16* pixel, const VertexLink* L, const VertexLink* R, int32 index) { uint16 color = lightmap[(L->v.g << 8) | index]; color |= (color << 8); @@ -249,7 +249,7 @@ void rasterizeF_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* R, } } -void rasterizeG_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* R, int32 index) +void rasterizeG_c(uint16* pixel, const VertexLink* L, const VertexLink* R, int32 index) { int32 Lh = 0, Rh = 0; int32 Lx, Rx, Ldx = 0, Rdx = 0; @@ -373,7 +373,7 @@ void rasterizeG_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* R, } } -void rasterizeFT_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* R) +void rasterizeFT_c(uint16* pixel, const VertexLink* L, const VertexLink* R) { const uint8* ft_lightmap = &lightmap[L->v.g << 8]; @@ -499,7 +499,7 @@ void rasterizeFT_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* R } } -void rasterizeGT_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* R) +void rasterizeGT_c(uint16* pixel, const VertexLink* L, const VertexLink* R) { #ifdef ALIGNED_LIGHTMAP ASSERT((intptr_t(lightmap) & 0xFFFF) == 0); // lightmap should be 64k aligned @@ -657,7 +657,7 @@ void rasterizeGT_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* R } } -void rasterizeFTA_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* R) +void rasterizeFTA_c(uint16* pixel, const VertexLink* L, const VertexLink* R) { const uint8* ft_lightmap = &lightmap[L->v.g << 8]; @@ -794,7 +794,7 @@ void rasterizeFTA_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* } } -void rasterizeGTA_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* R) +void rasterizeGTA_c(uint16* pixel, const VertexLink* L, const VertexLink* R) { #ifdef ALIGNED_LIGHTMAP ASSERT((intptr_t(lightmap) & 0xFFFF) == 0); // lightmap should be 64k aligned @@ -973,7 +973,7 @@ void rasterizeGTA_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* #endif // TODO ARM version -void rasterizeSprite_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* R) +void rasterizeSprite_c(uint16* pixel, const VertexLink* L, const VertexLink* R) { const uint8* ft_lightmap = &lightmap[L->v.g << 8];