Mirrors/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-02-17 20:52:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Branimir Karadžić
2017-01-19 00:22:06 -08:00
parent f5c2ed411b
commit 14dccb7f1e
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/common/bgfx_utils.cpp
View File

@@ -23,6 +23,7 @@ namespace stl = tinystl;
BX_PRAGMA_DIAGNOSTIC_PUSH()
BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wtype-limits")
BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wunused-parameter")
BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wunused-value")
BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4100) // error C4100: '' : unreferenced formal parameter
#define MINIZ_NO_STDIO

2
src/image.cpp
View File

@@ -235,7 +235,7 @@ namespace bgfx
const TextureFormat::Enum fmt = TextureFormat::Enum(ii);
if (isValid(fmt) )
{
if (0 == bx::stricmp(s_textureFormatName[ii], _name) )
if (0 == bx::strincmp(s_textureFormatName[ii], _name) )
{
return fmt;
}

18
tools/shaderc/shaderc.cpp
View File

@@ -927,22 +927,22 @@ namespace bgfx
, essl ? 1 : glsl
);
if (0 == bx::stricmp(platform, "android") )
if (0 == bx::strincmp(platform, "android") )
{
preprocessor.setDefine("BX_PLATFORM_ANDROID=1");
preprocessor.setDefine("BGFX_SHADER_LANGUAGE_GLSL=1");
}
else if (0 == bx::stricmp(platform, "asm.js") )
else if (0 == bx::strincmp(platform, "asm.js") )
{
preprocessor.setDefine("BX_PLATFORM_EMSCRIPTEN=1");
preprocessor.setDefine("BGFX_SHADER_LANGUAGE_GLSL=1");
}
else if (0 == bx::stricmp(platform, "ios") )
else if (0 == bx::strincmp(platform, "ios") )
{
preprocessor.setDefine("BX_PLATFORM_IOS=1");
preprocessor.setDefine("BGFX_SHADER_LANGUAGE_GLSL=1");
}
else if (0 == bx::stricmp(platform, "linux") )
else if (0 == bx::strincmp(platform, "linux") )
{
preprocessor.setDefine("BX_PLATFORM_LINUX=1");
if (0 != spirv)
@@ -954,12 +954,12 @@ namespace bgfx
preprocessor.setDefine(glslDefine);
}
}
else if (0 == bx::stricmp(platform, "nacl") )
else if (0 == bx::strincmp(platform, "nacl") )
{
preprocessor.setDefine("BX_PLATFORM_NACL=1");
preprocessor.setDefine("BGFX_SHADER_LANGUAGE_GLSL=1");
}
else if (0 == bx::stricmp(platform, "osx") )
else if (0 == bx::strincmp(platform, "osx") )
{
preprocessor.setDefine("BX_PLATFORM_OSX=1");
preprocessor.setDefine(glslDefine);
@@ -967,19 +967,19 @@ namespace bgfx
bx::snprintf(temp, sizeof(temp), "BGFX_SHADER_LANGUAGE_METAL=%d", metal);
preprocessor.setDefine(temp);
}
else if (0 == bx::stricmp(platform, "windows") )
else if (0 == bx::strincmp(platform, "windows") )
{
preprocessor.setDefine("BX_PLATFORM_WINDOWS=1");
char temp[256];
bx::snprintf(temp, sizeof(temp), "BGFX_SHADER_LANGUAGE_HLSL=%d", hlsl);
preprocessor.setDefine(temp);
}
else if (0 == bx::stricmp(platform, "xbox360") )
else if (0 == bx::strincmp(platform, "xbox360") )
{
preprocessor.setDefine("BX_PLATFORM_XBOX360=1");
preprocessor.setDefine("BGFX_SHADER_LANGUAGE_HLSL=3");
}
else if (0 == bx::stricmp(platform, "orbis") )
else if (0 == bx::strincmp(platform, "orbis") )
{
preprocessor.setDefine("BX_PLATFORM_PS4=1");
preprocessor.setDefine("BGFX_SHADER_LANGUAGE_PSSL=1");

1
tools/texturec/texturec.cpp
View File

@@ -59,6 +59,7 @@ BX_PRAGMA_DIAGNOSTIC_POP();
BX_PRAGMA_DIAGNOSTIC_PUSH()
BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wtype-limits")
BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wunused-parameter")
BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG_GCC("-Wunused-value")
BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4100) // error C4100: '' : unreferenced formal parameter
#define MINIZ_NO_STDIO

2
tools/texturev/texturev.cpp
View File

@@ -319,7 +319,7 @@ struct View
bool supported = false;
for (uint32_t ii = 0; ii < BX_COUNTOF(s_supportedExt); ++ii)
{
if (0 == bx::stricmp(ext, s_supportedExt[ii]) )
if (0 == bx::strincmp(ext, s_supportedExt[ii]) )
{
supported = true;
break;