Skip to content

Commit bff01aa

Browse files
XProgerXProger
committed
#368 rasterizer functions renaming
1 parent 9bcc846 commit bff01aa

File tree

9 files changed

+63
-63
lines changed

9 files changed

+63
-63
lines changed

‎src/platform/gba/rasterizeF_mode4.s renamed to ‎src/platform/gba/rasterizeF.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ LMAP .req Lx
2424
pair .req DIVLUT
2525
blocks .req DIVLUT
2626

27-
.global rasterizeF_mode4_asm
28-
rasterizeF_mode4_asm:
27+
.global rasterizeF_asm
28+
rasterizeF_asm:
2929
stmfd sp!, {r4-r11, lr}
3030

3131
mov LMAP, #LMAP_ADDR

‎src/platform/gba/rasterizeFT_mode4.s renamed to ‎src/platform/gba/rasterizeFT.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ SP_RDT = 12
8080
#endif
8181
.endm
8282

83-
.global rasterizeFT_mode4_asm
84-
rasterizeFT_mode4_asm:
83+
.global rasterizeFT_asm
84+
rasterizeFT_asm:
8585
stmfd sp!, {r4-r11, lr}
8686
sub sp, #16 // reserve stack space for [Ldx, Ldt, Rdx, Rdt]
8787

‎src/platform/gba/rasterizeFTA_mode4.s renamed to ‎src/platform/gba/rasterizeFTA.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ SP_RDT = 12
7777
add tmp, #2
7878
.endm
7979

80-
.global rasterizeFTA_mode4_asm
81-
rasterizeFTA_mode4_asm:
80+
.global rasterizeFTA_asm
81+
rasterizeFTA_asm:
8282
stmfd sp!, {r4-r11, lr}
8383
sub sp, #16 // reserve stack space for [Ldx, Ldt, Rdx, Rdt]
8484

‎src/platform/gba/rasterizeG_mode4.s renamed to ‎src/platform/gba/rasterizeG.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ SP_RDG = 12
4747
add g, dgdx
4848
.endm
4949

50-
.global rasterizeG_mode4_asm
51-
rasterizeG_mode4_asm:
50+
.global rasterizeG_asm
51+
rasterizeG_asm:
5252
stmfd sp!, {r4-r11, lr}
5353
sub sp, #16 // reserve stack space for [Ldx, Ldg, Rdx, Rdg]
5454

‎src/platform/gba/rasterizeGT_mode4.s renamed to ‎src/platform/gba/rasterizeGT.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ SP_RDT = 20
109109
#endif
110110
.endm
111111

112-
.global rasterizeGT_mode4_asm
113-
rasterizeGT_mode4_asm:
112+
.global rasterizeGT_asm
113+
rasterizeGT_asm:
114114
stmfd sp!, {r4-r11, lr}
115115
sub sp, #24 // reserve stack space for [Ldx, Ldg, Ldt, Rdx, Rdg, Rdt]
116116

‎src/platform/gba/rasterizeGTA_mode4.s renamed to ‎src/platform/gba/rasterizeGTA.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ SP_RDT = 20
105105
add ptr, #2
106106
.endm
107107

108-
.global rasterizeGTA_mode4_asm
109-
rasterizeGTA_mode4_asm:
108+
.global rasterizeGTA_asm
109+
rasterizeGTA_asm:
110110
stmfd sp!, {r4-r11, lr}
111111
sub sp, #24 // reserve stack space for [Ldx, Ldg, Ldt, Rdx, Rdg, Rdt]
112112

‎src/platform/gba/rasterizeS_mode4.s renamed to ‎src/platform/gba/rasterizeS.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ indexB .req DIVLUT
2626
.shadow_lightmap:
2727
.word lightmap + 0x1A00
2828

29-
.global rasterizeS_mode4_asm
30-
rasterizeS_mode4_asm:
29+
.global rasterizeS_asm
30+
rasterizeS_asm:
3131
stmfd sp!, {r4-r11, lr}
3232

3333
ldr LMAP, .shadow_lightmap

‎src/platform/gba/rasterizer_mode13.h

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
extern uint8 lightmap[256 * 32];
77
extern const uint8* tile;
88

