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

Fixed shaderc.

Browse source
This commit is contained in:
Branimir Karadžić 2015-03-23 15:23:25 -07:00
parent 476f438d7a
commit baebc645c0
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tools/shaderc/shaderc.cpp
View file

@ -972,9 +972,9 @@ int main(int _argc, const char* _argv[])
const char* name = parse = bx::strws(bx::strword(parse) ); const char* name = parse = bx::strws(bx::strword(parse) );
const char* column = parse = bx::strws(bx::strword(parse) ); const char* column = parse = bx::strws(bx::strword(parse) );
const char* semantics = parse = bx::strws(bx::strnws (parse) ); const char* semantics = parse = bx::strws((*parse == ':' ? ++parse : parse));
const char* assign = parse = bx::strws(bx::strword(parse) ); const char* assign = parse = bx::strws(bx::strword(parse) );
const char* init = parse = bx::strws(bx::strnws (parse) ); const char* init = parse = bx::strws((*parse == '=' ? ++parse : parse));
if (type < eol if (type < eol
&& name < eol && name < eol
@ -1338,10 +1338,11 @@ int main(int _argc, const char* _argv[])
} }
else else
{ {
if (0 != glsl) if (0 != glsl
|| 0 != essl)
{ {
if (120 == glsl if (120 == glsl
|| essl) || 0 != essl)
{ {
preprocessor.writef( preprocessor.writef(
"#define ivec2 vec2\n" "#define ivec2 vec2\n"
@ -1700,7 +1701,8 @@ int main(int _argc, const char* _argv[])
bx::write(writer, outputHash); bx::write(writer, outputHash);
} }
if (0 != glsl) if (0 != glsl
|| 0 != essl)
{ {
std::string code; std::string code;