Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
glslang
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
glslang
Commits
b73afa86
Commit
b73afa86
authored
Jan 05, 2021
by
Jeremy Hayes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prevent HLSL input under OpenGL semantics
Fix #2497.
parent
9325cc01
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
StandAlone.cpp
StandAlone/StandAlone.cpp
+6
-1
No files found.
StandAlone/StandAlone.cpp
View file @
b73afa86
...
@@ -844,6 +844,10 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
...
@@ -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()
...
@@ -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
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment