lifning
/
gpsp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused RENDER_COLOR16_NORMAL ifdefs

This commit is contained in:
twinaphex 2014-12-11 21:38:35 +01:00
parent 1adb50de8c
commit 853be8aea3
1 changed files with 0 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
video.c
View File

@ -45,19 +45,10 @@ static void render_scanline_conditional_bitmap(u32 start, u32 end, u16 *scanline
current_pixel = palette[source]; \ current_pixel = palette[source]; \
#ifdef RENDER_COLOR16_NORMAL
#define tile_expand_base_normal(index) \
tile_expand_base_color16(index) \
#else
#define tile_expand_base_normal(index) \ #define tile_expand_base_normal(index) \
tile_lookup_palette(palette, current_pixel); \ tile_lookup_palette(palette, current_pixel); \
dest_ptr[index] = current_pixel \ dest_ptr[index] = current_pixel \
#endif
#define tile_expand_transparent_normal(index) \ #define tile_expand_transparent_normal(index) \
tile_expand_base_normal(index) \ tile_expand_base_normal(index) \
@ -486,20 +477,10 @@ static void render_scanline_conditional_bitmap(u32 start, u32 end, u16 *scanline
// Draws eight background pixels for the normal renderer, just a bunch of // Draws eight background pixels for the normal renderer, just a bunch of
// zeros. // zeros.
#ifdef RENDER_COLOR16_NORMAL
#define tile_4bpp_draw_eight_base_zero_normal() \
current_pixel = 0; \
tile_4bpp_draw_eight_base_zero(current_pixel) \
#else
#define tile_4bpp_draw_eight_base_zero_normal() \ #define tile_4bpp_draw_eight_base_zero_normal() \
current_pixel = palette[0]; \ current_pixel = palette[0]; \
tile_4bpp_draw_eight_base_zero(current_pixel) \ tile_4bpp_draw_eight_base_zero(current_pixel) \
#endif
// Draws eight 4bpp pixels. // Draws eight 4bpp pixels.
@ -842,18 +823,9 @@ static void render_scanline_conditional_bitmap(u32 start, u32 end, u16 *scanline
} \ } \
#ifdef RENDER_COLOR16_NORMAL
#define render_scanline_extra_variables_base_normal(bg_type) \
const u32 pixel_combine = 0 \
#else
#define render_scanline_extra_variables_base_normal(bg_type) \ #define render_scanline_extra_variables_base_normal(bg_type) \
u16 *palette = palette_ram_converted \ u16 *palette = palette_ram_converted \
#endif
#define render_scanline_extra_variables_base_alpha(bg_type) \ #define render_scanline_extra_variables_base_alpha(bg_type) \
u32 bg_combine = color_combine_mask(5); \ u32 bg_combine = color_combine_mask(5); \
@ -1314,25 +1286,12 @@ render_scanline_affine_builder(transparent, alpha);
src_ptr = (u16 *)(vram + 0xA000); \ src_ptr = (u16 *)(vram + 0xA000); \
#ifdef RENDER_COLOR16_NORMAL
#define render_scanline_vram_setup_mode4() \
const u32 pixel_combine = 0; \
u8 *src_ptr = vram; \
if(io_registers[REG_DISPCNT] & 0x10) \
src_ptr = vram + 0xA000; \
#else
#define render_scanline_vram_setup_mode4() \ #define render_scanline_vram_setup_mode4() \
u16 *palette = palette_ram_converted; \ u16 *palette = palette_ram_converted; \
u8 *src_ptr = vram; \ u8 *src_ptr = vram; \
if(io_registers[REG_DISPCNT] & 0x10) \ if(io_registers[REG_DISPCNT] & 0x10) \
src_ptr = vram + 0xA000; \ src_ptr = vram + 0xA000; \
#endif
// Build bitmap scanline rendering functions. // Build bitmap scanline rendering functions.
@ -1775,19 +1734,10 @@ static u32 obj_alpha_count[160];
// Build obj rendering functions // Build obj rendering functions
#ifdef RENDER_COLOR16_NORMAL
#define render_scanline_obj_extra_variables_normal(bg_type) \
const u32 pixel_combine = (1 << 8) \
#else
#define render_scanline_obj_extra_variables_normal(bg_type) \ #define render_scanline_obj_extra_variables_normal(bg_type) \
u16 *palette = palette_ram_converted + 256 \ u16 *palette = palette_ram_converted + 256 \
#endif
#define render_scanline_obj_extra_variables_color() \ #define render_scanline_obj_extra_variables_color() \
u32 pixel_combine = color_combine_mask(4) | (1 << 8) \ u32 pixel_combine = color_combine_mask(4) | (1 << 8) \
@ -2250,22 +2200,8 @@ fill_line_builder(color32);
// Blend top two pixels of scanline with each other. // Blend top two pixels of scanline with each other.
#ifdef RENDER_COLOR16_NORMAL
#ifndef ARM_ARCH_BLENDING_OPTS
void expand_normal(u16 *screen_ptr, u32 start, u32 end)
{
screen_ptr += start;
}
#endif
#else
#define expand_normal(screen_ptr, start, end) #define expand_normal(screen_ptr, start, end)
#endif
void expand_blend(u32 *screen_src_ptr, u16 *screen_dest_ptr, void expand_blend(u32 *screen_src_ptr, u16 *screen_dest_ptr,
u32 start, u32 end); u32 start, u32 end);