Bläddra i källkod

Replaced strmb with strFindBlock.

Branimir Karadžić 7 år sedan
förälder
incheckning
1def5343e6
2 ändrade filer med 5 tillägg och 5 borttagningar
  1. 2 2
      src/renderer_gl.cpp
  2. 3 3
      tools/shaderc/shaderc.cpp

+ 2 - 2
src/renderer_gl.cpp

@@ -5463,8 +5463,8 @@ BX_TRACE("%d, %d, %d, %s", _array, _srgb, _mipAutogen, getName(_format) );
 							bx::StringView brace = bx::strFind(entry, "{");
 							bx::StringView brace = bx::strFind(entry, "{");
 							if (!brace.isEmpty() )
 							if (!brace.isEmpty() )
 							{
 							{
-								const char* end = bx::strmb(brace.getPtr(), '{', '}');
-								if (NULL != end)
+								bx::StringView block = bx::strFindBlock(bx::StringView(brace.getPtr(), shader.getTerm() ), '{', '}');
+								if (!block.isEmpty() )
 								{
 								{
 									strins(const_cast<char*>(brace.getPtr()+1), "\n  float bgfx_FragDepth = 0.0;\n");
 									strins(const_cast<char*>(brace.getPtr()+1), "\n  float bgfx_FragDepth = 0.0;\n");
 								}
 								}

+ 3 - 3
tools/shaderc/shaderc.cpp

@@ -1686,10 +1686,10 @@ namespace bgfx
 						bx::StringView brace = bx::strFind(bx::StringView(entry.getPtr(), shader.getTerm() ), "{");
 						bx::StringView brace = bx::strFind(bx::StringView(entry.getPtr(), shader.getTerm() ), "{");
 						if (!brace.isEmpty() )
 						if (!brace.isEmpty() )
 						{
 						{
-							const char* end = bx::strmb(brace.getPtr(), '{', '}');
-							if (NULL != end)
+							bx::StringView block = bx::strFindBlock(bx::StringView(brace.getPtr(), shader.getTerm() ), '{', '}');
+							if (!block.isEmpty() )
 							{
 							{
-								strInsert(const_cast<char*>(end), "__RETURN__;\n");
+								strInsert(const_cast<char*>(block.getTerm() ), "__RETURN__;\n");
 							}
 							}
 						}
 						}