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

ALL: Merge branch 'tlj'

Browse source
This commit is contained in:
Bastien Bouclet 2016-01-01 07:33:20 +01:00
commit 5c73d0083d
192 changed files with 25561 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
graphics/opengles2/shader.cpp
View file

@ -36,11 +36,13 @@ static const GLchar *readFile(const Common::String &filename) {
// FIXME: it's doesn't work with just search subdirs in 'engines'
SearchMan.addDirectory("GRIM_SHADERS", "engines/grim", 0, 2);
SearchMan.addDirectory("MYST3_SHADERS", "engines/myst3", 0, 2);
SearchMan.addDirectory("STARK_SHADERS", "engines/stark", 0, 2);
file.open(Common::String("shaders/") + filename);
if (!file.isOpen())
error("Could not open shader %s!", filename.c_str());
SearchMan.remove("GRIM_SHADERS");
SearchMan.remove("MYST3_SHADERS");
SearchMan.remove("STARK_SHADERS");
const int32 size = file.size();
GLchar *shaderSource = new GLchar[size + 1];