The-Homebrew-Cloud/Genesis-Plus-GX
2
0
Fork 0
mirror of https://github.com/ekeeke/Genesis-Plus-GX.git synced 2024-12-27 03:31:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge https://github.com/ekeeke/Genesis-Plus-GX

Browse Source
This commit is contained in:
twinaphex 2014-11-01 00:42:45 +01:00
commit d390b30fff
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/vdp_render.c
View File

@ -470,7 +470,7 @@ INLINE void WRITE_LONG(void *address, uint32 data)
/* 5:5:5 RGB */ /* 5:5:5 RGB */
#elif defined(USE_15BPP_RENDERING) #elif defined(USE_15BPP_RENDERING)
#define MAKE_PIXEL(r,g,b) ((r) << 11 | ((r) >> 3) << 10 | (g) << 6 | ((g) >> 3) << 5 | (b) << 1 | (b) >> 3) #define MAKE_PIXEL(r,g,b) ((1 << 15) | (r) << 11 | ((r) >> 3) << 10 | (g) << 6 | ((g) >> 3) << 5 | (b) << 1 | (b) >> 3)
/* 5:6:5 RGB */ /* 5:6:5 RGB */
#elif defined(USE_16BPP_RENDERING) #elif defined(USE_16BPP_RENDERING)
@ -478,7 +478,7 @@ INLINE void WRITE_LONG(void *address, uint32 data)
/* 8:8:8 RGB */ /* 8:8:8 RGB */
#elif defined(USE_32BPP_RENDERING) #elif defined(USE_32BPP_RENDERING)
#define MAKE_PIXEL(r,g,b) ((r) << 20 | (r) << 16 | (g) << 12 | (g) << 8 | (b) << 4 | (b)) #define MAKE_PIXEL(r,g,b) ((0xff << 24) | (r) << 20 | (r) << 16 | (g) << 12 | (g) << 8 | (b) << 4 | (b))
#endif #endif
/* Window & Plane A clipping */ /* Window & Plane A clipping */
@ -524,10 +524,10 @@ static const uint8 tms_palette[16] =
#elif defined(USE_15BPP_RENDERING) #elif defined(USE_15BPP_RENDERING)
static const uint16 tms_palette[16] = static const uint16 tms_palette[16] =
{ {
0x0000, 0x0000, 0x1308, 0x2F6F, 0x8000, 0x8000, 0x9308, 0xAF6F,
0x295D, 0x3DDF, 0x6949, 0x23BE, 0xA95D, 0xBDDF, 0xE949, 0xA3BE,
0x7D4A, 0x7DEF, 0x6B0A, 0x7330, 0xFD4A, 0xFDEF, 0xEB0A, 0xF330,
0x12A7, 0x6177, 0x6739, 0x7FFF 0x92A7, 0xE177, 0xE739, 0xFFFF
}; };
#elif defined(USE_16BPP_RENDERING) #elif defined(USE_16BPP_RENDERING)
@ -542,10 +542,10 @@ static const uint16 tms_palette[16] =
#elif defined(USE_32BPP_RENDERING) #elif defined(USE_32BPP_RENDERING)
static const uint32 tms_palette[16] = static const uint32 tms_palette[16] =
{ {
0x000000, 0x000000, 0x21C842, 0x5EDC78, 0xFF000000, 0xFF000000, 0xFF21C842, 0xFF5EDC78,
0x5455ED, 0x7D76FC, 0xD4524D, 0x42EBF5, 0xFF5455ED, 0xFF7D76FC, 0xFFD4524D, 0xFF42EBF5,
0xFC5554, 0xFF7978, 0xD4C154, 0xE6CE80, 0xFFFC5554, 0xFFFF7978, 0xFFD4C154, 0xFFE6CE80,
0x21B03B, 0xC95BB4, 0xCCCCCC, 0xFFFFFF 0xFF21B03B, 0xFFC95BB4, 0xFFCCCCCC, 0xFFFFFFFF
}; };
#endif #endif
@ -1481,7 +1481,7 @@ void render_bg_m4(int line)
src = (uint32 *)&bg_pattern_cache[((attr & 0x7FF) << 6) | (v_line)]; src = (uint32 *)&bg_pattern_cache[((attr & 0x7FF) << 6) | (v_line)];
/* Copy left & right half, adding the attribute bits in */ /* Copy left & right half, adding the attribute bits in */
#ifdef ALIGN_DWORD #ifdef ALIGN_LONG
WRITE_LONG(dst, src[0] | atex); WRITE_LONG(dst, src[0] | atex);
dst++; dst++;
WRITE_LONG(dst, src[1] | atex); WRITE_LONG(dst, src[1] | atex);

4
core/vdp_render.h
View File

@ -4,8 +4,8 @@
* *
* Support for all TMS99xx modes, Mode 4 & Mode 5 rendering * Support for all TMS99xx modes, Mode 4 & Mode 5 rendering
* *
* Copyright (C) 1998-2007 Charles Mac Donald (original code) * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Charles Mac Donald (original code)
* Copyright (C) 2007-2013 Eke-Eke (Genesis Plus GX) * Copyright (C) 2007-2014 Eke-Eke (Genesis Plus GX)
* *
* Redistribution and use of this code or any derivative works are permitted * Redistribution and use of this code or any derivative works are permitted
* provided that the following conditions are met: * provided that the following conditions are met:

1
libretro/jni/Android.mk
View File

@ -88,6 +88,7 @@ LOCAL_C_INCLUDES = $(LOCAL_PATH)/$(GENPLUS_SRC_DIR) \
$(LOCAL_PATH)/$(GENPLUS_SRC_DIR)/m68k \ $(LOCAL_PATH)/$(GENPLUS_SRC_DIR)/m68k \
$(LOCAL_PATH)/$(GENPLUS_SRC_DIR)/z80 \ $(LOCAL_PATH)/$(GENPLUS_SRC_DIR)/z80 \
$(LOCAL_PATH)/$(GENPLUS_SRC_DIR)/ntsc \ $(LOCAL_PATH)/$(GENPLUS_SRC_DIR)/ntsc \
$(LOCAL_PATH)/$(TREMOR_SRC_DIR) \
$(LOCAL_PATH)/$(LIBRETRO_DIR) $(LOCAL_PATH)/$(LIBRETRO_DIR)
LOCAL_CFLAGS = -ffast-math -O2 -funroll-loops -DINLINE="static inline" -DUSE_LIBTREMOR -DUSE_16BPP_RENDERING -DLSB_FIRST -DBYTE_ORDER=LITTLE_ENDIAN -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565 -DALIGN_LONG -DALIGN_WORD LOCAL_CFLAGS = -ffast-math -O2 -funroll-loops -DINLINE="static inline" -DUSE_LIBTREMOR -DUSE_16BPP_RENDERING -DLSB_FIRST -DBYTE_ORDER=LITTLE_ENDIAN -D__LIBRETRO__ -DFRONTEND_SUPPORTS_RGB565 -DALIGN_LONG -DALIGN_WORD