[Scummvm-git-logs] scummvm master -> 786800e8317c1fa5a91643fb8fb56d5e458e0601

[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:
786800e831 OPENGL: Skip adding suffix 'shaders' for iOS app, it has flatten tree.


Commit: 786800e8317c1fa5a91643fb8fb56d5e458e0601
    https://github.com/scummvm/scummvm/commit/786800e8317c1fa5a91643fb8fb56d5e458e0601
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-03-06T09:00:21+01:00

Commit Message:
OPENGL: Skip adding suffix 'shaders' for iOS app, it has flatten tree.

Changed paths:
    graphics/opengl/shader.cpp


diff --git a/graphics/opengl/shader.cpp b/graphics/opengl/shader.cpp
index 146d1ac4c18..c5fd77974e6 100644
--- a/graphics/opengl/shader.cpp
+++ b/graphics/opengl/shader.cpp
@@ -66,6 +66,7 @@ static const char *compatFragment =
 
 static const GLchar *readFile(const Common::String &filename) {
 	Common::File file;
+	Common::String shaderDir;
 
 	// Allow load shaders from source code directory without install them.
 	// It's used for development purpose.
@@ -79,7 +80,10 @@ static const GLchar *readFile(const Common::String &filename) {
 	if (ConfMan.hasKey("extrapath")) {
 		SearchMan.addDirectory("EXTRA_PATH", Common::FSNode(ConfMan.get("extrapath")), 0, 2);
 	}
-	file.open(Common::String("shaders/") + filename);
+#if !defined(IPHONE)
+	shaderDir = "shaders/";
+#endif
+	file.open(shaderDir + filename);
 	if (!file.isOpen())
 		error("Could not open shader %s!", filename.c_str());
 	SearchMan.remove("GRIM_SHADERS");