libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-05 16:21:40 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

3DS: Improve performance when converting the screen in software

Browse Source
This commit is contained in:
Cameron Cawley 2024-04-10 14:10:15 +01:00
parent 8c33d23e9c
commit dca3c4179b
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
backends/platform/3ds/osystem-graphics.cpp
View File

@ -275,10 +275,13 @@ void OSystem_3DS::updateSize() {
Common::List<Graphics::PixelFormat> OSystem_3DS::getSupportedFormats() const { Common::List<Graphics::PixelFormat> OSystem_3DS::getSupportedFormats() const {
Common::List<Graphics::PixelFormat> list; Common::List<Graphics::PixelFormat> list;
// The following formats are supported natively by the GPU
list.push_back(Graphics::PixelFormat(4, 8, 8, 8, 8, 24, 16, 8, 0)); // GPU_RGBA8 list.push_back(Graphics::PixelFormat(4, 8, 8, 8, 8, 24, 16, 8, 0)); // GPU_RGBA8
list.push_back(Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0)); // GPU_RGB565 list.push_back(Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0)); // GPU_RGB565
list.push_back(Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0)); // RGB555 (needed for FMTOWNS?)
list.push_back(Graphics::PixelFormat(2, 5, 5, 5, 1, 11, 6, 1, 0)); // GPU_RGBA5551 list.push_back(Graphics::PixelFormat(2, 5, 5, 5, 1, 11, 6, 1, 0)); // GPU_RGBA5551
// The following formats require software conversion
list.push_back(Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0)); // RGB555 (needed for FMTOWNS?)
list.push_back(Graphics::PixelFormat::createFormatCLUT8()); list.push_back(Graphics::PixelFormat::createFormatCLUT8());
return list; return list;
} }
@ -342,6 +345,7 @@ float OSystem_3DS::getScaleRatio() const {
void OSystem_3DS::setPalette(const byte *colors, uint start, uint num) { void OSystem_3DS::setPalette(const byte *colors, uint start, uint num) {
assert(start + num <= 256); assert(start + num <= 256);
memcpy(_palette + 3 * start, colors, 3 * num); memcpy(_palette + 3 * start, colors, 3 * num);
Graphics::convertPaletteToMap(_paletteMap + start, colors, num, _modeCLUT8.surfaceFormat);
_gameTextureDirty = true; _gameTextureDirty = true;
} }
@ -372,11 +376,14 @@ void OSystem_3DS::copyRectToScreen(const void *buf, int pitch, int x,
_gameTopTexture.copyRectToSurface(subSurface, x, y, Common::Rect(w, h)); _gameTopTexture.copyRectToSurface(subSurface, x, y, Common::Rect(w, h));
} else if (_gfxState.gfxMode == &_modeRGB555) { } else if (_gfxState.gfxMode == &_modeRGB555) {
copyRect555To5551(subSurface, _gameTopTexture, x, y, Common::Rect(w, h)); copyRect555To5551(subSurface, _gameTopTexture, x, y, Common::Rect(w, h));
} else if (_gfxState.gfxMode == &_modeCLUT8) {
byte *dst = (byte *)_gameTopTexture.getBasePtr(x, y);
Graphics::crossBlitMap(dst, (const byte *)buf, _gameTopTexture.pitch, pitch,
w, h, _gameTopTexture.format.bytesPerPixel, _paletteMap);
} else { } else {
Graphics::Surface *convertedSubSurface = subSurface.convertTo(_gameTopTexture.format, _palette); byte *dst = (byte *)_gameTopTexture.getBasePtr(x, y);
_gameTopTexture.copyRectToSurface(*convertedSubSurface, x, y, Common::Rect(w, h)); Graphics::crossBlit(dst, (const byte *)buf, _gameTopTexture.pitch, pitch,
convertedSubSurface->free(); w, h, _gameTopTexture.format, _pfGame);
delete convertedSubSurface;
} }
_gameTopTexture.markDirty(); _gameTopTexture.markDirty();
@ -387,11 +394,16 @@ void OSystem_3DS::flushGameScreen() {
_gameTopTexture.copyRectToSurface(_gameScreen, 0, 0, Common::Rect(_gameScreen.w, _gameScreen.h)); _gameTopTexture.copyRectToSurface(_gameScreen, 0, 0, Common::Rect(_gameScreen.w, _gameScreen.h));
} else if (_gfxState.gfxMode == &_modeRGB555) { } else if (_gfxState.gfxMode == &_modeRGB555) {
copyRect555To5551(_gameScreen, _gameTopTexture, 0, 0, Common::Rect(_gameScreen.w, _gameScreen.h)); copyRect555To5551(_gameScreen, _gameTopTexture, 0, 0, Common::Rect(_gameScreen.w, _gameScreen.h));
} else if (_gfxState.gfxMode == &_modeCLUT8) {
const byte *src = (const byte *)_gameScreen.getPixels();
byte *dst = (byte *)_gameTopTexture.getPixels();
Graphics::crossBlitMap(dst, src, _gameTopTexture.pitch, _gameScreen.pitch,
_gameScreen.w, _gameScreen.h, _gameTopTexture.format.bytesPerPixel, _paletteMap);
} else { } else {
Graphics::Surface *converted = _gameScreen.convertTo(_gameTopTexture.format, _palette); const byte *src = (const byte *)_gameScreen.getPixels();
_gameTopTexture.copyRectToSurface(*converted, 0, 0, Common::Rect(converted->w, converted->h)); byte *dst = (byte *)_gameTopTexture.getPixels();
converted->free(); Graphics::crossBlit(dst, src, _gameTopTexture.pitch, _gameScreen.pitch,
delete converted; _gameScreen.w, _gameScreen.h, _gameTopTexture.format, _pfGame);
} }
_gameTopTexture.markDirty(); _gameTopTexture.markDirty();

1
backends/platform/3ds/osystem.h
View File

@ -223,6 +223,7 @@ private:
Graphics::PixelFormat _pfCursor; Graphics::PixelFormat _pfCursor;
byte _palette[3 * 256]; byte _palette[3 * 256];
byte _cursorPalette[3 * 256]; byte _cursorPalette[3 * 256];
uint32 _paletteMap[256];
Graphics::Surface _gameScreen; Graphics::Surface _gameScreen;
bool _gameTextureDirty; bool _gameTextureDirty;