From 2e8ab813a9e4c2d908d5450e346a81d2a91a75e8 Mon Sep 17 00:00:00 2001 From: Bad Diode Date: Wed, 19 Apr 2023 15:22:13 +0200 Subject: Fix compiler warnings --- src/main.c | 21 +++++++++------------ src/ppu.c | 1 - 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/main.c b/src/main.c index 1dc5b5f..1193e9e 100644 --- a/src/main.c +++ b/src/main.c @@ -37,8 +37,6 @@ #define CONTROL_METHODS CONTROL_CONTROLLER,CONTROL_MOUSE,CONTROL_KEYBOARD #endif -#define PROF_ENABLE 1 - #ifdef PROF_ENABLE #if PROF_ENABLE == 0 #define TEXT_ENABLE 1 @@ -53,6 +51,7 @@ #ifndef PROF_SHOW_Y #define PROF_SHOW_Y 0 #endif +/* // #define PROF_SHOW() \ // do { \ // txt_position((PROF_SHOW_X), (PROF_SHOW_Y));\ @@ -75,21 +74,19 @@ // txt_position((PROF_SHOW_X), (PROF_SHOW_Y)+3);\ // txt_printf("FLIP: %lu ", flip_cycles);\ // } while (0) +// */ #define PROF_SHOW() \ do { \ txt_position((PROF_SHOW_X), (PROF_SHOW_Y));\ txt_printf("1BPP: %lu 2BPP: %lu", ppu_icn_cycles, ppu_chr_cycles);\ } while (0) -#define PROF_INIT() \ - static u32 ppu_pixel_cycles = 0;\ - static u32 ppu_chr_cycles = 0;\ - static u32 ppu_icn_cycles = 0;\ - static u32 flip_cycles = 0;\ - static u32 eval_cycles = 0;\ - static u32 input_cycles = 0;\ - static u32 mix_cycles = 0; - - PROF_INIT(); +static u32 ppu_pixel_cycles = 0; +static u32 ppu_chr_cycles = 0; +static u32 ppu_icn_cycles = 0; +static u32 flip_cycles = 0; +static u32 eval_cycles = 0; +static u32 input_cycles = 0; +static u32 mix_cycles = 0; #else #define PROF(F,VAR) (F) #define PROF_SHOW() diff --git a/src/ppu.c b/src/ppu.c index 9937d95..c258fe2 100644 --- a/src/ppu.c +++ b/src/ppu.c @@ -600,7 +600,6 @@ ppu_2bpp(u32 *layer, u16 x, u16 y, u8 *sprite, u8 clr, u8 flip_x, u8 flip_y) { } } } else { - u8 clr0 = blending[0][clr]; u8 clr1 = blending[1][clr]; u8 clr2 = blending[2][clr]; u8 clr3 = blending[3][clr]; -- cgit v1.2.1