scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-28 18:45:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Write GLSL shader #version before compiling shader.

Browse source
This commit is contained in:
bkaradzic 2014-02-01 22:42:50 -08:00
parent 8f7da50de4
commit d401bd992a
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
tools/bin/windows/shaderc.exe
View file

Binary file not shown.

16
tools/shaderc/shaderc.cpp
View file

@ -531,10 +531,6 @@ bool compileGLSLShader(bx::CommandLine& _cmdLine, const std::string& _code, bx::
writef(_writer, "precision highp float;\n"); writef(_writer, "precision highp float;\n");
writef(_writer, "#endif // GL_ES\n\n"); writef(_writer, "#endif // GL_ES\n\n");
} }
else
{
// writef(_writer, "#version %s\n\n", profile);
}
bx::write(_writer, optimizedShader, (int32_t)strlen(optimizedShader) ); bx::write(_writer, optimizedShader, (int32_t)strlen(optimizedShader) );
uint8_t nul = 0; uint8_t nul = 0;
@ -1862,10 +1858,6 @@ int main(int _argc, const char* _argv[])
writef(&writer, "precision highp float;\n"); writef(&writer, "precision highp float;\n");
writef(&writer, "#endif // GL_ES\n\n"); writef(&writer, "#endif // GL_ES\n\n");
} }
else
{
// writef(&writer, "#version %s\n\n", profile);
}
} }
writer.write(preprocessor.m_preprocessed.c_str(), (int32_t)preprocessor.m_preprocessed.size() ); writer.write(preprocessor.m_preprocessed.c_str(), (int32_t)preprocessor.m_preprocessed.size() );
writer.close(); writer.close();
@ -1906,7 +1898,13 @@ int main(int _argc, const char* _argv[])
if (glsl) if (glsl)
{ {
compiled = compileGLSLShader(cmdLine, preprocessor.m_preprocessed, writer); std::string code;
if (0 == gles)
{
bx::stringPrintf(code, "#version %s\n", profile);
}
code += preprocessor.m_preprocessed;
compiled = compileGLSLShader(cmdLine, code, writer);
} }
else else
{ {