9-
#define rasterizeS rasterizeS_mode13_c
10-
#define rasterizeF rasterizeF_mode13_c
11-
#define rasterizeG rasterizeG_mode13_c
12-
#define rasterizeFT rasterizeFT_mode13_c
13-
#define rasterizeGT rasterizeGT_mode13_c
14-
#define rasterizeFTA rasterizeFTA_mode13_c
15-
#define rasterizeGTA rasterizeGTA_mode13_c
16-
#define rasterizeSprite rasterizeSprite_mode13_c
17-
18-
void rasterizeS_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink* R)
9+
#define rasterizeS rasterizeS_c
10+
#define rasterizeF rasterizeF_c
11+
#define rasterizeG rasterizeG_c
12+
#define rasterizeFT rasterizeFT_c
13+
#define rasterizeGT rasterizeGT_c
14+
#define rasterizeFTA rasterizeFTA_c
15+
#define rasterizeGTA rasterizeGTA_c
16+
#define rasterizeSprite rasterizeSprite_c
17+
18+
void rasterizeS_c(uint16* pixel, const VertexLink* L, const VertexLink* R)
1919
{
2020
const uint8* ft_lightmap = &lightmap[0x1A00];
2121

@@ -123,7 +123,7 @@ void rasterizeS_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink* R
123123
}
124124
}
125125

126-
void rasterizeF_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink* R, int32 index)
126+
void rasterizeF_c(uint16* pixel, const VertexLink* L, const VertexLink* R, int32 index)
127127
{
128128
uint16 color = lightmap[(L->v.g << 8) | index];
129129
color |= (color << 8);
@@ -228,7 +228,7 @@ void rasterizeF_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink* R
228228
}
229229
}
230230

231-
void rasterizeG_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink* R, int32 index)
231+
void rasterizeG_c(uint16* pixel, const VertexLink* L, const VertexLink* R, int32 index)
232232
{
233233
int32 Lh = 0, Rh = 0;
234234
int32 Lx, Rx, Ldx = 0, Rdx = 0;
@@ -350,7 +350,7 @@ void rasterizeG_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink* R
350350
}
351351
}
352352

353-
void rasterizeFT_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink* R)
353+
void rasterizeFT_c(uint16* pixel, const VertexLink* L, const VertexLink* R)
354354
{
355355
const uint8* ft_lightmap = &lightmap[L->v.g << 8];
356356

@@ -477,7 +477,7 @@ void rasterizeFT_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink*
477477
}
478478
}
479479

480-
void rasterizeGT_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink* R)
480+
void rasterizeGT_c(uint16* pixel, const VertexLink* L, const VertexLink* R)
481481
{
482482
#ifdef ALIGNED_LIGHTMAP
483483
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*
638638
}
639639
}
640640

641-
void rasterizeFTA_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink* R)
641+
void rasterizeFTA_c(uint16* pixel, const VertexLink* L, const VertexLink* R)
642642
{
643643
const uint8* ft_lightmap = &lightmap[L->v.g << 8];
644644

@@ -784,12 +784,12 @@ void rasterizeFTA_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink*
784784
}
785785
}
786786

787-
void rasterizeGTA_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink* R)
787+
void rasterizeGTA_c(uint16* pixel, const VertexLink* L, const VertexLink* R)
788788
{
789789
rasterizeFTA(pixel, L, R);
790790
}
791791

792-
void rasterizeSprite_mode13_c(uint16* pixel, const VertexLink* L, const VertexLink* R)
792+
void rasterizeSprite_c(uint16* pixel, const VertexLink* L, const VertexLink* R)
793793
{
794794
// TODO
795795
}

‎src/platform/gba/rasterizer_mode4.h

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,34 @@ extern const uint8* tile;
99
#ifdef USE_ASM
1010
extern "C" {
1111
void rasterize_dummy(uint16* pixel, const VertexLink* L, const VertexLink* R);
12-
void rasterizeS_mode4_asm(uint16* pixel, const VertexLink* L, const VertexLink* R);
13-
void rasterizeF_mode4_asm(uint16* pixel, const VertexLink* L, const VertexLink* R, int32 index);
14-
void rasterizeG_mode4_asm(uint16* pixel, const VertexLink* L, const VertexLink* R, int32 index);
15-
void rasterizeFT_mode4_asm(uint16* pixel, const VertexLink* L, const VertexLink* R);
16-
void rasterizeGT_mode4_asm(uint16* pixel, const VertexLink* L, const VertexLink* R);
17-
void rasterizeFTA_mode4_asm(uint16* pixel, const VertexLink* L, const VertexLink* R);
18-
void rasterizeGTA_mode4_asm(uint16* pixel, const VertexLink* L, const VertexLink* R);
12+
void rasterizeS_asm(uint16* pixel, const VertexLink* L, const VertexLink* R);
13+
void rasterizeF_asm(uint16* pixel, const VertexLink* L, const VertexLink* R, int32 index);
14+
void rasterizeG_asm(uint16* pixel, const VertexLink* L, const VertexLink* R, int32 index);
15+
void rasterizeFT_asm(uint16* pixel, const VertexLink* L, const VertexLink* R);
16+
void rasterizeGT_asm(uint16* pixel, const VertexLink* L, const VertexLink* R);
17+
void rasterizeFTA_asm(uint16* pixel, const VertexLink* L, const VertexLink* R);
18+
void rasterizeGTA_asm(uint16* pixel, const VertexLink* L, const VertexLink* R);
1919
}
2020

