X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fgpu_neon%2Fpsx_gpu%2Fpsx_gpu_main.c;h=1eadc794dee67b619dd64712bdf84bd836452cb2;hp=97f62caf7d4da6cd13f2ea0f298d7ae8a66b40e5;hb=de35a4641acce078961c2e748e1b6da6fe8d8b70;hpb=75e28f62b2a50044b58075d63d207409e0148409 diff --git a/plugins/gpu_neon/psx_gpu/psx_gpu_main.c b/plugins/gpu_neon/psx_gpu/psx_gpu_main.c index 97f62caf..1eadc794 100644 --- a/plugins/gpu_neon/psx_gpu/psx_gpu_main.c +++ b/plugins/gpu_neon/psx_gpu/psx_gpu_main.c @@ -64,6 +64,7 @@ typedef struct static gpu_dump_struct state; psx_gpu_struct __attribute__((aligned(256))) _psx_gpu; +u16 __attribute__((aligned(256))) _vram[1024 * 512]; #define percent_of(numerator, denominator) \ ((((double)(numerator)) / (denominator)) * 100.0) \ @@ -124,7 +125,7 @@ void update_screen(psx_gpu_struct *psx_gpu, SDL_Surface *screen) SDL_Flip(screen); } -#ifdef PANDORA_BUILD +#ifdef NEON_BUILD #include #include @@ -175,9 +176,9 @@ int main(int argc, char *argv[]) screen = SDL_SetVideoMode(1024, 512, 32, 0); } - initialize_psx_gpu(psx_gpu); + initialize_psx_gpu(psx_gpu, _vram); -#ifdef PANDORA_BUILD +#ifdef NEON_BUILD system("ofbset -fb /dev/fb1 -mem 6291456 -en 0"); u32 fbdev_handle = open("/dev/fb1", O_RDWR); psx_gpu->vram_ptr = (mmap((void *)0x50000000, 1024 * 1024 * 2, PROT_READ | PROT_WRITE, @@ -187,7 +188,7 @@ int main(int argc, char *argv[]) -#ifdef PANDORA_BUILD +#ifdef NEON_BUILD //triangle_benchmark(psx_gpu); //return 0; #endif @@ -215,7 +216,7 @@ int main(int argc, char *argv[]) clear_stats(); -#ifdef PANDORA_BUILD +#ifdef NEON_BUILD init_counter(); #endif @@ -224,7 +225,7 @@ int main(int argc, char *argv[]) clear_stats(); -#ifdef PANDORA_BUILD +#ifdef NEON_BUILD u32 cycles = get_counter(); #endif @@ -232,7 +233,7 @@ int main(int argc, char *argv[]) flush_render_block_buffer(psx_gpu); printf("%s: ", argv[1]); -#ifdef PANDORA_BUILD +#ifdef NEON_BUILD u32 cycles_elapsed = get_counter() - cycles; printf("%d\n", cycles_elapsed);