mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SPV/Standalone: Support specifying arbitrary versions of SPIR-V.

Browse Source
This commit is contained in:
John Kessenich 2018-10-26 10:12:32 -06:00
parent ae63a8dfce
commit 8717a5d39a
4 changed files with 83 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SPIRV/GlslangToSpv.cpp Normal file → Executable file
View File

@ -1265,14 +1265,14 @@ TGlslangToSpvTraverser::TGlslangToSpvTraverser(unsigned int spvVersion, const gl
std::string text; std::string text;
const std::vector<std::string>& processes = glslangIntermediate->getProcesses(); const std::vector<std::string>& processes = glslangIntermediate->getProcesses();
for (int p = 0; p < (int)processes.size(); ++p) { for (int p = 0; p < (int)processes.size(); ++p) {
if (glslangIntermediate->getSpv().spv < 0x00010100) { if (glslangIntermediate->getSpv().spv < glslang::EShTargetSpv_1_1) {
text.append("// OpModuleProcessed "); text.append("// OpModuleProcessed ");
text.append(processes[p]); text.append(processes[p]);
text.append("\n"); text.append("\n");
} else } else
builder.addModuleProcessed(processes[p]); builder.addModuleProcessed(processes[p]);
} }
if (glslangIntermediate->getSpv().spv < 0x00010100 && (int)processes.size() > 0) if (glslangIntermediate->getSpv().spv < glslang::EShTargetSpv_1_1 && (int)processes.size() > 0)
text.append("#line 1\n"); text.append("#line 1\n");
text.append(glslangIntermediate->getSourceText()); text.append(glslangIntermediate->getSourceText());
builder.setSourceText(text); builder.setSourceText(text);

93
StandAlone/StandAlone.cpp
View File

@ -161,13 +161,17 @@ const char* shaderStageName = nullptr;
const char* variableName = nullptr; const char* variableName = nullptr;
bool HlslEnable16BitTypes = false; bool HlslEnable16BitTypes = false;
std::vector<std::string> IncludeDirectoryList; std::vector<std::string> IncludeDirectoryList;
int ClientInputSemanticsVersion = 100; // maps to, say, #define VULKAN 100
glslang::EShTargetClientVersion VulkanClientVersion = // Source environment
glslang::EShTargetVulkan_1_0; // would map to, say, Vulkan 1.0 // (source 'Client' is currently the same as target 'Client')
glslang::EShTargetClientVersion OpenGLClientVersion = int ClientInputSemanticsVersion = 100;
glslang::EShTargetOpenGL_450; // doesn't influence anything yet, but maps to OpenGL 4.50
glslang::EShTargetLanguageVersion TargetVersion = // Target environment
glslang::EShTargetSpv_1_0; // maps to, say, SPIR-V 1.0 glslang::EShClient Client = glslang::EShClientNone; // will stay EShClientNone if only validating
glslang::EShTargetClientVersion ClientVersion; // not valid until Client is set
glslang::EShTargetLanguage TargetLanguage = glslang::EShTargetNone;
glslang::EShTargetLanguageVersion TargetVersion; // not valid until TargetLanguage is set
std::vector<std::string> Processes; // what should be recorded by OpModuleProcessed, or equivalent std::vector<std::string> Processes; // what should be recorded by OpModuleProcessed, or equivalent
// Per descriptor-set binding base data // Per descriptor-set binding base data
@ -421,6 +425,9 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
// minimum needed (without overriding something else) to target Vulkan SPIR-V // minimum needed (without overriding something else) to target Vulkan SPIR-V
const auto setVulkanSpv = []() { const auto setVulkanSpv = []() {
if (Client == glslang::EShClientNone)
ClientVersion = glslang::EShTargetVulkan_1_0;
Client = glslang::EShClientVulkan;
Options |= EOptionSpv; Options |= EOptionSpv;
Options |= EOptionVulkanRules; Options |= EOptionVulkanRules;
Options |= EOptionLinkProgram; Options |= EOptionLinkProgram;
@ -428,6 +435,9 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
// minimum needed (without overriding something else) to target OpenGL SPIR-V // minimum needed (without overriding something else) to target OpenGL SPIR-V
const auto setOpenGlSpv = []() { const auto setOpenGlSpv = []() {
if (Client == glslang::EShClientNone)
ClientVersion = glslang::EShTargetOpenGL_450;
Client = glslang::EShClientOpenGL;
Options |= EOptionSpv; Options |= EOptionSpv;
Options |= EOptionLinkProgram; Options |= EOptionLinkProgram;
// undo a -H default to Vulkan // undo a -H default to Vulkan
@ -561,16 +571,30 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
if (argc > 1) { if (argc > 1) {
if (strcmp(argv[1], "vulkan1.0") == 0) { if (strcmp(argv[1], "vulkan1.0") == 0) {
setVulkanSpv(); setVulkanSpv();
VulkanClientVersion = glslang::EShTargetVulkan_1_0; ClientVersion = glslang::EShTargetVulkan_1_0;
} else if (strcmp(argv[1], "vulkan1.1") == 0) { } else if (strcmp(argv[1], "vulkan1.1") == 0) {
setVulkanSpv(); setVulkanSpv();
TargetVersion = glslang::EShTargetSpv_1_3; ClientVersion = glslang::EShTargetVulkan_1_1;
VulkanClientVersion = glslang::EShTargetVulkan_1_1;
} else if (strcmp(argv[1], "opengl") == 0) { } else if (strcmp(argv[1], "opengl") == 0) {
setOpenGlSpv(); setOpenGlSpv();
OpenGLClientVersion = glslang::EShTargetOpenGL_450; ClientVersion = glslang::EShTargetOpenGL_450;
} else if (strcmp(argv[1], "spirv1.0") == 0) {
TargetLanguage = glslang::EShTargetSpv;
TargetVersion = glslang::EShTargetSpv_1_0;
} else if (strcmp(argv[1], "spirv1.1") == 0) {
TargetLanguage = glslang::EShTargetSpv;
TargetVersion = glslang::EShTargetSpv_1_1;
} else if (strcmp(argv[1], "spirv1.2") == 0) {
TargetLanguage = glslang::EShTargetSpv;
TargetVersion = glslang::EShTargetSpv_1_2;
} else if (strcmp(argv[1], "spirv1.3") == 0) {
TargetLanguage = glslang::EShTargetSpv;
TargetVersion = glslang::EShTargetSpv_1_3;
} else if (strcmp(argv[1], "spirv1.4") == 0) {
TargetLanguage = glslang::EShTargetSpv;
TargetVersion = glslang::EShTargetSpv_1_4;
} else } else
Error("--target-env expected vulkan1.0, vulkan1.1, or opengl"); Error("--target-env expected one of: vulkan1.0, vulkan1.1, opengl, spirv1.0, spirv1.1, spirv1.2, or spirv1.3");
} }
bumpArg(); bumpArg();
} else if (lowerword == "variable-name" || // synonyms } else if (lowerword == "variable-name" || // synonyms
@ -604,7 +628,7 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
Options |= EOptionOutputPreprocessed; Options |= EOptionOutputPreprocessed;
break; break;
case 'G': case 'G':
// OpenGL Client // OpenGL client
setOpenGlSpv(); setOpenGlSpv();
if (argv[0][2] != 0) if (argv[0][2] != 0)
ClientInputSemanticsVersion = getAttachedNumber("-G<num> client input semantics"); ClientInputSemanticsVersion = getAttachedNumber("-G<num> client input semantics");
@ -736,6 +760,28 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
if ((Options & EOptionFlattenUniformArrays) != 0 && if ((Options & EOptionFlattenUniformArrays) != 0 &&
(Options & EOptionReadHlsl) == 0) (Options & EOptionReadHlsl) == 0)
Error("uniform array flattening only valid when compiling HLSL source."); Error("uniform array flattening only valid when compiling HLSL source.");
// rationalize client and target language
if (TargetLanguage == glslang::EShTargetNone) {
switch (ClientVersion) {
case glslang::EShTargetVulkan_1_0:
TargetLanguage = glslang::EShTargetSpv;
TargetVersion = glslang::EShTargetSpv_1_0;
break;
case glslang::EShTargetVulkan_1_1:
TargetLanguage = glslang::EShTargetSpv;
TargetVersion = glslang::EShTargetSpv_1_3;
break;
case glslang::EShTargetOpenGL_450:
TargetLanguage = glslang::EShTargetSpv;
TargetVersion = glslang::EShTargetSpv_1_0;
break;
default:
break;
}
}
if (TargetLanguage != glslang::EShTargetNone && Client == glslang::EShClientNone)
Error("To generate SPIR-V, also specify client semantics. See -G and -V.");
} }
// //
@ -936,18 +982,11 @@ void CompileAndLinkShaderUnits(std::vector<ShaderCompUnit> compUnits)
// Set up the environment, some subsettings take precedence over earlier // Set up the environment, some subsettings take precedence over earlier
// ways of setting things. // ways of setting things.
if (Options & EOptionSpv) { if (Options & EOptionSpv) {
if (Options & EOptionVulkanRules) {
shader->setEnvInput((Options & EOptionReadHlsl) ? glslang::EShSourceHlsl shader->setEnvInput((Options & EOptionReadHlsl) ? glslang::EShSourceHlsl
: glslang::EShSourceGlsl, : glslang::EShSourceGlsl,
compUnit.stage, glslang::EShClientVulkan, ClientInputSemanticsVersion); compUnit.stage, Client, ClientInputSemanticsVersion);
shader->setEnvClient(glslang::EShClientVulkan, VulkanClientVersion); shader->setEnvClient(Client, ClientVersion);
} else { shader->setEnvTarget(TargetLanguage, TargetVersion);
shader->setEnvInput((Options & EOptionReadHlsl) ? glslang::EShSourceHlsl
: glslang::EShSourceGlsl,
compUnit.stage, glslang::EShClientOpenGL, ClientInputSemanticsVersion);
shader->setEnvClient(glslang::EShClientOpenGL, OpenGLClientVersion);
}
shader->setEnvTarget(glslang::EShTargetSpv, TargetVersion);
if (targetHlslFunctionality1) if (targetHlslFunctionality1)
shader->setEnvTargetHlslFunctionality1(); shader->setEnvTargetHlslFunctionality1();
} }
@ -1515,12 +1554,16 @@ void usage()
" --sep synonym for --source-entrypoint\n" " --sep synonym for --source-entrypoint\n"
" --stdin read from stdin instead of from a file;\n" " --stdin read from stdin instead of from a file;\n"
" requires providing the shader stage using -S\n" " requires providing the shader stage using -S\n"
" --target-env {vulkan1.0 | vulkan1.1 | opengl} \n" " --target-env {vulkan1.0 | vulkan1.1 | opengl | \n"
" spirv1.0 | spirv1.1 | spirv1.2 | spirv1.3}\n"
" set execution environment that emitted code\n" " set execution environment that emitted code\n"
" will execute in (as opposed to the language\n" " will execute in (versus source language\n"
" semantics selected by --client) defaults:\n" " semantics selected by --client) defaults:\n"
" * 'vulkan1.0' under '--client vulkan<ver>'\n" " * 'vulkan1.0' under '--client vulkan<ver>'\n"
" * 'opengl' under '--client opengl<ver>'\n" " * 'opengl' under '--client opengl<ver>'\n"
" * 'spirv1.0' under --target-env vulkan1.0\n"
" * 'spirv1.3' under --target-env vulkan1.1\n"
" multiple --targen-env can be specified.\n"
" --variable-name <name>\n" " --variable-name <name>\n"
" --vn <name> creates a C header file that contains a\n" " --vn <name> creates a C header file that contains a\n"
" uint32_t array named <name>\n" " uint32_t array named <name>\n"

1
Test/runtests
View File

@ -173,6 +173,7 @@ $EXE --target-env vulkan1.1 spv.targetVulkan.vert || HASERROR=1
$EXE --target-env opengl spv.targetOpenGL.vert || HASERROR=1 $EXE --target-env opengl spv.targetOpenGL.vert || HASERROR=1
$EXE -V100 spv.targetVulkan.vert || HASERROR=1 $EXE -V100 spv.targetVulkan.vert || HASERROR=1
$EXE -G100 spv.targetOpenGL.vert || HASERROR=1 $EXE -G100 spv.targetOpenGL.vert || HASERROR=1
$EXE --target-env spirv1.2 -V spv.targetVulkan.vert || HASERROR=1
# #
# Testing GLSL entry point rename # Testing GLSL entry point rename

3
glslang/Public/ShaderLang.h Normal file → Executable file
View File

@ -154,7 +154,10 @@ typedef EShTargetClientVersion EshTargetClientVersion;
typedef enum { typedef enum {
EShTargetSpv_1_0 = (1 << 16), EShTargetSpv_1_0 = (1 << 16),
EShTargetSpv_1_1 = (1 << 16) | (1 << 8),
EShTargetSpv_1_2 = (1 << 16) | (2 << 8),
EShTargetSpv_1_3 = (1 << 16) | (3 << 8), EShTargetSpv_1_3 = (1 << 16) | (3 << 8),
EShTargetSpv_1_4 = (1 << 16) | (4 << 8),
} EShTargetLanguageVersion; } EShTargetLanguageVersion;
struct TInputLanguage { struct TInputLanguage {