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

BACKENDS: ATARI: Use unordered_set for dirty rects

Browse Source 
This allows efficient redraw of surfaces which don't change their
position too much.
This commit is contained in:
Miro Kropacek 2023-06-15 22:23:06 +02:00
parent 2ce02658ec
commit d9eee7906a
3 changed files with 29 additions and 14 deletions
backends
events/atari
atari-events.cpp
graphics/atari
atari-graphics.cppatari-graphics.h

2
backends/events/atari/atari-events.cpp

@ -19,6 +19,8 @@
*
*/
#define FORBIDDEN_SYMBOL_EXCEPTION_FILE // atari-graphics.h's unordered_set
#include "backends/events/atari/atari-events.h"
#include <mint/osbind.h>

19
backends/graphics/atari/atari-graphics.cpp

@ -19,6 +19,8 @@
*
*/
#define FORBIDDEN_SYMBOL_EXCEPTION_FILE // atari-graphics.h's unordered_set
#include "backends/graphics/atari/atari-graphics.h"
#include <mint/cookie.h>
@ -444,20 +446,20 @@ void AtariGraphicsManager::updateScreen() {
if (isOverlayVisible()) {
assert(_workScreen == _screen[OVERLAY_BUFFER]);
screenUpdated = updateScreenInternal(_overlaySurface, _workScreen->dirtyRects);
screenUpdated = updateScreenInternal(_overlaySurface);
} else {
switch (_currentState.mode) {
case GraphicsMode::DirectRendering:
assert(_workScreen == _screen[FRONT_BUFFER]);
screenUpdated = updateScreenInternal(Graphics::Surface(), _workScreen->dirtyRects);
screenUpdated = updateScreenInternal(Graphics::Surface());
break;
case GraphicsMode::SingleBuffering:
assert(_workScreen == _screen[FRONT_BUFFER]);
screenUpdated = updateScreenInternal(_chunkySurface, _workScreen->dirtyRects);
screenUpdated = updateScreenInternal(_chunkySurface);
break;
case GraphicsMode::TripleBuffering:
assert(_workScreen == _screen[BACK_BUFFER1]);
screenUpdated = updateScreenInternal(_chunkySurface, _workScreen->dirtyRects);
screenUpdated = updateScreenInternal(_chunkySurface);
break;
}
}
@ -866,9 +868,10 @@ void AtariGraphicsManager::convertRectToSurfaceWithKey(Graphics::Surface &dstSur
}
}
bool AtariGraphicsManager::updateScreenInternal(const Graphics::Surface &srcSurface, const DirtyRects &dirtyRects) {
bool AtariGraphicsManager::updateScreenInternal(const Graphics::Surface &srcSurface) {
//debug("updateScreenInternal: %d", (int)dirtyRects.size());
const DirtyRects &dirtyRects = _workScreen->dirtyRects;
Graphics::Surface *dstSurface = _workScreen->offsettedSurf;
bool &cursorPositionChanged = _workScreen->cursorPositionChanged;
bool &cursorSurfaceChanged = _workScreen->cursorSurfaceChanged;
@ -1081,17 +1084,17 @@ void AtariGraphicsManager::Screen::addDirtyRect(const Graphics::Surface &srcSurf
rect.right = (rect.right + 15) & 0xfff0;
if ((rect.width() == srcSurface.w && rect.height() == srcSurface.h)
|| dirtyRects.size() == dirtyRects.capacity()) {
|| dirtyRects.size() == 128) { // 320x200 can hold at most 250 16x16 rectangles
//debug("addDirtyRect[%d]: purge %d x %d", (int)dirtyRects.size(), srcSurface.w, srcSurface.h);
dirtyRects.clear();
dirtyRects.push_back(Common::Rect(srcSurface.w, srcSurface.h));
dirtyRects.emplace(srcSurface.w, srcSurface.h);
fullRedraw = true;
return;
}
dirtyRects.push_back(rect);
dirtyRects.emplace(std::move(rect));
}
void AtariGraphicsManager::Cursor::update(const Graphics::Surface &screen, bool isModified) {

22
backends/graphics/atari/atari-graphics.h

@ -23,15 +23,26 @@
#define BACKENDS_GRAPHICS_ATARI_H
#include "backends/graphics/graphics.h"
#include "common/events.h"
#include <mint/osbind.h>
#include <mint/ostruct.h>
#include <vector>
#include <unordered_set>
#include "common/events.h"
#include "common/rect.h"
#include "graphics/surface.h"
template<>
struct std::hash<Common::Rect>
{
std::size_t operator()(Common::Rect const& rect) const noexcept
{
return 31 * (31 * (31 * rect.left + rect.top) + rect.right) + rect.bottom;
}
};
///////////////////////////////////////////////////////////////////////////////
class AtariGraphicsManager : public GraphicsManager, Common::EventObserver {
public:
AtariGraphicsManager();
@ -128,8 +139,7 @@ protected:
GraphicsState _pendingState{ (GraphicsMode)getDefaultGraphicsMode() };
private:
// use std::vector as its clear() doesn't reset capacity
using DirtyRects = std::vector<Common::Rect>;
using DirtyRects = std::unordered_set<Common::Rect>;
enum CustomEventAction {
kActionToggleAspectRatioCorrection = 100,
@ -147,7 +157,7 @@ private:
int16 getMaximumScreenHeight() const { return 480; }
int16 getMaximumScreenWidth() const { return _tt ? 320 : (_vgaMonitor ? 640 : 640*1.2); }
bool updateScreenInternal(const Graphics::Surface &srcSurface, const DirtyRects &dirtyRects);
bool updateScreenInternal(const Graphics::Surface &srcSurface);
virtual AtariMemAlloc getStRamAllocFunc() const {
return [](size_t bytes) { return (void*)Mxalloc(bytes, MX_STRAM); };
@ -261,7 +271,7 @@ private:
bool cursorPositionChanged = true;
bool cursorSurfaceChanged = false;
bool cursorVisibilityChanged = false;
DirtyRects dirtyRects = DirtyRects(512); // reserve 512 rects
DirtyRects dirtyRects;
bool fullRedraw = false;
Common::Rect oldCursorRect;
int rez = -1;