thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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/

Browse source 
Provided convenient Graphics::PixelFormat constructors for ColorMode enums, and bitformat integers.
Removed last vestiges (I think) of initial cursor hack.

svn-id: r41539
This commit is contained in:
Jody Northup 2009-06-15 09:45:19 +00:00
parent e6f874ee95
commit 8d306ebccf
11 changed files with 142 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

88
backends/platform/sdl/graphics.cpp
View file

@ -352,34 +352,6 @@ int OSystem_SDL::getGraphicsMode() const {
return _videoMode.mode;
}
#ifdef ENABLE_16BIT
Graphics::ColorMode OSystem_SDL::findCompatibleFormat(Common::List<Graphics::ColorMode> formatList) {
bool typeAccepted = false;
Graphics::ColorMode format;
while (!formatList.empty()) {
typeAccepted = false;
format = formatList.front();
//no need to keep searching if the screen
//is already in one of the desired formats
if (getPixelFormat(format) == _videoMode.format)
return format;
formatList.pop_front();
switch (format) {
case Graphics::kFormatCLUT8:
if (format == Graphics::kFormatCLUT8)
return format;
break;
case Graphics::kFormatRGB555:
case Graphics::kFormatRGB565:
return format;
break;
}
}
return Graphics::kFormatCLUT8;
}
void OSystem_SDL::initFormat(Graphics::PixelFormat format) {
assert(_transactionMode == kTransactionActive);
@ -391,66 +363,6 @@ void OSystem_SDL::initFormat(Graphics::PixelFormat format) {
_transactionDetails.formatChanged = true;
_screenFormat = format;
}
//TODO: Move this out of OSystem and into Graphics, where engine can access it.
//TODO: ABGR support
Graphics::PixelFormat OSystem_SDL::getPixelFormat(Graphics::ColorMode format) {
Graphics::PixelFormat result;
switch (format) {
case Graphics::kFormatRGB555:
result.aLoss = 8;
result.bytesPerPixel = 2;
result.rLoss = result.gLoss = result.bLoss = 3;
break;
case Graphics::kFormatRGB565:
result.bytesPerPixel = 2;
result.aLoss = 8;
result.gLoss = 2;
result.rLoss = result.bLoss = 3;
break;
case Graphics::kFormatXRGB1555:
//Special case, alpha bit is always high in this mode.
result.aLoss = 7;
result.bytesPerPixel = 2;
result.rLoss = result.gLoss = result.bLoss = 3;
result.bShift = 0;
result.gShift = result.bShift + result.bBits();
result.rShift = result.gShift + result.gBits();
result.aShift = result.rShift + result.rBits();
//HACK: there should be a clean way to handle setting
//up the color order without prematurely returning
return result;
case Graphics::kFormatRGBA4444:
result.bytesPerPixel = 2;
result.aLoss = result.gLoss = result.rLoss = result.bLoss = 4;
break;
case Graphics::kFormatRGB888:
result.bytesPerPixel = 3;
result.aLoss = 8;
result.gLoss = result.rLoss = result.bLoss = 0;
break;
case Graphics::kFormatRGBA6666:
result.bytesPerPixel = 3;
result.aLoss = result.gLoss = result.rLoss = result.bLoss = 2;
break;
case Graphics::kFormatRGBA8888:
result.bytesPerPixel = 4;
result.aLoss = result.gLoss = result.rLoss = result.bLoss = 0;
break;
case Graphics::kFormatCLUT8:
default:
result.bytesPerPixel = 1;
result.rShift = result.gShift = result.bShift = result.aShift = 0;
result.rLoss = result.gLoss = result.bLoss = result.aLoss = 8;
return result;
}
result.aShift = 0;
result.bShift = result.aBits();
result.gShift = result.bShift + result.bBits();
result.rShift = result.gShift + result.gBits();
return result;
}
#endif
void OSystem_SDL::initSize(uint w, uint h) {