21-
#define rasterizeS rasterizeS_mode4_asm
22-
#define rasterizeF rasterizeF_mode4_asm
23-
#define rasterizeG rasterizeG_mode4_asm
24-
#define rasterizeFT rasterizeFT_mode4_asm
25-
#define rasterizeGT rasterizeGT_mode4_asm
26-
#define rasterizeFTA rasterizeFTA_mode4_asm
27-
#define rasterizeGTA rasterizeGTA_mode4_asm
28-
#define rasterizeSprite rasterizeSprite_mode4_c
21+
#define rasterizeS rasterizeS_asm
22+
#define rasterizeF rasterizeF_asm
23+
#define rasterizeG rasterizeG_asm
24+
#define rasterizeFT rasterizeFT_asm
25+
#define rasterizeGT rasterizeGT_asm
26+
#define rasterizeFTA rasterizeFTA_asm
27+
#define rasterizeGTA rasterizeGTA_asm
28+
#define rasterizeSprite rasterizeSprite_c
2929
#else
30-
#define rasterizeS rasterizeS_mode4_c
31-
#define rasterizeF rasterizeF_mode4_c
32-
#define rasterizeG rasterizeG_mode4_c
33-
#define rasterizeFT rasterizeFT_mode4_c
34-
#define rasterizeGT rasterizeGT_mode4_c
35-
#define rasterizeFTA rasterizeFTA_mode4_c
36-
#define rasterizeGTA rasterizeGTA_mode4_c
37-
#define rasterizeSprite rasterizeSprite_mode4_c
38-
39-
void rasterizeS_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* R)
30+
#define rasterizeS rasterizeS_c
31+
#define rasterizeF rasterizeF_c
32+
#define rasterizeG rasterizeG_c
33+
#define rasterizeFT rasterizeFT_c
34+
#define rasterizeGT rasterizeGT_c
35+
#define rasterizeFTA rasterizeFTA_c
36+
#define rasterizeGTA rasterizeGTA_c
37+
#define rasterizeSprite rasterizeSprite_c
38+
39+
void rasterizeS_c(uint16* pixel, const VertexLink* L, const VertexLink* R)
4040
{
4141
const uint8* ft_lightmap = &lightmap[0x1A00];
4242

@@ -142,7 +142,7 @@ void rasterizeS_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* R)
142142
}
143143
}
144144

145-
void rasterizeF_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* R, int32 index)
145+
void rasterizeF_c(uint16* pixel, const VertexLink* L, const VertexLink* R, int32 index)
146146
{
147147
uint16 color = lightmap[(L->v.g << 8) | index];
148148
color |= (color << 8);
@@ -249,7 +249,7 @@ void rasterizeF_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* R,
249249
}
250250
}
251251

252-
void rasterizeG_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* R, int32 index)
252+
void rasterizeG_c(uint16* pixel, const VertexLink* L, const VertexLink* R, int32 index)
253253
{
254254
int32 Lh = 0, Rh = 0;
255255
int32 Lx, Rx, Ldx = 0, Rdx = 0;
@@ -373,7 +373,7 @@ void rasterizeG_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* R,
373373
}
374374
}
375375

376-
void rasterizeFT_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* R)
376+
void rasterizeFT_c(uint16* pixel, const VertexLink* L, const VertexLink* R)
377377
{
378378
const uint8* ft_lightmap = &lightmap[L->v.g << 8];
379379

@@ -499,7 +499,7 @@ void rasterizeFT_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* R
499499
}
500500
}
501501

502-
void rasterizeGT_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* R)
502+
void rasterizeGT_c(uint16* pixel, const VertexLink* L, const VertexLink* R)
503503
{
504504
#ifdef ALIGNED_LIGHTMAP
505505
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
657657
}
658658
}
659659

660-
void rasterizeFTA_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* R)
660+
void rasterizeFTA_c(uint16* pixel, const VertexLink* L, const VertexLink* R)
661661
{
662662
const uint8* ft_lightmap = &lightmap[L->v.g << 8];
663663

@@ -794,7 +794,7 @@ void rasterizeFTA_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink*
794794
}
795795
}
796796

797-
void rasterizeGTA_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* R)
797+
void rasterizeGTA_c(uint16* pixel, const VertexLink* L, const VertexLink* R)
798798
{
799799
#ifdef ALIGNED_LIGHTMAP
800800
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*
973973
#endif
974974

975975
// TODO ARM version
976-
void rasterizeSprite_mode4_c(uint16* pixel, const VertexLink* L, const VertexLink* R)
976+
void rasterizeSprite_c(uint16* pixel, const VertexLink* L, const VertexLink* R)
977977
{
978978
const uint8* ft_lightmap = &lightmap[L->v.g << 8];
979979

0 commit comments

Comments
 (0)