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

Merge pull request #2500 from jeremy-lunarg/hayes-2497

Browse Source 
Prevent HLSL input under OpenGL semantics
This commit is contained in:
greg-lunarg 2021-01-06 10:48:00 -07:00 committed by GitHub
commit 480f6039e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
StandAlone/StandAlone.cpp
View File

@ -844,6 +844,10 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
(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.");
if ((Options & EOptionReadHlsl) && (Client == glslang::EShClientOpenGL)) {
Error("Using HLSL input under OpenGL semantics is not currently supported.");
}
// rationalize client and target language // rationalize client and target language
if (TargetLanguage == glslang::EShTargetNone) { if (TargetLanguage == glslang::EShTargetNone) {
switch (ClientVersion) { switch (ClientVersion) {
@ -1561,7 +1565,8 @@ void usage()
" 'ver', when present, is the version of the input semantics,\n" " 'ver', when present, is the version of the input semantics,\n"
" which will appear in #define GL_SPIRV ver;\n" " which will appear in #define GL_SPIRV ver;\n"
" '--client opengl100' is the same as -G100;\n" " '--client opengl100' is the same as -G100;\n"
" a '--target-env' for OpenGL will also imply '-G'\n" " a '--target-env' for OpenGL will also imply '-G';\n"
" currently only supports GLSL\n"
" -H print human readable form of SPIR-V; turns on -V\n" " -H print human readable form of SPIR-V; turns on -V\n"
" -I<dir> add dir to the include search path; includer's directory\n" " -I<dir> add dir to the include search path; includer's directory\n"
" is searched first, followed by left-to-right order of -I\n" " is searched first, followed by left-to-right order of -I\n"