diff options
| author | dhewg | 2011-02-18 17:18:27 +0100 |
|---|---|---|
| committer | dhewg | 2011-02-18 17:18:27 +0100 |
| commit | 8cddb2a401f7604bc7ffa7d7dfcafbc90cf2bada (patch) | |
| tree | 22420998f87d8958dbbeeb75789d0ab6de8e5a67 /backends/platform/android/video.cpp | |
| parent | 8a5078966290a3fbc0ee78d662cafa66a910b029 (diff) | |
| parent | 2586e15e4ea6a365eced1888759630907b6b5870 (diff) | |
| download | scummvm-rg350-8cddb2a401f7604bc7ffa7d7dfcafbc90cf2bada.tar.gz scummvm-rg350-8cddb2a401f7604bc7ffa7d7dfcafbc90cf2bada.tar.bz2 scummvm-rg350-8cddb2a401f7604bc7ffa7d7dfcafbc90cf2bada.zip | |
Merge branch 'dhewg-android'
Diffstat (limited to 'backends/platform/android/video.cpp')
| -rw-r--r-- | backends/platform/android/video.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/backends/platform/android/video.cpp b/backends/platform/android/video.cpp index 3275335d97..b9c3f9a1f8 100644 --- a/backends/platform/android/video.cpp +++ b/backends/platform/android/video.cpp @@ -23,6 +23,8 @@ * */ +#if defined(__ANDROID__) + #include "base/main.h" #include "graphics/surface.h" @@ -42,7 +44,7 @@ #define TEXSUBIMAGE_IS_EXPENSIVE 0 #undef LOG_TAG -#define LOG_TAG "ScummVM-video" +#define LOG_TAG "ScummVM" #if 0 #define ENTER(args...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, args) @@ -133,7 +135,14 @@ GLESTexture::~GLESTexture() { } void GLESTexture::reinitGL() { + glDeleteTextures(1, &_texture_name); glGenTextures(1, &_texture_name); + + // bypass allocBuffer() shortcut to reinit the texture properly + _texture_width = 0; + _texture_height = 0; + + allocBuffer(_surface.w, _surface.h); setDirty(); } @@ -352,3 +361,6 @@ void GLESPaletteTexture::drawTexture(GLshort x, GLshort y, GLshort w, GLshort h) GLESTexture::drawTexture(x, y, w, h); } + +#endif + |