From 1def5343e62b4cb1ea498d209e571f204c39aaeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Sun, 28 Oct 2018 16:58:46 -0700 Subject: [PATCH] Replaced strmb with strFindBlock. --- src/renderer_gl.cpp | 4 ++-- tools/shaderc/shaderc.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp index 94d0f3677..b3a44519c 100644 --- a/src/renderer_gl.cpp +++ b/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, "{"); 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(brace.getPtr()+1), "\n float bgfx_FragDepth = 0.0;\n"); } diff --git a/tools/shaderc/shaderc.cpp b/tools/shaderc/shaderc.cpp index c0f08b0fe..70332051b 100644 --- a/tools/shaderc/shaderc.cpp +++ b/tools/shaderc/shaderc.cpp @@ -1686,10 +1686,10 @@ namespace bgfx bx::StringView brace = bx::strFind(bx::StringView(entry.getPtr(), shader.getTerm() ), "{"); 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(end), "__RETURN__;\n"); + strInsert(const_cast(block.getTerm() ), "__RETURN__;\n"); } }