mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set BGFX_SHADER_LANGUAGE_GLSL to actual profile more consistently (#2664)

Browse Source
This commit is contained in:
Christophe Dehais 2021-11-19 16:27:13 +01:00 committed by GitHub
parent c0729cb09b
commit 6224daf907
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/shaderc/shaderc.cpp
View File

@ -1128,7 +1128,6 @@ namespace bgfx
preprocessor.setDefaultDefine("BX_PLATFORM_WINDOWS");
preprocessor.setDefaultDefine("BX_PLATFORM_XBOXONE");
// preprocessor.setDefaultDefine("BGFX_SHADER_LANGUAGE_ESSL");
preprocessor.setDefaultDefine("BGFX_SHADER_LANGUAGE_GLSL");
preprocessor.setDefaultDefine("BGFX_SHADER_LANGUAGE_HLSL");
preprocessor.setDefaultDefine("BGFX_SHADER_LANGUAGE_METAL");
@ -1140,10 +1139,14 @@ namespace bgfx
preprocessor.setDefaultDefine("BGFX_SHADER_TYPE_VERTEX");
char glslDefine[128];
if (profile->lang == ShadingLang::GLSL
|| profile->lang == ShadingLang::ESSL)
{
bx::snprintf(glslDefine, BX_COUNTOF(glslDefine)
, "BGFX_SHADER_LANGUAGE_GLSL=%d"
, (profile->lang == ShadingLang::ESSL) ? 1 : profile->id
, profile->id
);
}
char hlslDefine[128];
if (profile->lang == ShadingLang::HLSL)
@ -1158,12 +1161,19 @@ namespace bgfx
if (0 == bx::strCmpI(platform, "android") )
{
preprocessor.setDefine("BX_PLATFORM_ANDROID=1");
preprocessor.setDefine("BGFX_SHADER_LANGUAGE_GLSL=1");
if (profile->lang == ShadingLang::SpirV)
{
preprocessor.setDefine("BGFX_SHADER_LANGUAGE_SPIRV=1");
}
else
{
preprocessor.setDefine(glslDefine);
}
}
else if (0 == bx::strCmpI(platform, "asm.js") )
{
preprocessor.setDefine("BX_PLATFORM_EMSCRIPTEN=1");
preprocessor.setDefine("BGFX_SHADER_LANGUAGE_GLSL=1");
preprocessor.setDefine(glslDefine);
}
else if (0 == bx::strCmpI(platform, "ios") )
{
@ -1174,7 +1184,7 @@ namespace bgfx
}
else
{
preprocessor.setDefine("BGFX_SHADER_LANGUAGE_GLSL=1");
preprocessor.setDefine(glslDefine);
}
}
else if (0 == bx::strCmpI(platform, "linux") )