diff options
author | dhewg | 2011-02-19 16:18:15 +0100 |
---|---|---|
committer | dhewg | 2011-02-19 20:15:50 +0100 |
commit | feb0efe767ce19c353b1b0ca2d0e8188b97ae740 (patch) | |
tree | 4a9d7d62c166fe57b9800f06c896fb245b57600f /backends/platform/android/video.h | |
parent | 7cf482e7217cd2f88129c4d1b925f085d8043cd0 (diff) | |
download | scummvm-rg350-feb0efe767ce19c353b1b0ca2d0e8188b97ae740.tar.gz scummvm-rg350-feb0efe767ce19c353b1b0ca2d0e8188b97ae740.tar.bz2 scummvm-rg350-feb0efe767ce19c353b1b0ca2d0e8188b97ae740.zip |
ANDROID: Formatting
Diffstat (limited to 'backends/platform/android/video.h')
-rw-r--r-- | backends/platform/android/video.h | 128 |
1 files changed, 101 insertions, 27 deletions
diff --git a/backends/platform/android/video.h b/backends/platform/android/video.h index 4b73508907..1e00f9bd57 100644 --- a/backends/platform/android/video.h +++ b/backends/platform/android/video.h @@ -38,30 +38,54 @@ public: GLESTexture(); virtual ~GLESTexture(); + virtual void reinitGL(); virtual void allocBuffer(GLuint width, GLuint height); - const Graphics::Surface* surface_const() const { return &_surface; } - GLuint width() const { return _surface.w; } - GLuint height() const { return _surface.h; } - GLuint texture_name() const { return _texture_name; } - bool dirty() const { return _all_dirty || !_dirty_rect.isEmpty(); } + + const Graphics::Surface *surface_const() const { + return &_surface; + } + + GLuint width() const { + return _surface.w; + } + + GLuint height() const { + return _surface.h; + } + + GLuint texture_name() const { + return _texture_name; + } + + bool dirty() const { + return _all_dirty || !_dirty_rect.isEmpty(); + } + virtual void updateBuffer(GLuint x, GLuint y, GLuint width, GLuint height, - const void* buf, int pitch); + const void *buf, int pitch); virtual void fillBuffer(byte x); + virtual void drawTexture() { drawTexture(0, 0, _surface.w, _surface.h); } + virtual void drawTexture(GLshort x, GLshort y, GLshort w, GLshort h); protected: virtual byte bytesPerPixel() const = 0; virtual GLenum glFormat() const = 0; virtual GLenum glType() const = 0; - virtual size_t paletteSize() const { return 0; }; + + virtual size_t paletteSize() const { + return 0; + } + void setDirty() { _all_dirty = true; _dirty_rect = Common::Rect(); } + void setDirtyRect(const Common::Rect& r) { if (!_all_dirty) { if (_dirty_rect.isEmpty()) @@ -70,28 +94,47 @@ protected: _dirty_rect.extend(r); } } + GLuint _texture_name; Graphics::Surface _surface; GLuint _texture_width; GLuint _texture_height; bool _all_dirty; - Common::Rect _dirty_rect; // Covers dirty area + + // Covers dirty area + Common::Rect _dirty_rect; }; // RGBA4444 texture class GLES4444Texture : public GLESTexture { protected: - virtual byte bytesPerPixel() const { return 2; } - virtual GLenum glFormat() const { return GL_RGBA; } - virtual GLenum glType() const { return GL_UNSIGNED_SHORT_4_4_4_4; } + virtual byte bytesPerPixel() const { + return 2; + } + + virtual GLenum glFormat() const { + return GL_RGBA; + } + + virtual GLenum glType() const { + return GL_UNSIGNED_SHORT_4_4_4_4; + } }; // RGB565 texture class GLES565Texture : public GLESTexture { protected: - virtual byte bytesPerPixel() const { return 2; } - virtual GLenum glFormat() const { return GL_RGB; } - virtual GLenum glType() const { return GL_UNSIGNED_SHORT_5_6_5; } + virtual byte bytesPerPixel() const { + return 2; + } + + virtual GLenum glFormat() const { + return GL_RGB; + } + + virtual GLenum glType() const { + return GL_UNSIGNED_SHORT_5_6_5; + } }; // RGB888 256-entry paletted texture @@ -99,42 +142,73 @@ class GLESPaletteTexture : public GLESTexture { public: GLESPaletteTexture(); virtual ~GLESPaletteTexture(); + virtual void allocBuffer(GLuint width, GLuint height); virtual void updateBuffer(GLuint x, GLuint y, GLuint width, GLuint height, - const void* buf, int pitch); - Graphics::Surface* surface() { + const void *buf, int pitch); + + Graphics::Surface *surface() { setDirty(); return &_surface; } - void* pixels() { + + void *pixels() { setDirty(); return _surface.pixels; } - const byte* palette_const() const { return _texture; }; - byte* palette() { + + const byte *palette_const() const { + return _texture; + }; + + byte *palette() { setDirty(); return _texture; }; + virtual void drawTexture() { drawTexture(0, 0, _surface.w, _surface.h); } + virtual void drawTexture(GLshort x, GLshort y, GLshort w, GLshort h); virtual void fillBuffer(byte x); + protected: - virtual byte bytesPerPixel() const { return 1; } - virtual GLenum glFormat() const { return GL_RGB; } - virtual GLenum glType() const { return GL_PALETTE8_RGB8_OES; } - virtual size_t paletteSize() const { return 256 * 3; }; + virtual byte bytesPerPixel() const { + return 1; + } + + virtual GLenum glFormat() const { + return GL_RGB; + } + + virtual GLenum glType() const { + return GL_PALETTE8_RGB8_OES; + } + + virtual size_t paletteSize() const { + return 256 * 3; + } + virtual void uploadTexture() const; - byte* _texture; + + byte *_texture; }; // RGBA8888 256-entry paletted texture class GLESPaletteATexture : public GLESPaletteTexture { protected: - virtual GLenum glFormat() const { return GL_RGBA; } - virtual GLenum glType() const { return GL_PALETTE8_RGBA8_OES; } - virtual size_t paletteSize() const { return 256 * 4; }; + virtual GLenum glFormat() const { + return GL_RGBA; + } + + virtual GLenum glType() const { + return GL_PALETTE8_RGBA8_OES; + } + + virtual size_t paletteSize() const { + return 256 * 4; + } }; #endif |