Browse Source

Merge pull request #1583 from pangweiwei/master

fix shaderrc generate wrong shader of matal
Бранимир Караџић 7 years ago
parent
commit
1e16bd40ef
1 changed files with 3 additions and 2 deletions
  1. 3 2
      tools/shaderc/shaderc_glsl.cpp

+ 3 - 2
tools/shaderc/shaderc_glsl.cpp

@@ -216,8 +216,9 @@ namespace bgfx { namespace glsl
 					const char* typen = parse.getPtr();
 					const char* typen = parse.getPtr();
 
 
 					char uniformType[256];
 					char uniformType[256];
-					parse = bx::strWord(parse).getPtr();
-					bx::strCopy(uniformType, int32_t(parse.getPtr()-typen+1), typen);
+					parse = bx::strWord(parse);
+					bx::strCopy(uniformType, parse.getLength()+1, typen);
+					parse.set(parse.getPtr()+parse.getLength(),optShader.getTerm());
 					const char* name = bx::strLTrimSpace(parse).getPtr();
 					const char* name = bx::strLTrimSpace(parse).getPtr();
 					parse.set(name, optShader.getTerm() );
 					parse.set(name, optShader.getTerm() );