diff options
Diffstat (limited to '3rdparty/bgfx/tools/shaderc/shaderc.cpp')
-rw-r--r-- | 3rdparty/bgfx/tools/shaderc/shaderc.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/3rdparty/bgfx/tools/shaderc/shaderc.cpp b/3rdparty/bgfx/tools/shaderc/shaderc.cpp index a4a42af5af6..f25a03823df 100644 --- a/3rdparty/bgfx/tools/shaderc/shaderc.cpp +++ b/3rdparty/bgfx/tools/shaderc/shaderc.cpp @@ -845,7 +845,7 @@ int main(int _argc, const char* _argv[]) preprocessor.setDefaultDefine("BGFX_SHADER_TYPE_VERTEX"); 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") ) { @@ -972,9 +972,9 @@ int main(int _argc, const char* _argv[]) const char* name = 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* init = parse = bx::strws(bx::strnws (parse) ); + const char* init = parse = bx::strws((*parse == '=' ? ++parse : parse)); if (type < eol && name < eol @@ -1155,7 +1155,8 @@ int main(int _argc, const char* _argv[]) } else { - if (0 != glsl) + if (0 != glsl + || 0 != essl) { } else @@ -1269,7 +1270,8 @@ int main(int _argc, const char* _argv[]) bx::write(writer, BGFX_CHUNK_MAGIC_CSH); bx::write(writer, outputHash); - if (0 != glsl) + if (0 != glsl + || 0 != essl) { std::string code; @@ -1338,10 +1340,11 @@ int main(int _argc, const char* _argv[]) } else { - if (0 != glsl) + if (0 != glsl + || 0 != essl) { if (120 == glsl - || essl) + || 0 != essl) { preprocessor.writef( "#define ivec2 vec2\n" @@ -1700,7 +1703,8 @@ int main(int _argc, const char* _argv[]) bx::write(writer, outputHash); } - if (0 != glsl) + if (0 != glsl + || 0 != essl) { std::string code; |