From 4ee0a9f43a3ccb70872b059a753485349529166d Mon Sep 17 00:00:00 2001
From: dhewg
Date: Sat, 5 Mar 2011 10:05:35 +0100
Subject: ANDROID: Merge updateTexture()

---
 backends/platform/android/texture.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'backends/platform/android/texture.h')

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;
 };
 
-- 
cgit v1.2.3