mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-11 23:54:09 +02:00
Code Issues Releases Wiki Activity

GBA clear VRAM via DMA

Browse Source
This commit is contained in:
Timur Gagiev
2020-08-18 02:01:58 +03:00
parent 9e1234fc62
commit 801b0fd399
3 changed files with 36 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/platform/gba/common.h
View File

@@ -40,13 +40,8 @@
#ifdef _WIN32 #ifdef _WIN32
#define INLINE inline #define INLINE inline
#define MyDiv(Number, Divisor) ((Number) / (Divisor))
#else #else
#define INLINE __attribute__((always_inline)) inline #define INLINE __attribute__((always_inline)) inline
#define MyDiv(Number, Divisor) ((Number) / (Divisor))
//#define MyDiv(Number, Divisor) Div(Number, Divisor)
#endif #endif
typedef signed char int8; typedef signed char int8;

4
src/platform/gba/level.h
View File

@@ -464,8 +464,8 @@ bool checkPortal(int32 roomIndex, const Room::Portal &portal) {
if (z != 0) { if (z != 0) {
z >>= FOV_SHIFT; z >>= FOV_SHIFT;
x = MyDiv(x, z) + (FRAME_WIDTH / 2); x = (x / z) + (FRAME_WIDTH / 2);
y = MyDiv(y, z) + (FRAME_HEIGHT / 2); y = (y / z) + (FRAME_HEIGHT / 2);
} else { } else {
x = (x > 0) ? clip.x1 : clip.x0; x = (x > 0) ? clip.x1 : clip.x0;
y = (y > 0) ? clip.y1 : clip.y0; y = (y > 0) ? clip.y1 : clip.y0;

85
src/platform/gba/render.iwram.cpp
View File

@@ -22,11 +22,11 @@ extern const uint8* tiles[15];
extern const Texture* textures; extern const Texture* textures;
uint32 gVerticesCount = 0; uint32 gVerticesCount = 0;
EWRAM_DATA Vertex gVertices[MAX_VERTICES]; Vertex gVertices[MAX_VERTICES];
int32 gFacesCount = 0; int32 gFacesCount = 0;
Face gFaces[MAX_FACES]; EWRAM_DATA Face gFaces[MAX_FACES];
Face* gFacesSorted[MAX_FACES]; EWRAM_DATA Face* gFacesSorted[MAX_FACES];
const uint8* curTile; const uint8* curTile;
uint16 mipMask; uint16 mipMask;
@@ -311,29 +311,28 @@ void transform(const vec3s &v, int32 vg) {
Vertex &res = gVertices[gVerticesCount++]; Vertex &res = gVertices[gVerticesCount++];
int32 cz = DP43(m[2], v); int32 z = DP43(m[2], v);
// znear / zfar clip // znear / zfar clip
if (cz < MIN_DIST || cz >= MAX_DIST) { if (z < MIN_DIST || z >= MAX_DIST) {
res.z = -1; res.z = -1;
return; return;
} }
int32 cx = DP43(m[0], v); int32 x = DP43(m[0], v);
int32 cy = DP43(m[1], v); int32 y = DP43(m[1], v);
int32 fog = (8191 - vg) - (SQR(cz >> FIXED_SHIFT) >> 15); int32 fog = (8191 - vg) - (SQR(z >> FIXED_SHIFT) >> 15);
if (fog < 0) { if (fog < 0) {
fog = 0; fog = 0;
} }
cz >>= FOV_SHIFT; z >>= FOV_SHIFT;
cx = MyDiv(cx, cz) + (FRAME_WIDTH / 2); x = (x / z) + (FRAME_WIDTH / 2);
cy = MyDiv(cy, cz) + (FRAME_HEIGHT / 2); y = (y / z) + (FRAME_HEIGHT / 2);
cz >>= (FIXED_SHIFT - FOV_SHIFT);
res.x = cx; res.x = x;
res.y = cy; res.y = y;
res.z = cz; res.z = z >> (FIXED_SHIFT - FOV_SHIFT);;
res.clip = classify(&res); res.clip = classify(&res);
res.g = uint32(255 - (fog >> 5)) >> 3; res.g = uint32(255 - (fog >> 5)) >> 3;
@@ -494,8 +493,6 @@ INLINE void scanlineG(uint16* buffer, int32 x1, int32 x2, uint8 palIndex, uint32
*(uint16*)pixel = p; *(uint16*)pixel = p;
pixel += 1; pixel += 1;
} }
if (p == 0xFFFFFFFF) return;
} }
if (x2 & 1) if (x2 & 1)
@@ -567,8 +564,6 @@ INLINE void scanlineGT(uint16* buffer, int32 x1, int32 x2, uint32 g, uint32 t, i
*(uint16*)pixel = p; *(uint16*)pixel = p;
pixel += 1; pixel += 1;
} }
if (p == 0xFFFFFFFF) return;
} }
if (x2 & 1) if (x2 & 1)
@@ -578,8 +573,7 @@ INLINE void scanlineGT(uint16* buffer, int32 x1, int32 x2, uint32 g, uint32 t, i
#endif #endif
} }
void rasterizeG(uint16* buffer, int32 palIndex, Edge &L, Edge &R) void rasterizeG(uint16* buffer, int32 palIndex, Edge &L, Edge &R) {
{
while (1) while (1)
{ {
while (L.h <= 0) while (L.h <= 0)
@@ -672,8 +666,7 @@ void rasterizeGT(uint16* buffer, Edge &L, Edge &R)
} }
} }
void drawTriangle(const Face* face) void drawTriangle(const Face* face) {
{
Vertex *v1, *v2, *v3; Vertex *v1, *v2, *v3;
bool clipped = face->indices[0] == face->indices[1]; bool clipped = face->indices[0] == face->indices[1];
@@ -937,7 +930,7 @@ void faceAddPolyClip(uint16 flags, Vertex** poly, int32 pCount) {
#define LERP(a,b,t) (b + ((a - b) * t >> 16)) #define LERP(a,b,t) (b + ((a - b) * t >> 16))
#define CLIP_AXIS(x, y, edge, output) {\ #define CLIP_AXIS(x, y, edge, output) {\
uint32 t = MyDiv((edge - b->x) << 16, a->x - b->x);\ uint32 t = ((edge - b->x) << 16) / (a->x - b->x);\
Vertex* v = output + count++;\ Vertex* v = output + count++;\
v->x = edge;\ v->x = edge;\
v->y = LERP(a->y, b->y, t);\ v->y = LERP(a->y, b->y, t);\
@@ -1157,35 +1150,25 @@ void flush() {
void initRender() { void initRender() {
divTable[0] = 0; divTable[0] = 0;
for (uint32 i = 1; i < DIV_TABLE_SIZE; i++) { for (uint32 i = 1; i < DIV_TABLE_SIZE; i++) {
divTable[i] = MyDiv(1 << 16, i); divTable[i] = (1 << 16) / i;
} }
} }
void dmaClear(uint32 *dst, uint32 count) {
#ifdef WIN32
memset(dst, 0, count * 4);
#else
vu32 value = 0;
REG_DMA3SAD = (vu32)&value;
REG_DMA3DAD = (vu32)dst;
REG_DMA3CNT = count | (DMA_ENABLE | DMA32 | DMA_SRC_FIXED | DMA_DST_INC);
#endif
}
void clear() { void clear() {
uint32* dst = (uint32*)fb; #ifdef USE_MODE_5
dmaClear((uint32*)fb, (WIDTH * HEIGHT) >> 1);
#ifdef USE_MODE_5 #else
uint32* end = dst + (WIDTH * HEIGHT >> 1); dmaClear((uint32*)fb, (WIDTH * HEIGHT) >> 2);
#else #endif
uint32* end = dst + (WIDTH * HEIGHT >> 2);
#endif
while (dst < end) {
*dst++ = 0;
*dst++ = 0;
*dst++ = 0;
*dst++ = 0;
*dst++ = 0;
*dst++ = 0;
*dst++ = 0;
*dst++ = 0;
*dst++ = 0;
*dst++ = 0;
*dst++ = 0;
*dst++ = 0;
*dst++ = 0;
*dst++ = 0;
*dst++ = 0;
*dst++ = 0;
}
} }