[Scummvm-git-logs] scummvm master -> d9691de47be013802d2a7832e0a0a4b5ed1d3771

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
d9691de47b WINTERMUTE: Remove unused blank surface


Commit: d9691de47be013802d2a7832e0a0a4b5ed1d3771
    https://github.com/scummvm/scummvm/commit/d9691de47be013802d2a7832e0a0a4b5ed1d3771
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2025-06-13T18:03:16+02:00

Commit Message:
WINTERMUTE: Remove unused blank surface

Changed paths:
    engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
    engines/wintermute/base/gfx/osystem/base_render_osystem.h


diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
index f4c45f5bcfd..7cdc7c6d0e4 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
@@ -50,7 +50,6 @@ BaseRenderer *makeOSystemRenderer(BaseGame *inGame) {
 //////////////////////////////////////////////////////////////////////////
 BaseRenderOSystem::BaseRenderOSystem(BaseGame *inGame) : BaseRenderer(inGame) {
 	_renderSurface = new Graphics::Surface();
-	_blankSurface = new Graphics::Surface();
 	_lastFrameIter = _renderQueue.end();
 	_needsFlip = true;
 	_skipThisFrame = false;
@@ -79,8 +78,6 @@ BaseRenderOSystem::~BaseRenderOSystem() {
 
 	_renderSurface->free();
 	delete _renderSurface;
-	_blankSurface->free();
-	delete _blankSurface;
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -127,8 +124,6 @@ bool BaseRenderOSystem::initRenderer(int width, int height, bool windowed) {
 	g_system->showMouse(false);
 
 	_renderSurface->create(g_system->getWidth(), g_system->getHeight(), g_system->getScreenFormat());
-	_blankSurface->create(g_system->getWidth(), g_system->getHeight(), g_system->getScreenFormat());
-	_blankSurface->fillRect(Common::Rect(0, 0, _blankSurface->h, _blankSurface->w), _blankSurface->format.ARGBToColor(255, 0, 0, 0));
 	_active = true;
 
 	_clearColor = _renderSurface->format.ARGBToColor(255, 0, 0, 0);
@@ -224,12 +219,6 @@ bool BaseRenderOSystem::fill(byte r, byte g, byte b, Common::Rect *rect) {
 		return STATUS_OK;
 	}
 	if (!rect) {
-		// TODO: This should speed things up, but for some reason it misses the size by quite a bit.
-		/*if (r == 0 && g == 0 && b == 0) {
-			// Simply memcpy from the buffered black-surface, way faster than Surface::fillRect.
-			memcpy(_renderSurface->pixels, _blankSurface->pixels, _renderSurface->pitch * _renderSurface->h);
-			return STATUS_OK;
-		}*/
 		rect = &_renderRect;
 	}
 	// TODO: This doesn't work with dirty rects
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.h b/engines/wintermute/base/gfx/osystem/base_render_osystem.h
index c509c662456..debb4764f1b 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.h
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.h
@@ -134,7 +134,6 @@ private:
 	RenderQueueIterator _lastFrameIter;
 	Common::Rect _renderRect;
 	Graphics::Surface *_renderSurface;
-	Graphics::Surface *_blankSurface;
 
 	int _borderLeft;
 	int _borderTop;