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

Accept GLSL and SPIRV on Windows (#2286)

Browse Source 
Co-authored-by: Christophe Dehais <christophe.dehais@fittingbox.com>
This commit is contained in:
Christophe Dehais
2020-10-14 18:16:34 +02:00
committed by GitHub
parent eae703399b
commit daa61822d2
1 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tools/shaderc/shaderc.cpp
View File

@@ -1017,6 +1017,14 @@ namespace bgfx
, essl ? 1 : glsl
);
char hlslDefine[128];
if (0 != hlsl)
{
bx::snprintf(hlslDefine, BX_COUNTOF(hlslDefine)
, "BGFX_SHADER_LANGUAGE_HLSL=%d"
, hlsl);
}
const char* platform = _options.platform.c_str();
if (0 == bx::strCmpI(platform, "android") )
@@ -1067,9 +1075,18 @@ namespace bgfx
else if (0 == bx::strCmpI(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);
if (0 != hlsl)
{
preprocessor.setDefine(hlslDefine);
}
else if (0 != glsl)
{
preprocessor.setDefine(glslDefine);
}
else if (0 != spirv)
{
preprocessor.setDefine("BGFX_SHADER_LANGUAGE_SPIRV=1");
}
}
else if (0 == bx::strCmpI(platform, "orbis") )
{
@@ -1077,6 +1094,21 @@ namespace bgfx
preprocessor.setDefine("BGFX_SHADER_LANGUAGE_PSSL=1");
preprocessor.setDefine("lit=lit_reserved");
}
else
{
if (0 != hlsl)
{
preprocessor.setDefine(hlslDefine);
}
else if (0 != glsl)
{
preprocessor.setDefine(glslDefine);
}
else if (0 != spirv)
{
preprocessor.setDefine("BGFX_SHADER_LANGUAGE_SPIRV=1");
}
}
preprocessor.setDefine("M_PI=3.1415926535897932384626433832795");