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

[grisenti]

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:
d8fc2df8cf HPL1: fix opengl and shader checks


Commit: d8fc2df8cff2a69618af2b75cc22e0296891f3d7
    https://github.com/scummvm/scummvm/commit/d8fc2df8cff2a69618af2b75cc22e0296891f3d7
Author: grisenti (emanuele at grisenti.net)
Date: 2025-07-19T15:26:11+02:00

Commit Message:
HPL1: fix opengl and shader checks

Changed paths:
    engines/hpl1/graphics.cpp


diff --git a/engines/hpl1/graphics.cpp b/engines/hpl1/graphics.cpp
index 217b51d1dc9..4b9059907f8 100644
--- a/engines/hpl1/graphics.cpp
+++ b/engines/hpl1/graphics.cpp
@@ -21,18 +21,22 @@
 
 #include "hpl1/graphics.h"
 
+#include "common/config-manager.h"
 #include "graphics/renderer.h"
 #include "graphics/surface.h"
 #include "hpl1/opengl.h"
 
 namespace Hpl1 {
 
+static Graphics::RendererType getBestRendererType() {
+	Common::String renderConfig = ConfMan.get("renderer");
+	Graphics::RendererType desiredRendererType = Graphics::Renderer::parseTypeCode(renderConfig);
+	return Graphics::Renderer::getBestMatchingType(
+		desiredRendererType, Graphics::Renderer::getAvailableTypes());
+}
+
 bool areShadersAvailable() {
-#if defined(USE_OPENGL_SHADERS)
-	return Graphics::Renderer::getAvailableTypes() & Graphics::kRendererTypeOpenGLShaders;
-#else
-	return false;
-#endif
+	return getBestRendererType() == Graphics::kRendererTypeOpenGLShaders;
 }
 
 Common::ScopedPtr<Graphics::Surface> createViewportScreenshot() {
@@ -44,11 +48,9 @@ Common::ScopedPtr<Graphics::Surface> createViewportScreenshot() {
 }
 
 bool useOpenGL() {
-#if defined(USE_OPENGL) || defined(USE_OPENGL_GAME)
-	return Graphics::Renderer::getAvailableTypes() & (Graphics::kRendererTypeOpenGLShaders | Graphics::kRendererTypeOpenGL);
-#else
-	return false;
-#endif
+	Graphics::RendererType bestRendererType = getBestRendererType();
+	return bestRendererType == Graphics::kRendererTypeOpenGL ||
+	       bestRendererType == Graphics::kRendererTypeOpenGLShaders;
 }
 
 } // namespace Hpl1
\ No newline at end of file