gpu_neon: typo fix + minor stuff

diff --git a/libpcsxcore/psxdma.c b/libpcsxcore/psxdma.c
index 68b9694..f670dd1 100644 (file)
--- a/libpcsxcore/psxdma.c
+++ b/libpcsxcore/psxdma.c
@@ -210,7 +210,7 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
 
                        psxRegs.gpuIdleAfter = psxRegs.cycle + cycles_sum + cycles_last_cmd;
                        set_event(PSXINT_GPUDMA, cycles_sum);
-                       //printf("%u dma2cf: %6d,%4d %08x %08x %08x %08x\n", psxRegs.cycle,
+                       //printf("%u dma2cf: %6ld,%4d %08x %08x %08x %08x\n", psxRegs.cycle,
                        //  cycles_sum, cycles_last_cmd, madr, bcr, chcr, HW_DMA2_MADR);
                        return;
 
@@ -237,7 +237,7 @@ void gpuInterrupt() {
                        cycles_sum += psxRegs.gpuIdleAfter - psxRegs.cycle;
                psxRegs.gpuIdleAfter = psxRegs.cycle + cycles_sum + cycles_last_cmd;
                set_event(PSXINT_GPUDMA, cycles_sum);
-               //printf("%u dma2cn: %6d,%4d %08x\n", psxRegs.cycle, cycles_sum,
+               //printf("%u dma2cn: %6ld,%4d %08x\n", psxRegs.cycle, cycles_sum,
                //      cycles_last_cmd, HW_DMA2_MADR);
                return;
        }

