Kaydet (Commit) bf5a6730 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Avoid complex static global initialisation

Caused an assertion failure: "sal/osl/unx/process_impl.cxx:167: sal_uInt32
osl_getCommandArgCount(): Assertion `g_command_args.m_nCount != 0' failed".

Change-Id: Ib01e0312e328f751c9353aab95dceb977b818b0c
üst 26d88611
...@@ -25,11 +25,9 @@ OUString getShaderFolder() ...@@ -25,11 +25,9 @@ OUString getShaderFolder()
return aUrl + "/opengl/"; return aUrl + "/opengl/";
} }
OUString maShaderFolder = getShaderFolder();
OString loadShader(const OUString& rFilename) OString loadShader(const OUString& rFilename)
{ {
OUString aFileURL = maShaderFolder + rFilename +".glsl"; OUString aFileURL = getShaderFolder() + rFilename +".glsl";
osl::File aFile(aFileURL); osl::File aFile(aFileURL);
if(aFile.open(osl_File_OpenFlag_Read) == osl::FileBase::E_None) if(aFile.open(osl_File_OpenFlag_Read) == osl::FileBase::E_None)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment