From ef9da46d80343b2afdba92bc51858d78813e335b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= Date: Mon, 19 Aug 2019 00:16:18 +0200 Subject: [PATCH] Partially revert ef88b2dabd5c7f4b6075d825252dfa03f68ce63f It actually caused the black screen issue to appear again for binaries in 32-bit mode. --- impl11/ddraw/Direct3DExecuteBuffer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/impl11/ddraw/Direct3DExecuteBuffer.cpp b/impl11/ddraw/Direct3DExecuteBuffer.cpp index 5c609f2a..c6e8f169 100644 --- a/impl11/ddraw/Direct3DExecuteBuffer.cpp +++ b/impl11/ddraw/Direct3DExecuteBuffer.cpp @@ -134,13 +134,14 @@ HRESULT Direct3DExecuteBuffer::Lock( if (color16 == 0) { - buffer32[i] = 0x20000000; + buffer32[i] = 0xff000000; } else { buffer32[i] = convertColorB5G6R5toB8G8R8X8(color16); } } + this->_deviceResources->RenderMain(this->_deviceResources->_backbufferSurface->_buffer, this->_deviceResources->_displayWidth, this->_deviceResources->_displayHeight, this->_deviceResources->_displayBpp, RENDERMAIN_NO_COLORKEY); } else { @@ -180,9 +181,8 @@ HRESULT Direct3DExecuteBuffer::Lock( buffer16[i] = 0x2000; } } + this->_deviceResources->RenderMain(this->_deviceResources->_backbufferSurface->_buffer, this->_deviceResources->_displayWidth, this->_deviceResources->_displayHeight, this->_deviceResources->_displayBpp, RENDERMAIN_COLORKEY_20); } - this->_deviceResources->RenderMain(this->_deviceResources->_backbufferSurface->_buffer, this->_deviceResources->_displayWidth, this->_deviceResources->_displayHeight, this->_deviceResources->_displayBpp, RENDERMAIN_COLORKEY_20); - this->_deviceResources->inSceneBackbufferLocked = false; }