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

OPENGL EMSCRIPTEN: clean up ifdefs, fix opengl in main menu, remove 10ms delay in GRIM main loop

Browse source
This commit is contained in:
Christian Kündig 2021-06-07 15:05:48 +02:00 • committed by Eugene Sandulenko
parent 7c4fdc1b94
commit 8af8ac2e08
4 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
graphics/opengl/shader.cpp
View file

@ -33,9 +33,6 @@ namespace OpenGL {
static const GLchar *readFile(const Common::String &filename) {
Common::File file;
#if defined(EMSCRIPTEN)
// Since we need to bundle all files into data files on Emscripten, we keep all shaders in a different folder
#endif
// Allow load shaders from source code directory without install them
// It's used for development purpose
// FIXME: it's doesn't work with just search subdirs in 'engines'
@ -50,8 +47,6 @@ static const GLchar *readFile(const Common::String &filename) {
SearchMan.remove("MYST3_SHADERS");
SearchMan.remove("STARK_SHADERS");
SearchMan.remove("WINTERMUTE_SHADERS");
#if defined(EMSCRIPTEN)
#endif
const int32 size = file.size();
GLchar *shaderSource = new GLchar[size + 1];