diff options
| author | Johannes Schickel | 2012-06-20 08:02:26 -0700 |
|---|---|---|
| committer | Johannes Schickel | 2012-06-20 08:02:26 -0700 |
| commit | 4fb9bceabc4309a477472aa55207eae55bc0aa13 (patch) | |
| tree | 1e119f6d63d0a4c5c38a7caabd92be335749f07d /backends/platform/ps2/Gs2dScreen.cpp | |
| parent | 5a2e65469f3650dc9785bf27b77d25d285ded4f1 (diff) | |
| parent | aec9b9e22a9bff54ae3c39bb796bae0f4b4c2d95 (diff) | |
| download | scummvm-rg350-4fb9bceabc4309a477472aa55207eae55bc0aa13.tar.gz scummvm-rg350-4fb9bceabc4309a477472aa55207eae55bc0aa13.tar.bz2 scummvm-rg350-4fb9bceabc4309a477472aa55207eae55bc0aa13.zip | |
Merge pull request #246 from lordhoto/osystem-void-buffers
OSYSTEM: Use void buffers for screen/overlay/mouse buffers and proper pitch values for overlay code
Diffstat (limited to 'backends/platform/ps2/Gs2dScreen.cpp')
| -rw-r--r-- | backends/platform/ps2/Gs2dScreen.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backends/platform/ps2/Gs2dScreen.cpp b/backends/platform/ps2/Gs2dScreen.cpp index 8df6198c38..f93166ef67 100644 --- a/backends/platform/ps2/Gs2dScreen.cpp +++ b/backends/platform/ps2/Gs2dScreen.cpp @@ -564,7 +564,7 @@ void Gs2dScreen::clearPrintfOverlay(void) { free(tmpBuf); } -void Gs2dScreen::copyOverlayRect(const uint16 *buf, uint16 pitch, uint16 x, uint16 y, uint16 w, uint16 h) { +void Gs2dScreen::copyOverlayRect(const byte *buf, uint16 pitch, uint16 x, uint16 y, uint16 w, uint16 h) { WaitSema(g_DmacSema); // warning("_overlayBuf [dst] = %x", _overlayBuf); @@ -601,7 +601,7 @@ void Gs2dScreen::clearOverlay(void) { SignalSema(g_DmacSema); } -void Gs2dScreen::grabOverlay(uint16 *buf, uint16 pitch) { +void Gs2dScreen::grabOverlay(byte *buf, uint16 pitch) { uint16 *src = _overlayBuf; for (uint32 cnt = 0; cnt < _height; cnt++) { memcpy(buf, src, _width * 2); |