diff options
author | dhewg | 2011-03-05 10:05:35 +0100 |
---|---|---|
committer | dhewg | 2011-03-05 11:00:36 +0100 |
commit | 4ee0a9f43a3ccb70872b059a753485349529166d (patch) | |
tree | 25182666d329298b6333ec60f55008b757b898a0 /backends/platform/android/texture.h | |
parent | 68378150beb96159db7d959d9625107b721eef57 (diff) | |
download | scummvm-rg350-4ee0a9f43a3ccb70872b059a753485349529166d.tar.gz scummvm-rg350-4ee0a9f43a3ccb70872b059a753485349529166d.tar.bz2 scummvm-rg350-4ee0a9f43a3ccb70872b059a753485349529166d.zip |
ANDROID: Merge updateTexture()
Diffstat (limited to 'backends/platform/android/texture.h')
-rw-r--r-- | backends/platform/android/texture.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/backends/platform/android/texture.h b/backends/platform/android/texture.h index f1bc46e997..38a6228076 100644 --- a/backends/platform/android/texture.h +++ b/backends/platform/android/texture.h @@ -57,6 +57,10 @@ public: virtual void drawTexture(GLshort x, GLshort y, GLshort w, GLshort h); + inline void drawTexture() { + drawTexture(0, 0, _surface.w, _surface.h); + } + inline GLuint width() const { return _surface.w; } @@ -78,10 +82,6 @@ public: return _all_dirty || !_dirty_rect.isEmpty(); } - inline void drawTexture() { - drawTexture(0, 0, _surface.w, _surface.h); - } - protected: inline void setDirty() { _all_dirty = true; @@ -154,8 +154,6 @@ public: }; protected: - void uploadTexture() const; - byte *_texture; }; |