diff options
author | dhewg | 2011-03-14 18:58:33 +0100 |
---|---|---|
committer | dhewg | 2011-03-14 19:35:36 +0100 |
commit | 6389e70e45864aaec860481cc25208f1a9ca4a76 (patch) | |
tree | 04839d9e51f8d3280ad835b737c915f4401ba508 /backends | |
parent | 5b94159f40fba8edaf15bf8961c479898646eb2d (diff) | |
download | scummvm-rg350-6389e70e45864aaec860481cc25208f1a9ca4a76.tar.gz scummvm-rg350-6389e70e45864aaec860481cc25208f1a9ca4a76.tar.bz2 scummvm-rg350-6389e70e45864aaec860481cc25208f1a9ca4a76.zip |
ANDROID: Remove clearBuffer()
Not required. Why did i add that again?
Diffstat (limited to 'backends')
-rw-r--r-- | backends/platform/android/gfx.cpp | 8 | ||||
-rw-r--r-- | backends/platform/android/texture.cpp | 12 | ||||
-rw-r--r-- | backends/platform/android/texture.h | 4 |
3 files changed, 4 insertions, 20 deletions
diff --git a/backends/platform/android/gfx.cpp b/backends/platform/android/gfx.cpp index 2a66fcf247..dfab8255ae 100644 --- a/backends/platform/android/gfx.cpp +++ b/backends/platform/android/gfx.cpp @@ -146,7 +146,7 @@ void OSystem_Android::initTexture(GLESBaseTexture **texture, } (*texture)->allocBuffer(width, height); - (*texture)->clearBuffer(); + (*texture)->fillBuffer(0); } #endif @@ -253,7 +253,7 @@ void OSystem_Android::initOverlay() { LOGI("overlay size is %ux%u", overlay_width, overlay_height); _overlay_texture->allocBuffer(overlay_width, overlay_height); - _overlay_texture->clearBuffer(); + _overlay_texture->fillBuffer(0); _overlay_texture->setDrawRect(0, 0, _egl_surface_width, _egl_surface_height); } @@ -268,7 +268,7 @@ void OSystem_Android::initSize(uint width, uint height, initTexture(&_game_texture, width, height, format); #else _game_texture->allocBuffer(width, height); - _game_texture->clearBuffer(); + _game_texture->fillBuffer(0); #endif updateScreenRect(); @@ -726,7 +726,7 @@ void OSystem_Android::setMouseCursor(const byte *buf, uint w, uint h, delete[] tmp; - _mouse_texture->clearBuffer(); + _mouse_texture->fillBuffer(0); return; } diff --git a/backends/platform/android/texture.cpp b/backends/platform/android/texture.cpp index 9501d94f48..87a8c2e362 100644 --- a/backends/platform/android/texture.cpp +++ b/backends/platform/android/texture.cpp @@ -280,10 +280,6 @@ void GLESTexture::fillBuffer(uint32 color) { setDirty(); } -void GLESTexture::clearBuffer() { - fillBuffer(_pixelFormat.ARGBToColor(0xff, 0, 0, 0)); -} - void GLESTexture::drawTexture(GLshort x, GLshort y, GLshort w, GLshort h) { if (_all_dirty) { _dirty_rect.top = 0; @@ -394,10 +390,6 @@ void GLESPaletteTexture::fillBuffer(uint32 color) { setDirty(); } -void GLESPaletteTexture::clearBuffer() { - fillBuffer(0); -} - void GLESPaletteTexture::updateBuffer(GLuint x, GLuint y, GLuint w, GLuint h, const void *buf, int pitch_buf) { setDirtyRect(Common::Rect(x, y, x + w, y + h)); @@ -520,10 +512,6 @@ void GLESFakePaletteTexture::fillBuffer(uint32 color) { setDirty(); } -void GLESFakePaletteTexture::clearBuffer() { - fillBuffer(_palettePixelFormat.ARGBToColor(0xff, 0, 0, 0)); -} - void GLESFakePaletteTexture::updateBuffer(GLuint x, GLuint y, GLuint w, GLuint h, const void *buf, int pitch_buf) { diff --git a/backends/platform/android/texture.h b/backends/platform/android/texture.h index 1fe18bfd72..4f2bfe4c4f 100644 --- a/backends/platform/android/texture.h +++ b/backends/platform/android/texture.h @@ -58,7 +58,6 @@ public: virtual void updateBuffer(GLuint x, GLuint y, GLuint width, GLuint height, const void *buf, int pitch_buf) = 0; virtual void fillBuffer(uint32 color) = 0; - virtual void clearBuffer() = 0; virtual void drawTexture(GLshort x, GLshort y, GLshort w, GLshort h); @@ -183,7 +182,6 @@ public: virtual void updateBuffer(GLuint x, GLuint y, GLuint width, GLuint height, const void *buf, int pitch_buf); virtual void fillBuffer(uint32 color); - virtual void clearBuffer(); virtual void drawTexture(GLshort x, GLshort y, GLshort w, GLshort h); @@ -237,7 +235,6 @@ public: virtual void updateBuffer(GLuint x, GLuint y, GLuint width, GLuint height, const void *buf, int pitch_buf); virtual void fillBuffer(uint32 color); - virtual void clearBuffer(); virtual void drawTexture(GLshort x, GLshort y, GLshort w, GLshort h); @@ -302,7 +299,6 @@ public: virtual void updateBuffer(GLuint x, GLuint y, GLuint width, GLuint height, const void *buf, int pitch_buf); virtual void fillBuffer(uint32 color); - virtual void clearBuffer(); virtual void drawTexture(GLshort x, GLshort y, GLshort w, GLshort h); |