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

WINTERMUTE: doFlip WA is also needed for 3D renderers

Browse source
This commit is contained in:
Paweł Kołodziejski 2022-07-16 13:58:02 +02:00
parent a2a6867a1b
commit 134e412a00
No known key found for this signature in database
GPG key ID: 0BDADC9E74440FF7
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
View file

@ -234,7 +234,7 @@ BaseImage *BaseRenderOpenGL3D::takeScreenshot() {
glReadPixels(_viewportRect.left, g_system->getHeight() - _viewportRect.bottom, _viewportRect.width(), _viewportRect.height(), glReadPixels(_viewportRect.left, g_system->getHeight() - _viewportRect.bottom, _viewportRect.width(), _viewportRect.height(),
GL_RGBA, GL_UNSIGNED_BYTE, surface->getPixels()); GL_RGBA, GL_UNSIGNED_BYTE, surface->getPixels());
flipVertical(surface); flipVertical(surface);
Graphics::Surface *converted = surface->convertTo(Graphics::PixelFormat(4, 8, 8, 8, 8, 24, 16, 8, 0)); Graphics::Surface *converted = surface->convertTo(getPixelFormat());
screenshot->copyFrom(converted); screenshot->copyFrom(converted);
delete surface; delete surface;
delete converted; delete converted;

2
engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
View file

@ -348,7 +348,7 @@ BaseImage *BaseRenderOpenGL3DShader::takeScreenshot() {
glReadPixels(_viewportRect.left, g_system->getHeight() - _viewportRect.bottom, _viewportRect.width(), _viewportRect.height(), glReadPixels(_viewportRect.left, g_system->getHeight() - _viewportRect.bottom, _viewportRect.width(), _viewportRect.height(),
GL_RGBA, GL_UNSIGNED_BYTE, surface->getPixels()); GL_RGBA, GL_UNSIGNED_BYTE, surface->getPixels());
flipVertical(surface); flipVertical(surface);
Graphics::Surface *converted = surface->convertTo(Graphics::PixelFormat(4, 8, 8, 8, 8, 24, 16, 8, 0)); Graphics::Surface *converted = surface->convertTo(getPixelFormat());
screenshot->copyFrom(converted); screenshot->copyFrom(converted);
delete surface; delete surface;
delete converted; delete converted;

2
engines/wintermute/base/save_thumb_helper.cpp
View file

@ -50,7 +50,7 @@ SaveThumbHelper::~SaveThumbHelper(void) {
BaseImage *SaveThumbHelper::storeThumb(bool doFlip, int width, int height) { BaseImage *SaveThumbHelper::storeThumb(bool doFlip, int width, int height) {
BaseImage *thumbnail = nullptr; BaseImage *thumbnail = nullptr;
if (_gameRef->getSaveThumbWidth() > 0 && _gameRef->getSaveThumbHeight() > 0) { if (_gameRef->getSaveThumbWidth() > 0 && _gameRef->getSaveThumbHeight() > 0) {
if (doFlip && !_gameRef->_useD3D) { if (doFlip) {
// when using opengl on windows it seems to be necessary to do this twice // when using opengl on windows it seems to be necessary to do this twice
// works normally for direct3d // works normally for direct3d
_gameRef->displayContent(false); _gameRef->displayContent(false);