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
5cc344d8
Commit
5cc344d8
authored
May 05, 2016
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Front-End: precise: capture noContraction on output parameter declarations.
parent
076879d6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
6 deletions
+11
-6
specExamples.vert.out
Test/baseResults/specExamples.vert.out
+4
-4
ParseHelper.cpp
glslang/MachineIndependent/ParseHelper.cpp
+7
-2
No files found.
Test/baseResults/specExamples.vert.out
View file @
5cc344d8
...
@@ -83,10 +83,10 @@ ERROR: node is still EOpNull!
...
@@ -83,10 +83,10 @@ ERROR: node is still EOpNull!
0:153 Function Parameters:
0:153 Function Parameters:
0:153 'i' (in float)
0:153 'i' (in float)
0:153 'j' (in float)
0:153 'j' (in float)
0:153 'k' (out float)
0:153 'k' (
noContraction
out float)
0:155 Sequence
0:155 Sequence
0:155 move second child to first child (temp float)
0:155 move second child to first child (temp float)
0:155 'k' (out float)
0:155 'k' (
noContraction
out float)
0:155 add (temp float)
0:155 add (temp float)
0:155 component-wise multiply (temp float)
0:155 component-wise multiply (temp float)
0:155 'i' (in float)
0:155 'i' (in float)
...
@@ -367,10 +367,10 @@ ERROR: node is still EOpNull!
...
@@ -367,10 +367,10 @@ ERROR: node is still EOpNull!
0:153 Function Parameters:
0:153 Function Parameters:
0:153 'i' (in float)
0:153 'i' (in float)
0:153 'j' (in float)
0:153 'j' (in float)
0:153 'k' (out float)
0:153 'k' (
noContraction
out float)
0:155 Sequence
0:155 Sequence
0:155 move second child to first child (temp float)
0:155 move second child to first child (temp float)
0:155 'k' (out float)
0:155 'k' (
noContraction
out float)
0:155 add (temp float)
0:155 add (temp float)
0:155 component-wise multiply (temp float)
0:155 component-wise multiply (temp float)
0:155 'i' (in float)
0:155 'i' (in float)
...
...
glslang/MachineIndependent/ParseHelper.cpp
View file @
5cc344d8
...
@@ -3538,6 +3538,7 @@ void TParseContext::paramCheckFix(const TSourceLoc& loc, const TQualifier& quali
...
@@ -3538,6 +3538,7 @@ void TParseContext::paramCheckFix(const TSourceLoc& loc, const TQualifier& quali
type
.
getQualifier
().
writeonly
=
qualifier
.
writeonly
;
type
.
getQualifier
().
writeonly
=
qualifier
.
writeonly
;
type
.
getQualifier
().
restrict
=
qualifier
.
restrict
;
type
.
getQualifier
().
restrict
=
qualifier
.
restrict
;
}
}
if
(
qualifier
.
isAuxiliary
()
||
if
(
qualifier
.
isAuxiliary
()
||
qualifier
.
isInterpolation
())
qualifier
.
isInterpolation
())
error
(
loc
,
"cannot use auxiliary or interpolation qualifiers on a function parameter"
,
""
,
""
);
error
(
loc
,
"cannot use auxiliary or interpolation qualifiers on a function parameter"
,
""
,
""
);
...
@@ -3545,8 +3546,12 @@ void TParseContext::paramCheckFix(const TSourceLoc& loc, const TQualifier& quali
...
@@ -3545,8 +3546,12 @@ void TParseContext::paramCheckFix(const TSourceLoc& loc, const TQualifier& quali
error
(
loc
,
"cannot use layout qualifiers on a function parameter"
,
""
,
""
);
error
(
loc
,
"cannot use layout qualifiers on a function parameter"
,
""
,
""
);
if
(
qualifier
.
invariant
)
if
(
qualifier
.
invariant
)
error
(
loc
,
"cannot use invariant qualifier on a function parameter"
,
""
,
""
);
error
(
loc
,
"cannot use invariant qualifier on a function parameter"
,
""
,
""
);
if
(
qualifier
.
noContraction
&&
qualifier
.
storage
!=
EvqOut
&&
qualifier
.
storage
!=
EvqInOut
)
if
(
qualifier
.
noContraction
)
{
warn
(
loc
,
"qualifier has no effect on non-output parameters"
,
"precise"
,
""
);
if
(
qualifier
.
storage
==
EvqOut
||
qualifier
.
storage
==
EvqInOut
)
type
.
getQualifier
().
noContraction
=
true
;
else
warn
(
loc
,
"qualifier has no effect on non-output parameters"
,
"precise"
,
""
);
}
paramCheckFix
(
loc
,
qualifier
.
storage
,
type
);
paramCheckFix
(
loc
,
qualifier
.
storage
,
type
);
}
}
...
...
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