GRIM: Do not convert type-1 bitmap data on submission

Instead, generate color key in a consistent pixel format.
This commit is contained in:
Vincent Pelletier 2017-04-29 09:42:49 +00:00
parent 090dc58a83
commit a0886193f0

View File

@ -943,11 +943,6 @@ void GfxTinyGL::turnOffLight(int lightId) {
}
void GfxTinyGL::createBitmap(BitmapData *bitmap) {
const int colorKeyValue = _pixelFormat.ARGBToColor(0, 255, 0, 255);
if (bitmap->_format == 1) {
bitmap->convertToColorFormat(_pixelFormat);
}
Graphics::BlitImage **imgs = new Graphics::BlitImage*[bitmap->_numImages];
bitmap->_texIds = (void *)imgs;
@ -985,7 +980,7 @@ void GfxTinyGL::createBitmap(BitmapData *bitmap) {
sourceSurface.w = bitmap->_width;
sourceSurface.h = bitmap->_height;
sourceSurface.pitch = sourceSurface.w * imageBuffer.getFormat().bytesPerPixel;
Graphics::tglUploadBlitImage(imgs[i], sourceSurface, colorKeyValue, true);
Graphics::tglUploadBlitImage(imgs[i], sourceSurface, sourceSurface.format.ARGBToColor(0, 255, 0, 255), true);
}
}
}