[Scummvm-git-logs] scummvm master -> 8f5500d05bee7a7139f494b962ce2ba324de71b9

bluegr noreply at scummvm.org
Sun May 4 21:44:41 UTC 2025


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:
8f5500d05b FREESCAPE: Support running with any pixel format with TinyGL


Commit: 8f5500d05bee7a7139f494b962ce2ba324de71b9
    https://github.com/scummvm/scummvm/commit/8f5500d05bee7a7139f494b962ce2ba324de71b9
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2025-05-05T00:44:38+03:00

Commit Message:
FREESCAPE: Support running with any pixel format with TinyGL

Changed paths:
    engines/freescape/gfx.cpp
    engines/freescape/gfx_tinygl.cpp


diff --git a/engines/freescape/gfx.cpp b/engines/freescape/gfx.cpp
index c9427cdbfca..60b37910c6c 100644
--- a/engines/freescape/gfx.cpp
+++ b/engines/freescape/gfx.cpp
@@ -1252,7 +1252,6 @@ Graphics::RendererType determinateRenderType() {
 }
 
 Renderer *createRenderer(int screenW, int screenH, Common::RenderMode renderMode, bool authenticGraphics) {
-	Graphics::PixelFormat pixelFormat = Graphics::PixelFormat(4, 8, 8, 8, 8, 24, 16, 8, 0);
 	Graphics::RendererType rendererType = determinateRenderType();
 
 	bool isAccelerated = rendererType != Graphics::kRendererTypeTinyGL;
@@ -1260,7 +1259,7 @@ Renderer *createRenderer(int screenW, int screenH, Common::RenderMode renderMode
 	if (isAccelerated) {
 		initGraphics3d(screenW, screenH);
 	} else {
-		initGraphics(screenW, screenH, &pixelFormat);
+		initGraphics(screenW, screenH, nullptr);
 	}
 
 	#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2)
diff --git a/engines/freescape/gfx_tinygl.cpp b/engines/freescape/gfx_tinygl.cpp
index 5033c494fc7..482cc09420a 100644
--- a/engines/freescape/gfx_tinygl.cpp
+++ b/engines/freescape/gfx_tinygl.cpp
@@ -584,7 +584,7 @@ Graphics::Surface *TinyGLRenderer::getScreenshot() {
 
 	Graphics::Surface *s = new Graphics::Surface();
 	s->create(_screenW, _screenH, getRGBAPixelFormat());
-	s->copyFrom(glBuffer);
+	s->convertFrom(glBuffer, getRGBAPixelFormat());
 
 	return s;
 }




More information about the Scummvm-git-logs mailing list