diff options
author | Twinaphex | 2017-08-14 07:23:57 +0200 |
---|---|---|
committer | GitHub | 2017-08-14 07:23:57 +0200 |
commit | 262051693823522c34a3e19904bf4ed9f1877e65 (patch) | |
tree | d0dd772a589dbfa07bacd70207fc4db0f37d4109 /source/gfx.h | |
parent | 62be8bed4dc3dc7793f1df1391f153436e4ea949 (diff) | |
parent | 5e450063fbe25926ae50d569c285db428055318a (diff) | |
download | snes9x2005-262051693823522c34a3e19904bf4ed9f1877e65.tar.gz snes9x2005-262051693823522c34a3e19904bf4ed9f1877e65.tar.bz2 snes9x2005-262051693823522c34a3e19904bf4ed9f1877e65.zip |
Merge pull request #39 from jamsilva/master
Fixes and cleanups
Diffstat (limited to 'source/gfx.h')
-rw-r--r-- | source/gfx.h | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/source/gfx.h b/source/gfx.h index 1b4cc6a..5599527 100644 --- a/source/gfx.h +++ b/source/gfx.h @@ -19,7 +19,6 @@ void S9xBuildDirectColourMaps(void); bool S9xInitGFX(void); void S9xDeinitGFX(void); -bool S9xInitUpdate(void); typedef struct { @@ -154,10 +153,7 @@ static INLINE uint16_t COLOR_ADD(uint16_t C1, uint16_t C2) else if (C2 == 0) return C1; else - return GFX.X2 [(((C1 & RGB_REMOVE_LOW_BITS_MASK) + - (C2 & RGB_REMOVE_LOW_BITS_MASK)) >> 1) + - (C1 & C2 & RGB_LOW_BITS_MASK)] | - ((C1 ^ C2) & RGB_LOW_BITS_MASK); + return GFX.X2[(((C1 & RGB_REMOVE_LOW_BITS_MASK) + (C2 & RGB_REMOVE_LOW_BITS_MASK)) >> 1) + (C1 & C2 & RGB_LOW_BITS_MASK)] | ((C1 ^ C2) & RGB_LOW_BITS_MASK); } #define COLOR_ADD1_2(C1, C2) \ @@ -175,13 +171,7 @@ static INLINE uint16_t COLOR_ADD(uint16_t C1, uint16_t C2) GFX.ZERO [(((C1) | RGB_HI_BITS_MASKx2) - \ ((C2) & RGB_REMOVE_LOW_BITS_MASK)) >> 1] -typedef void (*NormalTileRenderer)(uint32_t Tile, int32_t Offset, - uint32_t StartLine, uint32_t LineCount); -typedef void (*ClippedTileRenderer)(uint32_t Tile, int32_t Offset, - uint32_t StartPixel, uint32_t Width, - uint32_t StartLine, uint32_t LineCount); -typedef void (*LargePixelRenderer)(uint32_t Tile, int32_t Offset, - uint32_t StartPixel, uint32_t Pixels, - uint32_t StartLine, uint32_t LineCount); - +typedef void (*NormalTileRenderer)(uint32_t Tile, int32_t Offset, uint32_t StartLine, uint32_t LineCount); +typedef void (*ClippedTileRenderer)(uint32_t Tile, int32_t Offset, uint32_t StartPixel, uint32_t Width, uint32_t StartLine, uint32_t LineCount); +typedef void (*LargePixelRenderer)(uint32_t Tile, int32_t Offset, uint32_t StartPixel, uint32_t Pixels, uint32_t StartLine, uint32_t LineCount); #endif |