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

Implemented the OSystem framebuffer API, as discussed on scummvm-devel. All changes are just fine, and won't cause any compile problems or regressions, despite the fact that I can't test most of the non-SDL backend changes, at an improbability level of two to the power of two hundred and seventy-six thousand to one against - possibly much higher. Anything you still can't cope with is therefore your own problem. Please relax.

Browse source 
svn-id: r27548
This commit is contained in:
Max Horn 2007-06-19 22:39:59 +00:00
parent ab9b9a1bf3
commit b51f2f3212
26 changed files with 217 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -761,22 +761,6 @@ void OSystem_SDL::setAspectRatioCorrection(bool enable) {
}
}
void OSystem_SDL::clearScreen() {
assert (_transactionMode == kTransactionNone);
// Try to lock the screen surface
if (SDL_LockSurface(_screen) == -1)
error("SDL_LockSurface failed: %s", SDL_GetError());
byte *dst = (byte *)_screen->pixels;
// Clear the screen
memset(dst, 0, _screenWidth * _screenHeight);
// Unlock the screen surface
SDL_UnlockSurface(_screen);
}
void OSystem_SDL::copyRectToScreen(const byte *src, int pitch, int x, int y, int w, int h) {
assert (_transactionMode == kTransactionNone);
assert(src);
@ -848,24 +832,44 @@ void OSystem_SDL::copyRectToScreen(const byte *src, int pitch, int x, int y, int
SDL_UnlockSurface(_screen);
}
bool OSystem_SDL::grabRawScreen(Graphics::Surface *surf) {
assert(_screen);
assert(surf);
Graphics::Surface *OSystem_SDL::lockScreen() {
assert (_transactionMode == kTransactionNone);
Common::StackLock lock(_graphicsMutex); // Lock the mutex until this function ends
// Lock the graphics mutex
lockMutex(_graphicsMutex);
surf->create(_screenWidth, _screenHeight, _screen->format->BytesPerPixel);
// paranoia check
assert(!_screenIsLocked);
_screenIsLocked = true;
// Try to lock the screen surface
if (SDL_LockSurface(_screen) == -1)
error("SDL_LockSurface failed: %s", SDL_GetError());
memcpy(surf->pixels, _screen->pixels, _screenWidth * _screenHeight * _screen->format->BytesPerPixel);
_framebuffer.pixels = _screen->pixels;
_framebuffer.w = _screen->w;
_framebuffer.h = _screen->h;
_framebuffer.pitch = _screen->pitch;
_framebuffer.bytesPerPixel = 1;
return &_framebuffer;
}
void OSystem_SDL::unlockScreen() {
assert (_transactionMode == kTransactionNone);
// paranoia check
assert(_screenIsLocked);
_screenIsLocked = false;
// Unlock the screen surface
SDL_UnlockSurface(_screen);
return true;
// Trigger a full screen update
_forceFull = true;
// Finally unlock the graphics mutex
unlockMutex(_graphicsMutex);
}
void OSystem_SDL::addDirtyRect(int x, int y, int w, int h, bool realCoordinates) {