libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 06:08:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SDL: Workaround for broken SDL on Miyoo Mini

Browse Source
This commit is contained in:
Vladimir Serbinenko 2023-01-16 22:29:35 +01:00
parent 66202f3a32
commit 576b2be0cb
6 changed files with 113 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
backends/graphics/miyoo/miyoomini-graphics.cpp Normal file
View File

@ -0,0 +1,51 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#include "backends/graphics/miyoo/miyoomini-graphics.h"
void MiyooMiniGraphicsManager::initGraphicsSurface() {
_hwScreen = nullptr;
_realHwScreen = SDL_SetVideoMode(_videoMode.hardwareWidth, _videoMode.hardwareHeight, 32,
SDL_HWSURFACE);
if (!_realHwScreen)
return;
_hwScreen = SDL_CreateRGBSurface(SDL_HWSURFACE, _videoMode.hardwareWidth, _videoMode.hardwareHeight,
_realHwScreen->format->BitsPerPixel,
_realHwScreen->format->Rmask,
_realHwScreen->format->Gmask,
_realHwScreen->format->Bmask,
_realHwScreen->format->Amask);
_isDoubleBuf = false;
}
void MiyooMiniGraphicsManager::unloadGFXMode() {
if (_realHwScreen) {
SDL_FreeSurface(_realHwScreen);
_realHwScreen = nullptr;
}
SurfaceSdlGraphicsManager::unloadGFXMode();
}
void MiyooMiniGraphicsManager::updateScreen(SDL_Rect *dirtyRectList, int actualDirtyRects) {
SDL_BlitSurface(_hwScreen, nullptr, _realHwScreen, nullptr);
SDL_UpdateRects(_realHwScreen, actualDirtyRects, _dirtyRectList);
}

39
backends/graphics/miyoo/miyoomini-graphics.h Normal file
View File

@ -0,0 +1,39 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#ifndef BACKENDS_GRAPHICS_MIYOOMINI_H
#define BACKENDS_GRAPHICS_MIYOOMINI_H
#include "backends/graphics/surfacesdl/surfacesdl-graphics.h"
class MiyooMiniGraphicsManager : public SurfaceSdlGraphicsManager {
public:
MiyooMiniGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window) : SurfaceSdlGraphicsManager(sdlEventSource, window), _realHwScreen(nullptr) {}
void initGraphicsSurface() override;
void unloadGFXMode() override;
void updateScreen(SDL_Rect *dirtyRectList, int actualDirtyRects) override;
private:
SDL_Surface *_realHwScreen;
};
#endif /* BACKENDS_GRAPHICS_MIYOOMINI_H */

6
backends/graphics/surfacesdl/surfacesdl-graphics.cpp
View File

@ -1144,6 +1144,10 @@ void SurfaceSdlGraphicsManager::updateScreen() {
internUpdateScreen();
}
void SurfaceSdlGraphicsManager::updateScreen(SDL_Rect *dirtyRectList, int actualDirtyRects) {
SDL_UpdateRects(_hwScreen, actualDirtyRects, dirtyRectList);
}
void SurfaceSdlGraphicsManager::internUpdateScreen() {
SDL_Surface *srcSurf, *origSurf;
int height, width;
@ -1447,7 +1451,7 @@ void SurfaceSdlGraphicsManager::internUpdateScreen() {
// Finally, blit all our changes to the screen
if (!_displayDisabled) {
SDL_UpdateRects(_hwScreen, actualDirtyRects, _dirtyRectList);
updateScreen(_dirtyRectList, actualDirtyRects);
}
}

1
backends/graphics/surfacesdl/surfacesdl-graphics.h
View File

@ -420,6 +420,7 @@ protected:
virtual void blitCursor();
virtual void internUpdateScreen();
virtual void updateScreen(SDL_Rect *dirtyRectList, int actualDirtyRects);
virtual bool loadGFXMode();
virtual void unloadGFXMode();

7
backends/module.mk
View File

@ -350,6 +350,13 @@ MODULE_OBJS += \
mixer/null/null-mixer.o
endif
ifdef MIYOO
ifeq ($(MIYOO_TARGET), miyoomini)
MODULE_OBJS += \
graphics/miyoo/miyoomini-graphics.o
endif
endif
ifdef OPENDINGUX
MODULE_OBJS += \
graphics/opendingux/opendingux-graphics.o

10
backends/platform/sdl/miyoo/miyoo.cpp
View File

@ -25,6 +25,9 @@
#include "common/config-manager.h"
#include "common/translation.h"
#ifdef MIYOOMINI
#include "backends/graphics/miyoo/miyoomini-graphics.h"
#endif
#include "backends/platform/sdl/miyoo/miyoo.h"
#include "backends/fs/posix/posix-fs-factory.h"
@ -147,6 +150,13 @@ void OSystem_SDL_Miyoo::initBackend() {
_savefileManager = new DefaultSaveFileManager(SAVE_PATH);
}
#ifdef MIYOOMINI
if (!_eventSource)
_eventSource = new SdlEventSource();
if (!_graphicsManager)
_graphicsManager = new MiyooMiniGraphicsManager(_eventSource, _window);
#endif
OSystem_SDL::initBackend();
}