diff options
| author | Jody Northup | 2009-07-01 04:06:13 +0000 |
|---|---|---|
| committer | Jody Northup | 2009-07-01 04:06:13 +0000 |
| commit | f10946545ad62c0157d1b0bcfcf12dcb614aaedb (patch) | |
| tree | 4b6d370be1991ace526c996b9c386e1dfeef5062 /graphics/pixelformat.h | |
| parent | 03b501ee2442c8118deacb396af479e32a910dd4 (diff) | |
| download | scummvm-rg350-f10946545ad62c0157d1b0bcfcf12dcb614aaedb.tar.gz scummvm-rg350-f10946545ad62c0157d1b0bcfcf12dcb614aaedb.tar.bz2 scummvm-rg350-f10946545ad62c0157d1b0bcfcf12dcb614aaedb.zip | |
Allowed for 16, 24, and 32 bit pixel format factory constructors to be used without backend RGB color support
svn-id: r41985
Diffstat (limited to 'graphics/pixelformat.h')
| -rw-r--r-- | graphics/pixelformat.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/graphics/pixelformat.h b/graphics/pixelformat.h index 30c8aaa447..063c989371 100644 --- a/graphics/pixelformat.h +++ b/graphics/pixelformat.h @@ -68,7 +68,6 @@ struct PixelFormat { static inline PixelFormat createFormatCLUT8() { return PixelFormat(1, 8, 8, 8, 8, 0, 0, 0, 0); } -#ifdef ENABLE_RGB_COLOR // 2 Bytes-per-pixel modes static inline PixelFormat createFormatRGB555() { return PixelFormat(2, 3, 3, 3, 8, 10, 5, 0, 0); @@ -102,7 +101,6 @@ struct PixelFormat { static inline PixelFormat createFormatBGRA4444() { return PixelFormat(2, 4, 4, 4, 4, 4, 8, 12, 0); } -#ifdef ENABLE_32BIT // 3 to 4 byte per pixel modes static inline PixelFormat createFormatRGB888() { return PixelFormat(3, 0, 0, 0, 8, 16, 8, 0, 0); @@ -122,8 +120,6 @@ struct PixelFormat { static inline PixelFormat createFormatBGRA8888() { return PixelFormat(4, 0, 0, 0, 0, 8, 16, 24, 0); } -#endif // ENABLE_32BIT -#endif // ENABLE_RGB_COLOR inline bool operator==(const PixelFormat &fmt) const { // TODO: If aLoss==8, then the value of aShift is irrelevant, and should be ignored. |