Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HLSL: Add better diagnostic when using in/out qualifiers in global scope #2258

Merged
merged 1 commit into from
Jun 2, 2020
Merged

HLSL: Add better diagnostic when using in/out qualifiers in global scope #2258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions Test/baseResults/hlsl.inoutquals.negative.frag.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
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
7 changes: 7 additions & 0 deletions Test/hlsl.inoutquals.negative.frag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
in float invalid1;
in out float invalid2;
inout float invalid3;
out float invalid4;

void main() {
}
1 change: 1 addition & 0 deletions gtests/Hlsl.FromFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down
10 changes: 10 additions & 0 deletions hlsl/hlslGrammar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a grey area between syntax and semantics, so maybe okay in the grammar file.

Generally, semantic errors should not go here; this file should stay focused on the grammar recognition.

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
Expand Down