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

IPHONE: Rename screen related buffers a bit.

Browse Source
This commit is contained in:
Johannes Schickel 2012-02-20 00:35:14 +01:00
parent 93d80793b4
commit 723a38c699
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backends/platform/iphone/osys_main.cpp
View File

@ -53,8 +53,8 @@ SoundProc OSystem_IPHONE::s_soundCallback = NULL;
void *OSystem_IPHONE::s_soundParam = NULL;
OSystem_IPHONE::OSystem_IPHONE() :
_mixer(NULL), _offscreen(NULL),
_overlayVisible(false), _fullscreen(NULL),
_mixer(NULL), _gameScreenRaw(NULL),
_overlayVisible(false), _gameScreenConverted(NULL),
_mouseHeight(0), _mouseWidth(0), _mouseBuf(NULL), _lastMouseTap(0), _queuedEventTime(0),
_secondaryTapped(false), _lastSecondaryTap(0),
_screenOrientation(kScreenOrientationFlippedLandscape), _mouseClickAndDragEnabled(false),
@ -70,8 +70,8 @@ OSystem_IPHONE::~OSystem_IPHONE() {
AudioQueueDispose(s_AudioQueue.queue, true);
delete _mixer;
delete _offscreen;
delete _fullscreen;
delete _gameScreenRaw;
delete _gameScreenConverted;
}
int OSystem_IPHONE::timerHandler(int t) {

4
backends/platform/iphone/osys_main.h
View File

@ -63,12 +63,12 @@ protected:
Audio::MixerImpl *_mixer;
Graphics::Surface _framebuffer;
byte *_offscreen;
byte *_gameScreenRaw;
OverlayColor *_overlayBuffer;
uint16 _overlayHeight;
uint16 _overlayWidth;
uint16 *_fullscreen;
uint16 *_gameScreenConverted;
// For use with the game texture
uint16 _gamePalette[256];

22
backends/platform/iphone/osys_video.cpp
View File

@ -52,10 +52,10 @@ void OSystem_IPHONE::initSize(uint width, uint height, const Graphics::PixelForm
_screenWidth = width;
_screenHeight = height;
free(_offscreen);
free(_gameScreenRaw);
_offscreen = (byte *)malloc(width * height);
bzero(_offscreen, width * height);
_gameScreenRaw = (byte *)malloc(width * height);
bzero(_gameScreenRaw, width * height);
//free(_overlayBuffer);
@ -63,10 +63,10 @@ void OSystem_IPHONE::initSize(uint width, uint height, const Graphics::PixelForm
//_overlayBuffer = (OverlayColor *)malloc(fullSize);
clearOverlay();
free(_fullscreen);
free(_gameScreenConverted);
_fullscreen = (uint16 *)malloc(fullSize);
bzero(_fullscreen, fullSize);
_gameScreenConverted = (uint16 *)malloc(fullSize);
bzero(_gameScreenConverted, fullSize);
iPhone_initSurface(width, height);
@ -147,7 +147,7 @@ void OSystem_IPHONE::copyRectToScreen(const byte *buf, int pitch, int x, int y,
}
byte *dst = _offscreen + y * _screenWidth + x;
byte *dst = _gameScreenRaw + y * _screenWidth + x;
if (_screenWidth == pitch && pitch == w)
memcpy(dst, buf, h * w);
else {
@ -196,8 +196,8 @@ void OSystem_IPHONE::drawDirtyRect(const Common::Rect &dirtyRect) {
int h = dirtyRect.bottom - dirtyRect.top;
int w = dirtyRect.right - dirtyRect.left;
byte *src = &_offscreen[dirtyRect.top * _screenWidth + dirtyRect.left];
uint16 *dst = &_fullscreen[dirtyRect.top * _screenWidth + dirtyRect.left];
byte *src = &_gameScreenRaw[dirtyRect.top * _screenWidth + dirtyRect.left];
uint16 *dst = &_gameScreenConverted[dirtyRect.top * _screenWidth + dirtyRect.left];
for (int y = h; y > 0; y--) {
for (int x = w; x > 0; x--)
*dst++ = _gamePalette[*src++];
@ -222,13 +222,13 @@ void OSystem_IPHONE::drawDirtyOverlayRect(const Common::Rect &dirtyRect) {
}
void OSystem_IPHONE::updateHardwareSurfaceForRect(const Common::Rect &updatedRect) {
iPhone_updateScreenRect(_fullscreen, updatedRect.left, updatedRect.top, updatedRect.right, updatedRect.bottom);
iPhone_updateScreenRect(_gameScreenConverted, updatedRect.left, updatedRect.top, updatedRect.right, updatedRect.bottom);
}
Graphics::Surface *OSystem_IPHONE::lockScreen() {
//printf("lockScreen()\n");
_framebuffer.pixels = _offscreen;
_framebuffer.pixels = _gameScreenRaw;
_framebuffer.w = _screenWidth;
_framebuffer.h = _screenHeight;
_framebuffer.pitch = _screenWidth;