thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GRAPHICS: Allow load engine shaders from extra path

Browse source
This commit is contained in:
Paweł Kołodziejski 2021-11-21 20:28:20 +01:00
parent 9a6d04fa01
commit 400ba4017f
No known key found for this signature in database
GPG key ID: 0BDADC9E74440FF7
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
graphics/opengl/shader.cpp
View file

@ -21,6 +21,7 @@
*/ */
#include "common/scummsys.h" #include "common/scummsys.h"
#include "common/config-manager.h"
#if defined(USE_OPENGL_SHADERS) #if defined(USE_OPENGL_SHADERS)
@ -33,14 +34,18 @@ namespace OpenGL {
static const GLchar *readFile(const Common::String &filename) { static const GLchar *readFile(const Common::String &filename) {
Common::File file; Common::File file;
// Allow load shaders from source code directory without install them // Allow load shaders from source code directory without install them.
// It's used for development purpose // It's used for development purpose.
// FIXME: it's doesn't work with just search subdirs in 'engines' // Additionally allow load shaders outside distribution data path,
// 'extrapath' is used temporary in SearchMan.
SearchMan.addDirectory("GRIM_SHADERS", "engines/grim", 0, 2); SearchMan.addDirectory("GRIM_SHADERS", "engines/grim", 0, 2);
SearchMan.addDirectory("MYST3_SHADERS", "engines/myst3", 0, 2); SearchMan.addDirectory("MYST3_SHADERS", "engines/myst3", 0, 2);
SearchMan.addDirectory("STARK_SHADERS", "engines/stark", 0, 2); SearchMan.addDirectory("STARK_SHADERS", "engines/stark", 0, 2);
SearchMan.addDirectory("WINTERMUTE_SHADERS", "engines/wintermute/base/gfx/opengl", 0, 5); SearchMan.addDirectory("WINTERMUTE_SHADERS", "engines/wintermute/base/gfx/opengl", 0, 5);
SearchMan.addDirectory("PLAYGROUND3D_SHADERS", "engines/playground3d", 0, 2); SearchMan.addDirectory("PLAYGROUND3D_SHADERS", "engines/playground3d", 0, 2);
if (ConfMan.hasKey("extrapath")) {
SearchMan.addDirectory("EXTRA_PATH", Common::FSNode(ConfMan.get("extrapath")), 0, 2);
}
file.open(Common::String("shaders/") + filename); file.open(Common::String("shaders/") + filename);
if (!file.isOpen()) if (!file.isOpen())
error("Could not open shader %s!", filename.c_str()); error("Could not open shader %s!", filename.c_str());
@ -49,6 +54,7 @@ static const GLchar *readFile(const Common::String &filename) {
SearchMan.remove("STARK_SHADERS"); SearchMan.remove("STARK_SHADERS");
SearchMan.remove("WINTERMUTE_SHADERS"); SearchMan.remove("WINTERMUTE_SHADERS");
SearchMan.remove("PLAYGROUND3D_SHADERS"); SearchMan.remove("PLAYGROUND3D_SHADERS");
SearchMan.remove("EXTRA_PATH");
const int32 size = file.size(); const int32 size = file.size();
GLchar *shaderSource = new GLchar[size + 1]; GLchar *shaderSource = new GLchar[size + 1];