libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-19 02:38:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

WINTERMUTE: Permanently store texture data in main memory

Browse Source
This commit is contained in:
Gunnar Birke 2020-10-17 23:18:09 +02:00 committed by Paweł Kołodziejski
parent b0c8870a00
commit 8eacf532c9
2 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
engines/wintermute/base/gfx/opengl/base_surface_opengl3d.cpp
View File

@ -66,6 +66,7 @@ BaseSurfaceOpenGL3D::~BaseSurfaceOpenGL3D() {
bool BaseSurfaceOpenGL3D::invalidate() { bool BaseSurfaceOpenGL3D::invalidate() {
glDeleteTextures(1, &_tex); glDeleteTextures(1, &_tex);
_imageData->free();
delete[] _imageData; delete[] _imageData;
_imageData = nullptr; _imageData = nullptr;
@ -81,16 +82,7 @@ bool BaseSurfaceOpenGL3D::displayHalfTrans(int x, int y, Rect32 rect) {
bool BaseSurfaceOpenGL3D::isTransparentAt(int x, int y) { bool BaseSurfaceOpenGL3D::isTransparentAt(int x, int y) {
prepareToDraw(); prepareToDraw();
uint8 *imageData = new uint8[4 * _texWidth * _texHeight](); uint8 alpha = reinterpret_cast<uint8 *>(_imageData->getPixels())[y * _width * 4 + x * 4 + 3];
// assume 32 bit rgba for now
glBindTexture(GL_TEXTURE_2D, _tex);
glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, imageData);
glBindTexture(GL_TEXTURE_2D, 0);
uint8 alpha = imageData[y * _texWidth * 4 + x * 4 + 3];
delete[] imageData;
return alpha < 128; return alpha < 128;
} }
@ -179,7 +171,12 @@ bool BaseSurfaceOpenGL3D::create(const Common::String &filename, bool defaultCK,
bool needsColorKey = false; bool needsColorKey = false;
bool replaceAlpha = true; bool replaceAlpha = true;
Graphics::Surface *surf = img.getSurface()->convertTo(OpenGL::TextureGL::getRGBAPixelFormat(), img.getPalette()); if (_imageData) {
_imageData->free();
delete _imageData;
}
_imageData = img.getSurface()->convertTo(OpenGL::TextureGL::getRGBAPixelFormat(), img.getPalette());
if (_filename.hasSuffix(".bmp") && img.getSurface()->format.bytesPerPixel == 4) { if (_filename.hasSuffix(".bmp") && img.getSurface()->format.bytesPerPixel == 4) {
// 32 bpp BMPs have nothing useful in their alpha-channel -> color-key // 32 bpp BMPs have nothing useful in their alpha-channel -> color-key
@ -190,13 +187,10 @@ bool BaseSurfaceOpenGL3D::create(const Common::String &filename, bool defaultCK,
} }
if (needsColorKey) { if (needsColorKey) {
applyColorKey(*surf, ckRed, ckGreen, ckBlue, replaceAlpha); applyColorKey(*_imageData, ckRed, ckGreen, ckBlue, replaceAlpha);
} }
putSurface(*surf); putSurface(*_imageData);
surf->free();
delete surf;
if (_lifeTime == 0 || lifeTime == -1 || lifeTime > _lifeTime) { if (_lifeTime == 0 || lifeTime == -1 || lifeTime > _lifeTime) {
_lifeTime = lifeTime; _lifeTime = lifeTime;
@ -227,6 +221,14 @@ bool BaseSurfaceOpenGL3D::create(int width, int height) {
} }
bool BaseSurfaceOpenGL3D::putSurface(const Graphics::Surface &surface, bool hasAlpha) { bool BaseSurfaceOpenGL3D::putSurface(const Graphics::Surface &surface, bool hasAlpha) {
if (!_imageData) {
_imageData = new Graphics::Surface();
}
if (_imageData && _imageData != &surface) {
_imageData->copyFrom(surface);
}
_width = surface.w; _width = surface.w;
_height = surface.h; _height = surface.h;
_texWidth = Common::nextHigher2(_width); _texWidth = Common::nextHigher2(_width);
@ -266,22 +268,11 @@ bool BaseSurfaceOpenGL3D::comparePixel(int x, int y, byte r, byte g, byte b, int
} }
bool BaseSurfaceOpenGL3D::startPixelOp() { bool BaseSurfaceOpenGL3D::startPixelOp() {
if (_imageData) {
return true;
}
prepareToDraw(); prepareToDraw();
_imageData = new uint8[4 * _texWidth * _texHeight]();
glBindTexture(GL_TEXTURE_2D, _tex);
glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, _imageData);
return true; return true;
} }
bool BaseSurfaceOpenGL3D::endPixelOp() { bool BaseSurfaceOpenGL3D::endPixelOp() {
glBindTexture(GL_TEXTURE_2D, 0);
delete[] _imageData;
_imageData = nullptr;
return true; return true;
} }
@ -295,7 +286,7 @@ bool BaseSurfaceOpenGL3D::isTransparentAtLite(int x, int y) {
} }
//TODO: Check for endianness issues //TODO: Check for endianness issues
uint8 alpha = _imageData[y * _texWidth * 4 + x * 4 + 3]; uint8 alpha = reinterpret_cast<uint8 *>(_imageData->getPixels())[y * _width * 4 + x * 4 + 3];
return alpha == 0; return alpha == 0;
} }

2
engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h
View File

@ -69,7 +69,7 @@ public:
private: private:
GLuint _tex; GLuint _tex;
BaseRenderer3D *_renderer; BaseRenderer3D *_renderer;
uint8 *_imageData; Graphics::Surface *_imageData;
uint _texWidth; uint _texWidth;
uint _texHeight; uint _texHeight;
}; };