1
0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-09 06:36:59 +02:00

#368 rasterizer functions renaming

This commit is contained in:
XProger
2021-12-30 10:05:48 +03:00
parent 9bcc8468d0
commit bff01aa5bb
9 changed files with 61 additions and 61 deletions

View File

@@ -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

View File

@@ -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]

View File

@@ -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]

View File

@@ -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]

View File

@@ -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]

View File

@@ -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]

View File

@@ -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

View File

@@ -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
}

View File

@@ -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];