diff options
| author | Johannes Schickel | 2013-08-07 12:24:59 -0700 |
|---|---|---|
| committer | Johannes Schickel | 2013-08-07 12:24:59 -0700 |
| commit | 7f8308e0eb50c4e13ec0684619b5474983a93a66 (patch) | |
| tree | 0a057f01385a11d99add1e294f70891a8e8bf6c9 /backends/platform/ps2/Gs2dScreen.cpp | |
| parent | 6e9390feb8166d5f9d6c6fdfe00a336b4f71de4c (diff) | |
| parent | e5f0c42a65f38611272542a144228753e0496493 (diff) | |
| download | scummvm-rg350-7f8308e0eb50c4e13ec0684619b5474983a93a66.tar.gz scummvm-rg350-7f8308e0eb50c4e13ec0684619b5474983a93a66.tar.bz2 scummvm-rg350-7f8308e0eb50c4e13ec0684619b5474983a93a66.zip | |
Merge pull request #365 from lordhoto/protected-pixels
Make Graphics::Surface::pixels protected.
Diffstat (limited to 'backends/platform/ps2/Gs2dScreen.cpp')
| -rw-r--r-- | backends/platform/ps2/Gs2dScreen.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/backends/platform/ps2/Gs2dScreen.cpp b/backends/platform/ps2/Gs2dScreen.cpp index e818305c29..58667c0230 100644 --- a/backends/platform/ps2/Gs2dScreen.cpp +++ b/backends/platform/ps2/Gs2dScreen.cpp @@ -392,12 +392,8 @@ void Gs2dScreen::copyScreenRect(const uint8 *buf, int pitch, int x, int y, int w Graphics::Surface *Gs2dScreen::lockScreen() { WaitSema(g_DmacSema); - _framebuffer.pixels = _screenBuf; - _framebuffer.w = _width; - _framebuffer.h = _height; - _framebuffer.pitch = _width; // -not- _pitch; ! It's EE mem, not Tex - _framebuffer.format = Graphics::PixelFormat::createFormatCLUT8(); - + // -not- _pitch; ! It's EE mem, not Tex + _framebuffer.init(_width, _height, _width, _screenBuf, Graphics::PixelFormat::createFormatCLUT8()); return &_framebuffer; } |