diff options
| author | aliaspider | 2014-10-29 05:28:04 +0100 |
|---|---|---|
| committer | aliaspider | 2014-10-29 05:28:04 +0100 |
| commit | 1d98e1c317fa19687ae6bc3cb8e550ef7531bf02 (patch) | |
| tree | 343103da8fe67905e99b16636e93421397fe692b /source/pixform.h | |
| parent | f518934e3b664d0cf9535a391d6572300958d3bf (diff) | |
| download | snes9x2005-1d98e1c317fa19687ae6bc3cb8e550ef7531bf02.tar.gz snes9x2005-1d98e1c317fa19687ae6bc3cb8e550ef7531bf02.tar.bz2 snes9x2005-1d98e1c317fa19687ae6bc3cb8e550ef7531bf02.zip | |
cleanups (cont.)
Diffstat (limited to 'source/pixform.h')
| -rw-r--r-- | source/pixform.h | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/source/pixform.h b/source/pixform.h index 45cf651..b8f9faf 100644 --- a/source/pixform.h +++ b/source/pixform.h @@ -90,39 +90,6 @@ #ifndef _PIXFORM_H_ #define _PIXFORM_H_ -#ifdef GFX_MULTI_FORMAT - -enum { RGB565, RGB555, BGR565, BGR555, GBR565, GBR555, RGB5551 }; - -#define BUILD_PIXEL(R,G,B) ((*GFX.BuildPixel) (R, G, B)) -#define BUILD_PIXEL2(R,G,B) ((*GFX.BuildPixel2) (R, G, B)) -#define DECOMPOSE_PIXEL(Pixel,R,G,B) ((*GFX.DecomposePixel) (Pixel, R,G,B)) - -extern uint32 RED_LOW_BIT_MASK; -extern uint32 GREEN_LOW_BIT_MASK; -extern uint32 BLUE_LOW_BIT_MASK; -extern uint32 RED_HI_BIT_MASK; -extern uint32 GREEN_HI_BIT_MASK; -extern uint32 BLUE_HI_BIT_MASK; -extern uint32 MAX_RED; -extern uint32 MAX_GREEN; -extern uint32 MAX_BLUE; -extern uint32 SPARE_RGB_BIT_MASK; -extern uint32 GREEN_HI_BIT; -extern uint32 RGB_LOW_BITS_MASK; -extern uint32 RGB_HI_BITS_MASK; -extern uint32 RGB_HI_BITS_MASKx2; -extern uint32 RGB_REMOVE_LOW_BITS_MASK; -extern uint32 FIRST_COLOR_MASK; -extern uint32 SECOND_COLOR_MASK; -extern uint32 THIRD_COLOR_MASK; -extern uint32 ALPHA_BITS_MASK; -extern uint32 FIRST_THIRD_COLOR_MASK; -extern uint32 TWO_LOW_BITS_MASK; -extern uint32 HIGH_BITS_SHIFTED_TWO_MASK; - -#endif - /* RGB565 format */ #define BUILD_PIXEL_RGB565(R,G,B) (((int) (R) << 11) | ((int) (G) << 6) | (int) (B)) #define BUILD_PIXEL2_RGB565(R,G,B) (((int) (R) << 11) | ((int) (G) << 5) | (int) (B)) @@ -263,7 +230,7 @@ extern uint32 HIGH_BITS_SHIFTED_TWO_MASK; #define THIRD_COLOR_MASK_RGB5551 0x003e #define ALPHA_BITS_MASK_RGB5551 0x0001 -#ifndef GFX_MULTI_FORMAT + #define CONCAT(X,Y) X##Y /* C pre-processor needs a two stage macro define to enable it to concat @@ -316,7 +283,6 @@ extern uint32 HIGH_BITS_SHIFTED_TWO_MASK; #define TWO_LOW_BITS_MASK (RGB_LOW_BITS_MASK | (RGB_LOW_BITS_MASK << 1)) #define HIGH_BITS_SHIFTED_TWO_MASK (( (FIRST_COLOR_MASK | SECOND_COLOR_MASK | THIRD_COLOR_MASK) & \ ~TWO_LOW_BITS_MASK ) >> 2) -#endif #endif |