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

Create define ARM_ARCH_BLENDING_OPTS - so that we can optionally 

compile in the ARM ASM blend file
This commit is contained in:
twinaphex 2014-12-11 19:12:09 +01:00
parent 9ed950fd4e
commit 657c7bee5c
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.common
View File

@ -33,7 +33,10 @@ endif
endif endif
ifeq ($(CPU_ARCH), arm) ifeq ($(CPU_ARCH), arm)
ifeq ($(CPU_ARCH_ARM_BLENDING_OPTS),1)
CFLAGS += -DARM_ARCH_BLENDING_OPTS
SOURCES_ASM += $(CORE_DIR)/arm/video_blend.S SOURCES_ASM += $(CORE_DIR)/arm/video_blend.S
endif endif
endif
INCFLAGS := -I$(CORE_DIR) INCFLAGS := -I$(CORE_DIR)

5
video.c
View File

@ -2296,8 +2296,7 @@ fill_line_builder(color32);
#ifdef RENDER_COLOR16_NORMAL #ifdef RENDER_COLOR16_NORMAL
#ifndef ARM_ARCH #ifndef ARM_ARCH_BLENDING_OPTS
void expand_normal(u16 *screen_ptr, u32 start, u32 end) void expand_normal(u16 *screen_ptr, u32 start, u32 end)
{ {
u32 i, pixel_source; u32 i, pixel_source;
@ -2328,7 +2327,7 @@ void expand_normal(u16 *screen_ptr, u32 start, u32 end)
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);
#ifndef ARM_ARCH #ifndef ARM_ARCH_BLENDING_OPTS
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)

2
video.h
View File

@ -20,7 +20,7 @@
#ifndef VIDEO_H #ifndef VIDEO_H
#define VIDEO_H #define VIDEO_H
void update_scanline(); void update_scanline(void);
void video_write_savestate(void); void video_write_savestate(void);
void video_read_savestate(void); void video_read_savestate(void);