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

shaderc: Added SPIR-V target.

Browse Source
This commit is contained in:
Branimir Karadžić 2016-10-16 10:29:46 -07:00
parent 2da0e00222
commit 44a5b7a328
1 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
tools/shaderc/shaderc.cpp
View File

@ -784,8 +784,7 @@ namespace bgfx
const char* platform = cmdLine.findOption('\0', "platform"); const char* platform = cmdLine.findOption('\0', "platform");
if (NULL == platform) if (NULL == platform)
{ {
help("Must specify platform."); platform = "";
return EXIT_FAILURE;
} }
bool raw = cmdLine.hasArg('\0', "raw"); bool raw = cmdLine.hasArg('\0', "raw");
@ -796,6 +795,7 @@ namespace bgfx
uint32_t d3d = 11; uint32_t d3d = 11;
uint32_t metal = 0; uint32_t metal = 0;
uint32_t pssl = 0; uint32_t pssl = 0;
uint32_t spirv = 0;
const char* profile = cmdLine.findOption('p', "profile"); const char* profile = cmdLine.findOption('p', "profile");
if (NULL != profile) if (NULL != profile)
{ {
@ -824,6 +824,10 @@ namespace bgfx
{ {
pssl = 1; pssl = 1;
} }
else if (0 == strcmp(profile, "spirv") )
{
spirv = 1;
}
else else
{ {
glsl = atoi(profile); glsl = atoi(profile);
@ -902,11 +906,15 @@ namespace bgfx
preprocessor.setDefaultDefine("BX_PLATFORM_PS4"); preprocessor.setDefaultDefine("BX_PLATFORM_PS4");
preprocessor.setDefaultDefine("BX_PLATFORM_WINDOWS"); preprocessor.setDefaultDefine("BX_PLATFORM_WINDOWS");
preprocessor.setDefaultDefine("BX_PLATFORM_XBOX360"); preprocessor.setDefaultDefine("BX_PLATFORM_XBOX360");
preprocessor.setDefaultDefine("BX_PLATFORM_XBOXONE");
// preprocessor.setDefaultDefine("BGFX_SHADER_LANGUAGE_ESSL"); // preprocessor.setDefaultDefine("BGFX_SHADER_LANGUAGE_ESSL");
preprocessor.setDefaultDefine("BGFX_SHADER_LANGUAGE_GLSL"); preprocessor.setDefaultDefine("BGFX_SHADER_LANGUAGE_GLSL");
preprocessor.setDefaultDefine("BGFX_SHADER_LANGUAGE_HLSL"); preprocessor.setDefaultDefine("BGFX_SHADER_LANGUAGE_HLSL");
preprocessor.setDefaultDefine("BGFX_SHADER_LANGUAGE_METAL"); preprocessor.setDefaultDefine("BGFX_SHADER_LANGUAGE_METAL");
preprocessor.setDefaultDefine("BGFX_SHADER_LANGUAGE_PSSL"); preprocessor.setDefaultDefine("BGFX_SHADER_LANGUAGE_PSSL");
preprocessor.setDefaultDefine("BGFX_SHADER_LANGUAGE_SPIRV");
preprocessor.setDefaultDefine("BGFX_SHADER_TYPE_COMPUTE"); preprocessor.setDefaultDefine("BGFX_SHADER_TYPE_COMPUTE");
preprocessor.setDefaultDefine("BGFX_SHADER_TYPE_FRAGMENT"); preprocessor.setDefaultDefine("BGFX_SHADER_TYPE_FRAGMENT");
preprocessor.setDefaultDefine("BGFX_SHADER_TYPE_VERTEX"); preprocessor.setDefaultDefine("BGFX_SHADER_TYPE_VERTEX");
@ -965,11 +973,6 @@ namespace bgfx
preprocessor.setDefine("BGFX_SHADER_LANGUAGE_PSSL=1"); preprocessor.setDefine("BGFX_SHADER_LANGUAGE_PSSL=1");
preprocessor.setDefine("lit=lit_reserved"); preprocessor.setDefine("lit=lit_reserved");
} }
else
{
fprintf(stderr, "Unknown platform %s?!", platform);
return EXIT_FAILURE;
}
preprocessor.setDefine("M_PI=3.1415926535897932384626433832795"); preprocessor.setDefine("M_PI=3.1415926535897932384626433832795");
@ -1384,6 +1387,10 @@ namespace bgfx
compiled = compileGLSLShader(cmdLine, essl, code, writer); compiled = compileGLSLShader(cmdLine, essl, code, writer);
#endif // 0 #endif // 0
} }
else if (0 != spirv)
{
compiled = compileSPIRVShader(cmdLine, 0, preprocessor.m_preprocessed, writer);
}
else if (0 != pssl) else if (0 != pssl)
{ {
compiled = compilePSSLShader(cmdLine, 0, preprocessor.m_preprocessed, writer); compiled = compilePSSLShader(cmdLine, 0, preprocessor.m_preprocessed, writer);
@ -1807,7 +1814,8 @@ namespace bgfx
if (0 != glsl if (0 != glsl
|| 0 != essl || 0 != essl
|| 0 != metal) || 0 != metal
|| 0 != spirv )
{ {
std::string code; std::string code;
@ -1957,11 +1965,23 @@ namespace bgfx
} }
code += preprocessor.m_preprocessed; code += preprocessor.m_preprocessed;
compiled = compileGLSLShader(cmdLine
, metal ? BX_MAKEFOURCC('M', 'T', 'L', 0) : essl if (0 != spirv)
, code {
, writer compiled = compileSPIRVShader(cmdLine
); , 0
, code
, writer
);
}
else
{
compiled = compileGLSLShader(cmdLine
, metal ? BX_MAKEFOURCC('M', 'T', 'L', 0) : essl
, code
, writer
);
}
} }
else if (0 != pssl) else if (0 != pssl)
{ {