diff --git a/Makefile b/Makefile index f47ac4d..0fcbcbf 100644 --- a/Makefile +++ b/Makefile @@ -149,11 +149,7 @@ else ifeq ($(platform),ps2) CC = ee-gcc$(EXE_EXT) CXX = ee-g++$(EXE_EXT) AR = ee-ar$(EXE_EXT) - FLAGS += -DPS2 -G0 -I$(PS2SDK)/ports/include - FLAGS += -Wall - FLAGS += -fomit-frame-pointer -ffast-math - FLAGS += -fno-unwind-tables -fno-asynchronous-unwind-tables - FLAGS += -fno-optimize-sibling-calls + FLAGS += -DPS2 -G0 -DABGR1555 -DHAVE_NO_LANGEXTRA STATIC_LINKING := 1 LIBS := diff --git a/graphics.cpp b/graphics.cpp index 7639e50..d3b2317 100644 --- a/graphics.cpp +++ b/graphics.cpp @@ -14,6 +14,16 @@ #include "graphics.h" #include "memory.h" +#if defined(ABGR1555) +#define RMASK 0x001f +#define GMASK 0x03e0 +#define BMASK 0x7c00 +#else +#define RMASK 0xf800 +#define GMASK 0x07e0 +#define BMASK 0x001f +#endif + extern ngp_screen* screen; extern int gfx_hacks; @@ -443,13 +453,13 @@ void palette_init16(DWORD dwRBitMask, DWORD dwGBitMask, DWORD dwBBitMask) */ void graphicsSetDarkFilterLevel(unsigned filterLevel) { - unsigned prev_dark_filter_level = dark_filter_level; + unsigned prev_dark_filter_level = dark_filter_level; - dark_filter_level = filterLevel; - dark_filter_level = (dark_filter_level > 100) ? 100 : dark_filter_level; + dark_filter_level = filterLevel; + dark_filter_level = (dark_filter_level > 100) ? 100 : dark_filter_level; - if (dark_filter_level != prev_dark_filter_level) - palette_init16(0xf800,0x7e0,0x1f); + if (dark_filter_level != prev_dark_filter_level) + palette_init16(RMASK, GMASK, BMASK); } void palette_init8(DWORD dwRBitMask, DWORD dwGBitMask, DWORD dwBBitMask) @@ -1571,7 +1581,7 @@ BOOL graphics_init(void) { #ifdef __LIBRETRO__ palette_init = palette_init16; - palette_init(0xf800,0x7e0,0x1f); + palette_init(RMASK, GMASK, BMASK); drawBuffer = (unsigned short*)screen->pixels; #else dbg_print("in graphics_init\n");