thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: Merge updateTexture()

Browse source
This commit is contained in:
dhewg 2011-03-05 10:05:35 +01:00
parent 68378150be
commit 4ee0a9f43a
2 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
backends/platform/android/texture.cpp
View file

@ -348,15 +348,6 @@ void GLESPaletteTexture::updateBuffer(GLuint x, GLuint y,
} while (--h); } while (--h);
} }
void GLESPaletteTexture::uploadTexture() const {
const size_t texture_size =
_paletteSize + _texture_width * _texture_height * _bytesPerPixel;
GLCALL(glCompressedTexImage2D(GL_TEXTURE_2D, 0, _glType,
_texture_width, _texture_height,
0, texture_size, _texture));
}
void GLESPaletteTexture::drawTexture(GLshort x, GLshort y, GLshort w, void GLESPaletteTexture::drawTexture(GLshort x, GLshort y, GLshort w,
GLshort h) { GLshort h) {
if (_all_dirty) { if (_all_dirty) {
@ -369,7 +360,14 @@ void GLESPaletteTexture::drawTexture(GLshort x, GLshort y, GLshort w,
GL_CLAMP_TO_EDGE)); GL_CLAMP_TO_EDGE));
GLCALL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GLCALL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T,
GL_CLAMP_TO_EDGE)); GL_CLAMP_TO_EDGE));
uploadTexture();
const size_t texture_size =
_paletteSize + _texture_width * _texture_height * _bytesPerPixel;
GLCALL(glCompressedTexImage2D(GL_TEXTURE_2D, 0, _glType,
_texture_width, _texture_height,
0, texture_size, _texture));
_all_dirty = false; _all_dirty = false;
} }

10
backends/platform/android/texture.h
View file

@ -57,6 +57,10 @@ public:
virtual void drawTexture(GLshort x, GLshort y, GLshort w, GLshort h); 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 { inline GLuint width() const {
return _surface.w; return _surface.w;
} }
@ -78,10 +82,6 @@ public:
return _all_dirty || !_dirty_rect.isEmpty(); return _all_dirty || !_dirty_rect.isEmpty();
} }
inline void drawTexture() {
drawTexture(0, 0, _surface.w, _surface.h);
}
protected: protected:
inline void setDirty() { inline void setDirty() {
_all_dirty = true; _all_dirty = true;
@ -154,8 +154,6 @@ public:
}; };
protected: protected:
void uploadTexture() const;
byte *_texture; byte *_texture;
}; };