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

[aquadran]

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

Summary:
bd72851697 STARK: Preliminary support for software renderer


Commit: bd72851697c3d6257d8a4ebd4f024d4a7e73467c
    https://github.com/scummvm/scummvm/commit/bd72851697c3d6257d8a4ebd4f024d4a7e73467c
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-11-20T17:33:57+01:00

Commit Message:
STARK: Preliminary support for software renderer

Changed paths:
    engines/stark/gfx/driver.cpp
    engines/stark/gfx/tinyglsurface.cpp
    engines/stark/stark.cpp


diff --git a/engines/stark/gfx/driver.cpp b/engines/stark/gfx/driver.cpp
index 91e783c943..d7ae6cb72b 100644
--- a/engines/stark/gfx/driver.cpp
+++ b/engines/stark/gfx/driver.cpp
@@ -24,6 +24,8 @@
 #include "engines/stark/gfx/opengl.h"
 #include "engines/stark/gfx/opengls.h"
 #include "engines/stark/gfx/tinygl.h"
+#include "engines/stark/services/services.h"
+#include "engines/stark/services/settings.h"
 
 #include "common/config-manager.h"
 #include "common/translation.h"
@@ -77,7 +79,11 @@ Driver *Driver::create() {
 	}
 #endif
 	if (matchingRendererType == Graphics::kRendererTypeTinyGL) {
-		//driver = new TinyGLDriver();
+		if (StarkSettings->isAssetsModEnabled()) {
+			GUI::displayErrorDialog(Common::U32String::format(_("Software renderer does not support modded assets")));
+			return nullptr;
+		}
+		driver = new TinyGLDriver();
 	}
 
 	if (driver)
diff --git a/engines/stark/gfx/tinyglsurface.cpp b/engines/stark/gfx/tinyglsurface.cpp
index c8ee702b2e..7d92b117a8 100644
--- a/engines/stark/gfx/tinyglsurface.cpp
+++ b/engines/stark/gfx/tinyglsurface.cpp
@@ -58,11 +58,8 @@ void TinyGLSurfaceRenderer::render(const Texture *texture, const Common::Point &
 	Graphics::tglGetBlitImageSize(blitImage, blitTextureWidth, blitTextureHeight);
 	int posX = viewport.getX() * verOffsetXY.getX() + nativeViewport.left;
 	int posY = viewport.getY() * verOffsetXY.getY() + nativeViewport.top;
-	int dstWidth = viewport.getX() * sizeWH.getX();
-	int dstHeight = viewport.getY() * sizeWH.getY();
 	Graphics::BlitTransform transform(posX, posY);
 	transform.sourceRectangle(0, 0, blitTextureWidth, blitTextureHeight);
-	transform.scale(dstWidth, dstHeight);
 	transform.tint(1.0, 1.0 - _fadeLevel, 1.0 - _fadeLevel, 1.0 - _fadeLevel);
 	tglBlit(blitImage, transform);
 
diff --git a/engines/stark/stark.cpp b/engines/stark/stark.cpp
index 5ef91529b2..3f0252b75c 100644
--- a/engines/stark/stark.cpp
+++ b/engines/stark/stark.cpp
@@ -98,6 +98,8 @@ Common::Error StarkEngine::run() {
 
 	// Get the screen prepared
 	Gfx::Driver *gfx = Gfx::Driver::create();
+	if (gfx == nullptr)
+		return Common::kNoError;
 	gfx->init();
 
 	checkRecommendedDatafiles();