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
78a3c915
Unverified
Commit
78a3c915
authored
Jun 02, 2020
by
rdb
Committed by
GitHub
Jun 02, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
HLSL: Add better diagnostic when using in/out qualifiers in global scope (#2258)
parent
b56e0e44
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
61 additions
and
0 deletions
+61
-0
hlsl.inoutquals.negative.frag.out
Test/baseResults/hlsl.inoutquals.negative.frag.out
+43
-0
hlsl.inoutquals.negative.frag
Test/hlsl.inoutquals.negative.frag
+7
-0
Hlsl.FromFile.cpp
gtests/Hlsl.FromFile.cpp
+1
-0
hlslGrammar.cpp
hlsl/hlslGrammar.cpp
+10
-0
No files found.
Test/baseResults/hlsl.inoutquals.negative.frag.out
0 → 100644
View file @
78a3c915
hlsl.inoutquals.negative.frag
ERROR: 0:1: 'invalid1' : in/out qualifiers are only valid on parameters
ERROR: 0:2: 'invalid2' : in/out qualifiers are only valid on parameters
ERROR: 0:3: 'invalid3' : in/out qualifiers are only valid on parameters
ERROR: 0:4: 'invalid4' : in/out qualifiers are only valid on parameters
ERROR: 4 compilation errors. No code generated.
Shader version: 500
gl_FragCoord origin is upper left
ERROR: node is still EOpNull!
0:6 Function Definition: @main( ( temp void)
0:6 Function Parameters:
0:6 Function Definition: main( ( temp void)
0:6 Function Parameters:
0:? Sequence
0:6 Function Call: @main( ( temp void)
0:? Linker Objects
0:? 'invalid1' ( in float)
0:? 'invalid2' ( inout float)
0:? 'invalid3' ( inout float)
0:? 'invalid4' ( out float)
Linked fragment stage:
Shader version: 500
gl_FragCoord origin is upper left
ERROR: node is still EOpNull!
0:6 Function Definition: @main( ( temp void)
0:6 Function Parameters:
0:6 Function Definition: main( ( temp void)
0:6 Function Parameters:
0:? Sequence
0:6 Function Call: @main( ( temp void)
0:? Linker Objects
0:? 'invalid1' ( in float)
0:? 'invalid2' ( inout float)
0:? 'invalid3' ( inout float)
0:? 'invalid4' ( out float)
SPIR-V is not generated for failed compile or link
Test/hlsl.inoutquals.negative.frag
0 → 100644
View file @
78a3c915
in
float
invalid1
;
in
out
float
invalid2
;
inout
float
invalid3
;
out
float
invalid4
;
void
main
()
{
}
gtests/Hlsl.FromFile.cpp
View file @
78a3c915
...
...
@@ -239,6 +239,7 @@ INSTANTIATE_TEST_CASE_P(
{
"hlsl.implicitBool.frag"
,
"main"
},
{
"hlsl.inf.vert"
,
"main"
},
{
"hlsl.inoutquals.frag"
,
"main"
},
{
"hlsl.inoutquals.negative.frag"
,
"main"
},
{
"hlsl.init.frag"
,
"ShaderFunction"
},
{
"hlsl.init2.frag"
,
"main"
},
{
"hlsl.isfinite.frag"
,
"main"
},
...
...
hlsl/hlslGrammar.cpp
View file @
78a3c915
...
...
@@ -382,6 +382,16 @@ bool HlslGrammar::acceptDeclaration(TIntermNode*& nodeList)
if
(
forbidDeclarators
)
return
true
;
// Check if there are invalid in/out qualifiers
switch
(
declaredType
.
getQualifier
().
storage
)
{
case
EvqIn
:
case
EvqOut
:
case
EvqInOut
:
parseContext
.
error
(
token
.
loc
,
"in/out qualifiers are only valid on parameters"
,
token
.
string
->
c_str
(),
""
);
default
:
break
;
}
// declarator_list
// : declarator
// : identifier
...
...
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