diff options
Diffstat (limited to 'src/emu/video/vooddefs.h')
-rw-r--r-- | src/emu/video/vooddefs.h | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/src/emu/video/vooddefs.h b/src/emu/video/vooddefs.h index 5f5c8e8bdd1..5e821c09237 100644 --- a/src/emu/video/vooddefs.h +++ b/src/emu/video/vooddefs.h @@ -1053,53 +1053,43 @@ static const UINT8 dither_matrix_2x2[16] = #define EXTRACT_565_TO_888(val, a, b, c) \ (a) = (((val) >> 8) & 0xf8) | (((val) >> 13) & 0x07); \ (b) = (((val) >> 3) & 0xfc) | (((val) >> 9) & 0x03); \ - (c) = (((val) << 3) & 0xf8) | (((val) >> 2) & 0x07); \ - + (c) = (((val) << 3) & 0xf8) | (((val) >> 2) & 0x07); #define EXTRACT_x555_TO_888(val, a, b, c) \ (a) = (((val) >> 7) & 0xf8) | (((val) >> 12) & 0x07); \ (b) = (((val) >> 2) & 0xf8) | (((val) >> 7) & 0x07); \ - (c) = (((val) << 3) & 0xf8) | (((val) >> 2) & 0x07); \ - + (c) = (((val) << 3) & 0xf8) | (((val) >> 2) & 0x07); #define EXTRACT_555x_TO_888(val, a, b, c) \ (a) = (((val) >> 8) & 0xf8) | (((val) >> 13) & 0x07); \ (b) = (((val) >> 3) & 0xf8) | (((val) >> 8) & 0x07); \ - (c) = (((val) << 2) & 0xf8) | (((val) >> 3) & 0x07); \ - + (c) = (((val) << 2) & 0xf8) | (((val) >> 3) & 0x07); #define EXTRACT_1555_TO_8888(val, a, b, c, d) \ (a) = ((INT16)(val) >> 15) & 0xff; \ - EXTRACT_x555_TO_888(val, b, c, d) \ - + EXTRACT_x555_TO_888(val, b, c, d) #define EXTRACT_5551_TO_8888(val, a, b, c, d) \ EXTRACT_555x_TO_888(val, a, b, c) \ - (d) = ((val) & 0x0001) ? 0xff : 0x00; \ - + (d) = ((val) & 0x0001) ? 0xff : 0x00; #define EXTRACT_x888_TO_888(val, a, b, c) \ (a) = ((val) >> 16) & 0xff; \ (b) = ((val) >> 8) & 0xff; \ - (c) = ((val) >> 0) & 0xff; \ - + (c) = ((val) >> 0) & 0xff; #define EXTRACT_888x_TO_888(val, a, b, c) \ (a) = ((val) >> 24) & 0xff; \ (b) = ((val) >> 16) & 0xff; \ - (c) = ((val) >> 8) & 0xff; \ - + (c) = ((val) >> 8) & 0xff; #define EXTRACT_8888_TO_8888(val, a, b, c, d) \ (a) = ((val) >> 24) & 0xff; \ (b) = ((val) >> 16) & 0xff; \ (c) = ((val) >> 8) & 0xff; \ - (d) = ((val) >> 0) & 0xff; \ - + (d) = ((val) >> 0) & 0xff; #define EXTRACT_4444_TO_8888(val, a, b, c, d) \ (a) = (((val) >> 8) & 0xf0) | (((val) >> 12) & 0x0f); \ (b) = (((val) >> 4) & 0xf0) | (((val) >> 8) & 0x0f); \ (c) = (((val) >> 0) & 0xf0) | (((val) >> 4) & 0x0f); \ - (d) = (((val) << 4) & 0xf0) | (((val) >> 0) & 0x0f); \ - + (d) = (((val) << 4) & 0xf0) | (((val) >> 0) & 0x0f); #define EXTRACT_332_TO_888(val, a, b, c) \ (a) = (((val) >> 0) & 0xe0) | (((val) >> 3) & 0x1c) | (((val) >> 6) & 0x03); \ (b) = (((val) << 3) & 0xe0) | (((val) >> 0) & 0x1c) | (((val) >> 3) & 0x03); \ - (c) = (((val) << 6) & 0xc0) | (((val) << 4) & 0x30) | (((val) << 2) & 0xc0) | (((val) << 0) & 0x03); \ - + (c) = (((val) << 6) & 0xc0) | (((val) << 4) & 0x30) | (((val) << 2) & 0xc0) | (((val) << 0) & 0x03); /************************************* @@ -2108,11 +2098,9 @@ INLINE UINT32 compute_raster_hash(const raster_info *info) #define DECLARE_DITHER_POINTERS \ const UINT8 *dither_lookup = NULL; \ const UINT8 *dither4 = NULL; \ - const UINT8 *dither = NULL \ - + const UINT8 *dither = NULL #define DECLARE_DITHER_POINTERS_NO_DITHER_VAR \ - const UINT8 *dither_lookup = NULL; \ - + const UINT8 *dither_lookup = NULL; #define COMPUTE_DITHER_POINTERS(FBZMODE, YY) \ do \ { \ |