diff options
| author | Jody Northup | 2009-06-15 09:45:19 +0000 |
|---|---|---|
| committer | Jody Northup | 2009-06-15 09:45:19 +0000 |
| commit | 8d306ebccfa7e88b2e4f4635bff3987e550f98d3 (patch) | |
| tree | 937afc4b40b3d38da4a67fcd13cef91c097097cb /common | |
| parent | e6f874ee9508a6631635504808680e50a4f55c7f (diff) | |
| download | scummvm-rg350-8d306ebccfa7e88b2e4f4635bff3987e550f98d3.tar.gz scummvm-rg350-8d306ebccfa7e88b2e4f4635bff3987e550f98d3.tar.bz2 scummvm-rg350-8d306ebccfa7e88b2e4f4635bff3987e550f98d3.zip | |
Added kUnsupportedColorMode error code brought Scumm engine and SDL backend into compliance with API outlined in http://scummvmupthorn09.wordpress.com/2009/06/14/how-this-is-going-to-work/
Provided convenient Graphics::PixelFormat constructors for ColorMode enums, and bitformat integers.
Removed last vestiges (I think) of initial cursor hack.
svn-id: r41539
Diffstat (limited to 'common')
| -rw-r--r-- | common/error.h | 3 | ||||
| -rw-r--r-- | common/system.h | 24 |
2 files changed, 3 insertions, 24 deletions
diff --git a/common/error.h b/common/error.h index 23305a5c2e..8959a6ae23 100644 --- a/common/error.h +++ b/common/error.h @@ -48,6 +48,9 @@ enum Error { kInvalidPathError, //!< Engine initialization: Invalid game path was passed kNoGameDataFoundError, //!< Engine initialization: No game data was found in the specified location kUnsupportedGameidError, //!< Engine initialization: Gameid not supported by this (Meta)Engine +#ifdef ENABLE_16BIT + kUnsupportedColorMode, //!< Engine initialization: Engine does not support backend's color mode +#endif kReadPermissionDenied, //!< Unable to read data due to missing read permission diff --git a/common/system.h b/common/system.h index 4e282d1f31..81b86820df 100644 --- a/common/system.h +++ b/common/system.h @@ -345,23 +345,6 @@ public: #ifdef ENABLE_16BIT /** - * Find a supported color format from a list of requested formats. Typical formats include: - * CLUT8 (e.g. 256 color, for most games), all backends must provide support for this format - * RGB555 (e.g. 16-bit color, for later SCUMM HE games) - * RGB565 (e.g. 16-bit color, for Urban Runner) - * - * These are the pixel formats for which the client code can generates data; - * they are not necessarily equal to the hardware pixel format. For example, - * a backend may perform color lookup of 8-bit graphics before pushing the - * screen buffer to hardware, or perform transformations of the ARGB color order. - * - * @param formatList A list of requested pixel formats, ordered by priority - * - * @return a supported ColorMode from the list, or kFormatCLUT8 if no supported format was found - */ - virtual Graphics::ColorMode findCompatibleFormat(Common::List<Graphics::ColorMode> formatList) = 0; - - /** * Set the color format of the virtual screen. Typical formats include: * CLUT8 (e.g. 256 color, for most games) * RGB555 (e.g. 16-bit color, for later SCUMM HE games) @@ -381,13 +364,6 @@ public: * @see Graphics::PixelFormat */ virtual Graphics::PixelFormat getScreenFormat() const = 0; - - /** - * Returns the pixel format description of the requested color mode - * @see Graphics::PixelFormat - */ - virtual Graphics::PixelFormat getPixelFormat(Graphics::ColorMode format) = 0; - #endif /** |