armsx/ARMSX1
0
0
Fork 0
mirror of https://github.com/ARMSX2/ARMSX1.git synced 2026-08-24 16:53:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix GPU DMA linked mode

Browse Source
This commit is contained in:
Lycoder
2023-06-10 14:11:50 -03:00
parent 7724b94a7e
commit 6622dd48df
3 changed files with 64 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
psx/dev/dma.c
-6
View File
@@ -151,8 +151,6 @@ void psx_dma_do_gpu_linked(psx_dma_t* dma) {
uint32_t size = hdr >> 24;
uint32_t addr = dma->gpu.madr;
log_error("GPU packet hdr=%08x, size=%02x", hdr, size);
while (true) {
while (size--) {
addr = (addr + (CHCR_STEP(gpu) ? -4 : 4)) & 0x1ffffc;
@@ -170,10 +168,6 @@ void psx_dma_do_gpu_linked(psx_dma_t* dma) {
hdr = psx_bus_read32(dma->bus, addr);
size = hdr >> 24;
if (!size) break;
log_error("GPU packet hdr=%08x, size=%02x", hdr, size);
}
}
psx/dev/gpu.c
+61 -14
View File
@@ -119,7 +119,7 @@ void gpu_render_flat_triangle(psx_gpu_t* gpu, vertex_t v0, vertex_t v1, vertex_t
}
void gpu_render_shaded_triangle(psx_gpu_t* gpu, vertex_t v0, vertex_t v1, vertex_t v2) {
vertex_t a, b, c;
vertex_t a, b, c, p;
a = v0;
@@ -148,9 +148,12 @@ void gpu_render_shaded_triangle(psx_gpu_t* gpu, vertex_t v0, vertex_t v1, vertex
for (int y = ymin; y < ymax; y++) {
for (int x = xmin; x < xmax; x++) {
int z0 = ((b.x - a.x) * (y - a.y)) - ((b.y - a.y) * (x - a.x));
int z1 = ((c.x - b.x) * (y - b.y)) - ((c.y - b.y) * (x - b.x));
int z2 = ((a.x - c.x) * (y - c.y)) - ((a.y - c.y) * (x - c.x));
p.x = x;
p.y = y;
float z0 = EDGE((float)b, (float)c, (float)p);
float z1 = EDGE((float)c, (float)a, (float)p);
float z2 = EDGE((float)a, (float)b, (float)p);
if ((z0 >= 0) && (z1 >= 0) && (z2 >= 0)) {
uint32_t cr = (z0 * ((a.c >> 0) & 0xff) + z1 * ((b.c >> 0) & 0xff) + z2 * ((c.c >> 0) & 0xff)) / area;
@@ -301,7 +304,7 @@ void gpu_cmd_30(psx_gpu_t* gpu) {
gpu->v2.x = gpu->buf[5] & 0xffff;
gpu->v2.y = gpu->buf[5] >> 16;
gpu_render_flat_triangle(gpu, gpu->v0, gpu->v1, gpu->v2, gpu->color);
gpu_render_shaded_triangle(gpu, gpu->v0, gpu->v1, gpu->v2);
gpu->state = GPU_STATE_RECV_CMD;
}
@@ -334,15 +337,57 @@ void gpu_cmd_38(psx_gpu_t* gpu) {
gpu->v3.x = gpu->buf[7] & 0xffff;
gpu->v3.y = gpu->buf[7] >> 16;
log_fatal("v0=(%u, %u, %06x), v1=(%u, %u, %06x), v2=(%u, %u, %06x), v3=(%u, %u, %06x)",
gpu->v0.x, gpu->v0.y, gpu->v0.c,
gpu->v1.x, gpu->v1.y, gpu->v1.c,
gpu->v2.x, gpu->v2.y, gpu->v2.c,
gpu->v3.x, gpu->v3.y, gpu->v3.c
);
// log_fatal("v0=(%u, %u, %06x), v1=(%u, %u, %06x), v2=(%u, %u, %06x), v3=(%u, %u, %06x)",
// gpu->v0.x, gpu->v0.y, gpu->v0.c,
// gpu->v1.x, gpu->v1.y, gpu->v1.c,
// gpu->v2.x, gpu->v2.y, gpu->v2.c,
// gpu->v3.x, gpu->v3.y, gpu->v3.c
// );
gpu_render_shaded_triangle(gpu, gpu->v1, gpu->v0, gpu->v2);
gpu_render_shaded_triangle(gpu, gpu->v3, gpu->v2, gpu->v1);
gpu_render_shaded_triangle(gpu, gpu->v0, gpu->v1, gpu->v2);
gpu_render_shaded_triangle(gpu, gpu->v1, gpu->v2, gpu->v3);
gpu->state = GPU_STATE_RECV_CMD;
}
} break;
}
}
// Monochrome Opaque Quadrilateral
void gpu_cmd_2c(psx_gpu_t* gpu) {
switch (gpu->state) {
case GPU_STATE_RECV_CMD: {
gpu->state = GPU_STATE_RECV_ARGS;
gpu->cmd_args_remaining = 8;
} break;
case GPU_STATE_RECV_ARGS: {
if (!gpu->cmd_args_remaining) {
gpu->state = GPU_STATE_RECV_DATA;
gpu->color = gpu->buf[0] & 0xffffff;
gpu->pal = gpu->buf[2] >> 16;
gpu->texp = gpu->buf[4] >> 16;
gpu->v0.tx = gpu->buf[2] & 0xff;
gpu->v0.ty = (gpu->buf[2] >> 8) & 0xff;
gpu->v1.tx = gpu->buf[4] & 0xff;
gpu->v1.ty = (gpu->buf[4] >> 8) & 0xff;
gpu->v2.tx = gpu->buf[6] & 0xff;
gpu->v2.ty = (gpu->buf[6] >> 8) & 0xff;
gpu->v3.tx = gpu->buf[8] & 0xff;
gpu->v3.ty = (gpu->buf[8] >> 8) & 0xff;
gpu->v0.x = gpu->buf[1] & 0xffff;
gpu->v0.y = gpu->buf[1] >> 16;
gpu->v1.x = gpu->buf[3] & 0xffff;
gpu->v1.y = gpu->buf[3] >> 16;
gpu->v2.x = gpu->buf[5] & 0xffff;
gpu->v2.y = gpu->buf[5] >> 16;
gpu->v3.x = gpu->buf[7] & 0xffff;
gpu->v3.y = gpu->buf[7] >> 16;
// fixme
gpu_render_flat_triangle(gpu, gpu->v0, gpu->v1, gpu->v2, 0x808080);
gpu_render_flat_triangle(gpu, gpu->v1, gpu->v2, gpu->v3, 0x808080);
gpu->state = GPU_STATE_RECV_CMD;
}
@@ -355,6 +400,7 @@ void psx_gpu_update_cmd(psx_gpu_t* gpu) {
case 0x00: /* nop */ break;
case 0x02: gpu_cmd_02(gpu); break;
case 0x28: gpu_cmd_28(gpu); break;
case 0x2c: gpu_cmd_2c(gpu); break;
case 0x30: gpu_cmd_30(gpu); break;
case 0x38: gpu_cmd_38(gpu); break;
case 0xa0: gpu_cmd_a0(gpu); break;
@@ -477,7 +523,8 @@ void psx_gpu_update(psx_gpu_t* gpu) {
if (gpu->cycles >= (PSX_CPU_SPEED / 60)) {
gpu->cycles -= (PSX_CPU_SPEED / 60);
psx_ic_irq(gpu->ic, IC_VBLANK);
// Don't fire IRQs for now
// psx_ic_irq(gpu->ic, IC_VBLANK);
}
}
psx/dev/gpu.h
+3 -1
View File
@@ -36,7 +36,8 @@ typedef void (*psx_gpu_event_callback_t)(psx_gpu_t*);
typedef struct {
int32_t x, y;
uint32_t c, t;
uint32_t c;
uint8_t tx, ty;
} vertex_t;
struct psx_gpu_t {
@@ -60,6 +61,7 @@ struct psx_gpu_t {
uint32_t addr;
uint32_t xcnt, ycnt;
vertex_t v0, v1, v2, v3;
uint32_t pal, texp;
// GPU state
uint32_t state;