aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordhewg2011-03-07 21:49:51 +0100
committerdhewg2011-03-07 23:42:20 +0100
commite71fb5b0eb9c9c68bf328d557f09a3191e0c8b8f (patch)
tree3e44ff61a7299e1822805f0ac5870a4aa2c7141a
parent920bae62c07d4248869637ff6896f09db5163c66 (diff)
downloadscummvm-rg350-e71fb5b0eb9c9c68bf328d557f09a3191e0c8b8f.tar.gz
scummvm-rg350-e71fb5b0eb9c9c68bf328d557f09a3191e0c8b8f.tar.bz2
scummvm-rg350-e71fb5b0eb9c9c68bf328d557f09a3191e0c8b8f.zip
ANDROID: Move the overlay initialization
There's no point in doing that in initSize() every time
-rw-r--r--backends/platform/android/android.cpp2
-rw-r--r--backends/platform/android/android.h2
-rw-r--r--backends/platform/android/gfx.cpp18
3 files changed, 15 insertions, 7 deletions
diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index 0cfe7c9a22..2be435c701 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -333,6 +333,8 @@ void OSystem_Android::initBackend() {
_mouse_texture_palette = new GLESPalette8888Texture();
_mouse_texture = _mouse_texture_palette;
+ initOverlay();
+
// renice this thread to boost the audio thread
if (setpriority(PRIO_PROCESS, 0, 19) < 0)
warning("couldn't renice the main thread");
diff --git a/backends/platform/android/android.h b/backends/platform/android/android.h
index 5c7154a8e4..f6406c4132 100644
--- a/backends/platform/android/android.h
+++ b/backends/platform/android/android.h
@@ -146,6 +146,8 @@ private:
void deinitSurface();
void initViewport();
+ void initOverlay();
+
#ifdef USE_RGB_COLOR
Common::String getPixelFormatName(const Graphics::PixelFormat &format) const;
void initTexture(GLESTexture **texture, uint width, uint height,
diff --git a/backends/platform/android/gfx.cpp b/backends/platform/android/gfx.cpp
index 90b1c3ec57..6422a28f7b 100644
--- a/backends/platform/android/gfx.cpp
+++ b/backends/platform/android/gfx.cpp
@@ -169,8 +169,10 @@ void OSystem_Android::initSurface() {
if (_game_texture)
_game_texture->reinit();
- if (_overlay_texture)
+ if (_overlay_texture) {
_overlay_texture->reinit();
+ initOverlay();
+ }
if (_mouse_texture)
_mouse_texture->reinit();
@@ -233,12 +235,7 @@ void OSystem_Android::initViewport() {
clearFocusRectangle();
}
-void OSystem_Android::initSize(uint width, uint height,
- const Graphics::PixelFormat *format) {
- ENTER("%d, %d, %p", width, height, format);
-
- GLTHREADCHECK;
-
+void OSystem_Android::initOverlay() {
int overlay_width = _egl_surface_width;
int overlay_height = _egl_surface_height;
@@ -256,6 +253,13 @@ void OSystem_Android::initSize(uint width, uint height,
LOGI("overlay size is %ux%u", overlay_width, overlay_height);
_overlay_texture->allocBuffer(overlay_width, overlay_height);
+}
+
+void OSystem_Android::initSize(uint width, uint height,
+ const Graphics::PixelFormat *format) {
+ ENTER("%d, %d, %p", width, height, format);
+
+ GLTHREADCHECK;
#ifdef USE_RGB_COLOR
initTexture(&_game_texture, width, height, format, false);