Ticket #9095: fix.patch

backends/platform/psp/osys_psp.cpp

@@ -109 +109 @@
 };
 
 
-OSystem_PSP::OSystem_PSP() : _screenWidth(0), _screenHeight(0), _overlayWidth(0), _overlayHeight(0), _offscreen(0), _overlayBuffer(0), _overlayVisible(false), _shakePos(0), _lastScreenUpdate(0), _mouseBuf(0), _prevButtons(0), _lastPadCheck(0), _padAccel(0), _mixer(0) {
+OSystem_PSP::OSystem_PSP() : _screenWidth(0), _screenHeight(0), _overlayWidth(0), _overlayHeight(0),
+        _offscreen(0), _overlayBuffer(0), _overlayVisible(false), _shakePos(0), _lastScreenUpdate(0), _mouseBuf(0), _prevButtons(0), _lastPadCheck(0), _padAccel(0), _mixer(0) {
+
         memset(_palette, 0, sizeof(_palette));
 
         _cursorPaletteDisabled = true;
@@ -251 +253 @@
 
 void OSystem_PSP::initSize(uint width, uint height, const Graphics::PixelFormat *format) {
         PSPDebugTrace("initSize\n");
+
         _screenWidth = width;
         _screenHeight = height;
 
@@ -258 +261 @@
         _overlayHeight = PSP_SCREEN_HEIGHT;     //height;
 
 //      _offscreen = (byte *)offscreen256;
-        _overlayBuffer = (OverlayColor *)0x44000000 + PSP_FRAME_SIZE;
+//      _overlayBuffer = (OverlayColor *)0x44000000 + PSP_FRAME_SIZE;
+        if(_overlayBuffer) {
+                free(_overlayBuffer);
+                _overlayBuffer = 0;
+        }
+        _overlayBuffer = (OverlayColor *)memalign(16, _overlayWidth * _overlayHeight * sizeof(OverlayColor));
 
-        _offscreen = (byte *)_overlayBuffer + _overlayWidth * _overlayHeight * sizeof(OverlayColor);
-        bzero(_offscreen, width * height);
+//      _offscreen = (byte *)_overlayBuffer + _overlayWidth * _overlayHeight * sizeof(OverlayColor);
+        if(_offscreen) {
+                free(_offscreen);
+                _offscreen = 0;
+        }
+        if(format) {
+                _offscreen = (byte *)memalign(16, _screenWidth * _screenHeight * format->bytesPerPixel);
+                bzero(_offscreen, _screenWidth * _screenHeight * format->bytesPerPixel);
+        }
+        else { // Assume maximum
+                _offscreen = (byte *)memalign(16, _screenWidth * _screenHeight * 4);
+                bzero(_offscreen, _screenWidth * _screenHeight * 4);
+        }
+
         clearOverlay();
         memset(_palette, 0xFFFF, 256 * sizeof(unsigned short));
         _kbdClut[0] = 0xFFFF;
@@ -347 +367 @@
 
 
         byte *dst = _offscreen + y * _screenWidth + x;
+        dst = (byte *)((unsigned int)dst | 0x40000000); // Make this an uncached write
 
         if (_screenWidth == pitch && pitch == w)
         {
                 memcpy(dst, buf, h * w);
-/*
-                sceGuStart(0, displayList);
-                sceGuCopyImage( 3, 0, 0, w/2, h, w/2, (void *)buf, x/2, y, _screenWidth /2, _offscreen);
-                sceGuFinish();
-                sceGuSync(0,0);
-*/
         }
          else
         {
@@ -367 +382 @@
                         dst += _screenWidth;
                 } while (--h);
         }
+
 }
 
 Graphics::Surface *OSystem_PSP::lockScreen() {
@@ -647 +663 @@
                 sceGuDrawArray(GU_SPRITES, GU_TEXTURE_32BITF|GU_VERTEX_32BITF|GU_TRANSFORM_2D, 2, 0, vertKB);
                 sceGuDisable(GU_BLEND);
         }
-        //sceKernelDcacheWritebackAll();
 
         sceGuFinish();
         sceGuSync(0,0);
 
         sceDisplayWaitVblankStart();
         sceGuSwapBuffers();
-
-        //sceKernelDcacheWritebackAll();
 }
 
 void OSystem_PSP::setShakePos(int shakeOffset) {