diff --git a/plugins/gpu_neon/psx_gpu/psx_gpu.c b/plugins/gpu_neon/psx_gpu/psx_gpu.c
index a716a8a..a58b5b6 100644 (file)
--- a/plugins/gpu_neon/psx_gpu/psx_gpu.c
+++ b/plugins/gpu_neon/psx_gpu/psx_gpu.c
@@ -1935,7 +1935,7 @@ setup_blocks_uv_adj_hack(psx_gpu_struct *psx_gpu, block_struct *block,
 
 #define setup_blocks_add_blocks_direct()                                       \
   stats_add(texel_blocks_untextured, span_num_blocks);                         \
-  span_pixel_blocks += span_num_blocks                                         \
+  stats_add(span_pixel_blocks, span_num_blocks);                               \
 
 
 #define setup_blocks_builder(shading, texturing, dithering, sw, target)        \

diff --git a/plugins/gpu_neon/psx_gpu/psx_gpu.h b/plugins/gpu_neon/psx_gpu/psx_gpu.h
index c37d9da..edea0a9 100644 (file)
--- a/plugins/gpu_neon/psx_gpu/psx_gpu.h
+++ b/plugins/gpu_neon/psx_gpu/psx_gpu.h
@@ -218,7 +218,7 @@ typedef struct
 
   // Align up to 64 byte boundary to keep the upcoming buffers cache line
   // aligned, also make reachable with single immediate addition
-  u8 reserved_a[184 + 8*4 - 9*sizeof(void *)];
+  u8 reserved_a[180 + 9*4 - 9*sizeof(void *)];
 
   // 8KB
   block_struct blocks[MAX_BLOCKS_PER_ROW];

diff --git a/plugins/gpu_neon/psx_gpu/psx_gpu_parse.c b/plugins/gpu_neon/psx_gpu/psx_gpu_parse.c
index 9f31cfd..e6fe062 100644 (file)
--- a/plugins/gpu_neon/psx_gpu/psx_gpu_parse.c
+++ b/plugins/gpu_neon/psx_gpu/psx_gpu_parse.c
@@ -292,7 +292,7 @@ u32 gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size,
   vertex_struct vertexes[4] __attribute__((aligned(16))) = {};
   u32 current_command = 0, command_length;
   u32 cpu_cycles_sum = 0, cpu_cycles = *cpu_cycles_last;
-  u32 siplified_prim[4*4];
+  u32 simplified_prim[4*4];
 
   u32 *list_start = list;
   u32 *list_end = list + (size / 4);
@@ -372,10 +372,10 @@ u32 gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size,
         u32 i, simplified_count;
         set_texture(psx_gpu, list[4] >> 16);
         if (!(psx_gpu->render_state_base & RENDER_STATE_DITHER) &&
-            (simplified_count = prim_try_simplify_quad_t(siplified_prim, list)))
+            (simplified_count = prim_try_simplify_quad_t(simplified_prim, list)))
         {
           for (i = 0; i < simplified_count; i++) {
-            const u32 *list_ = &siplified_prim[i * 4];
+            const u32 *list_ = &simplified_prim[i * 4];
             textured_sprite(psx_gpu, list_, list_[3] & 0x3FF,
               (list_[3] >> 16) & 0x1FF, &cpu_cycles_sum, &cpu_cycles);
           }
@@ -437,10 +437,10 @@ u32 gpu_parse(psx_gpu_struct *psx_gpu, u32 *list, u32 size,
         u32 i, simplified_count;
         set_texture(psx_gpu, list[5] >> 16);
         if (!(psx_gpu->render_state_base & RENDER_STATE_DITHER) &&
-            (simplified_count = prim_try_simplify_quad_gt(siplified_prim, list)))
+            (simplified_count = prim_try_simplify_quad_gt(simplified_prim, list)))
         {
           for (i = 0; i < simplified_count; i++) {
-            const u32 *list_ = &siplified_prim[i * 4];
+            const u32 *list_ = &simplified_prim[i * 4];
             textured_sprite(psx_gpu, list_, list_[3] & 0x3FF,
               (list_[3] >> 16) & 0x1FF, &cpu_cycles_sum, &cpu_cycles);
           }
@@ -1212,7 +1212,7 @@ u32 gpu_parse_enhanced(psx_gpu_struct *psx_gpu, u32 *list, u32 size,
   vertex_struct vertexes[4] __attribute__((aligned(16))) = {};
   u32 current_command = 0, command_length;
   u32 cpu_cycles_sum = 0, cpu_cycles = *cpu_cycles_last;
-  u32 siplified_prim[4*4];
+  u32 simplified_prim[4*4];
 
   u32 *list_start = list;
   u32 *list_end = list + (size / 4);
@@ -1320,10 +1320,10 @@ u32 gpu_parse_enhanced(psx_gpu_struct *psx_gpu, u32 *list, u32 size,
         u32 i, simplified_count;
         set_texture(psx_gpu, list[4] >> 16);
         if (!(psx_gpu->render_state_base & RENDER_STATE_DITHER) &&
-            (simplified_count = prim_try_simplify_quad_t(siplified_prim, list)))
+            (simplified_count = prim_try_simplify_quad_t(simplified_prim, list)))
         {
           for (i = 0; i < simplified_count; i++) {
-            const u32 *list_ = &siplified_prim[i * 4];
+            const u32 *list_ = &simplified_prim[i * 4];
             textured_sprite_enh(psx_gpu, list_, list_[3] & 0x3FF,
               (list_[3] >> 16) & 0x1FF, &cpu_cycles_sum, &cpu_cycles);
           }
@@ -1385,10 +1385,10 @@ u32 gpu_parse_enhanced(psx_gpu_struct *psx_gpu, u32 *list, u32 size,
         u32 i, simplified_count;
         set_texture(psx_gpu, list[5] >> 16);
         if (!(psx_gpu->render_state_base & RENDER_STATE_DITHER) &&
-            (simplified_count = prim_try_simplify_quad_gt(siplified_prim, list)))
+            (simplified_count = prim_try_simplify_quad_gt(simplified_prim, list)))
         {
           for (i = 0; i < simplified_count; i++) {
-            const u32 *list_ = &siplified_prim[i * 4];
+            const u32 *list_ = &simplified_prim[i * 4];
             textured_sprite_enh(psx_gpu, list_, list_[3] & 0x3FF,
               (list_[3] >> 16) & 0x1FF, &cpu_cycles_sum, &cpu_cycles);
           }