diff options
| author | Jody Northup | 2009-06-16 05:34:12 +0000 |
|---|---|---|
| committer | Jody Northup | 2009-06-16 05:34:12 +0000 |
| commit | d3283f86fcd6c1a636bf769a3deb5d3afa561b01 (patch) | |
| tree | 81d3aa40e0acdfd8f16a78c513ad8ea94d7aca26 /graphics/pixelformat.h | |
| parent | fb96e826f27b071d6696731f43cb5fa0d8760205 (diff) | |
| download | scummvm-rg350-d3283f86fcd6c1a636bf769a3deb5d3afa561b01.tar.gz scummvm-rg350-d3283f86fcd6c1a636bf769a3deb5d3afa561b01.tar.bz2 scummvm-rg350-d3283f86fcd6c1a636bf769a3deb5d3afa561b01.zip | |
Simplified colormode enum
svn-id: r41578
Diffstat (limited to 'graphics/pixelformat.h')
| -rw-r--r-- | graphics/pixelformat.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/graphics/pixelformat.h b/graphics/pixelformat.h index 400385c93a..cc769be46a 100644 --- a/graphics/pixelformat.h +++ b/graphics/pixelformat.h @@ -45,14 +45,17 @@ namespace Graphics { */ enum ColorMode { kFormatCLUT8 = 0, //256 color palette. +#ifdef ENABLE_16BIT kFormatRGB555 = 1, kFormatXRGB1555 = 2, // Special case, high bit has special purpose, which may be alpha. // Engines should probably handle this bit internally and pass RGB only, though kFormatRGB565 = 3, kFormatRGBA4444 = 4, // since this mode is commonly supported in game hardware, some unimplemented engines may use it? +#endif +#ifdef ENABLE_32BIT kFormatRGB888 = 5, - kFormatRGBA6666 = 6, // I've never heard of this, but it's vaguely plausible - kFormatRGBA8888 = 7 + kFormatRGBA8888 = 6 +#endif }; #endif @@ -96,6 +99,7 @@ struct PixelFormat { //TODO: Specify alpha position explicit inline PixelFormat(ColorMode mode) { switch (mode) { +#ifdef ENABLE_16BIT case kFormatRGB555: aLoss = 8; bytesPerPixel = 2; @@ -124,19 +128,18 @@ struct PixelFormat { bytesPerPixel = 2; aLoss = gLoss = rLoss = bLoss = 4; break; +#endif +#ifdef ENABLE_32BIT case kFormatRGB888: bytesPerPixel = 3; aLoss = 8; gLoss = rLoss = bLoss = 0; break; - case kFormatRGBA6666: - bytesPerPixel = 3; - aLoss = gLoss = rLoss = bLoss = 2; - break; case kFormatRGBA8888: bytesPerPixel = 4; aLoss = gLoss = rLoss = bLoss = 0; break; +#endif case kFormatCLUT8: default: bytesPerPixel = 1; |