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

shaderc: Fixed ESSL build.

Browse source
This commit is contained in:
Branimir Karadžić 2015-03-23 16:14:40 -07:00
parent baebc645c0
commit a8b8cedb1b
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tools/shaderc/shaderc.cpp
View file

@ -845,7 +845,7 @@ int main(int _argc, const char* _argv[])
preprocessor.setDefaultDefine("BGFX_SHADER_TYPE_VERTEX"); preprocessor.setDefaultDefine("BGFX_SHADER_TYPE_VERTEX");
char glslDefine[128]; char glslDefine[128];
bx::snprintf(glslDefine, BX_COUNTOF(glslDefine), "BGFX_SHADER_LANGUAGE_GLSL=%d", glsl); bx::snprintf(glslDefine, BX_COUNTOF(glslDefine), "BGFX_SHADER_LANGUAGE_GLSL=%d", essl ? 1 : glsl);
if (0 == bx::stricmp(platform, "android") ) if (0 == bx::stricmp(platform, "android") )
{ {
@ -1155,7 +1155,8 @@ int main(int _argc, const char* _argv[])
} }
else else
{ {
if (0 != glsl) if (0 != glsl
|| 0 != essl)
{ {
} }
else else
@ -1269,7 +1270,8 @@ int main(int _argc, const char* _argv[])
bx::write(writer, BGFX_CHUNK_MAGIC_CSH); bx::write(writer, BGFX_CHUNK_MAGIC_CSH);
bx::write(writer, outputHash); bx::write(writer, outputHash);
if (0 != glsl) if (0 != glsl
|| 0 != essl)
{ {
std::string code; std::string code;