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
f6873f7e
Commit
f6873f7e
authored
Apr 19, 2019
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
GLSL: Add error check for an argument dropping the 'restrict' qualifier
parent
08d61df0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
310.comp.out
Test/baseResults/310.comp.out
+2
-1
ParseHelper.cpp
glslang/MachineIndependent/ParseHelper.cpp
+2
-0
No files found.
Test/baseResults/310.comp.out
View file @
f6873f7e
...
...
@@ -29,6 +29,7 @@ ERROR: 0:94: 'writeonly' : argument cannot drop memory qualifier when passed to
ERROR: 0:97: '' : memory qualifiers cannot be used on this type
ERROR: 0:98: '' : memory qualifiers cannot be used on this type
ERROR: 0:109: 'format' : image formats must match
ERROR: 0:110: 'restrict' : argument cannot drop memory qualifier when passed to formal parameter
ERROR: 0:110: 'format' : image formats must match
ERROR: 0:111: 'format' : image formats must match
ERROR: 0:114: 'image load-store format' : not supported with this profile: es
...
...
@@ -86,7 +87,7 @@ WARNING: 0:238: '#define' : names containing consecutive underscores are reserve
ERROR: 0:244: 'gl_DeviceIndex' : required extension not requested: GL_EXT_device_group
ERROR: 0:245: 'gl_ViewIndex' : undeclared identifier
ERROR: 0:255: 'gl_ViewIndex' : undeclared identifier
ERROR: 8
5
compilation errors. No code generated.
ERROR: 8
6
compilation errors. No code generated.
Shader version: 310
...
...
glslang/MachineIndependent/ParseHelper.cpp
View file @
f6873f7e
...
...
@@ -1156,6 +1156,8 @@ TIntermTyped* TParseContext::handleFunctionCall(const TSourceLoc& loc, TFunction
error
(
arguments
->
getLoc
(),
message
,
"readonly"
,
""
);
if
(
argQualifier
.
writeonly
&&
!
formalQualifier
.
writeonly
)
error
(
arguments
->
getLoc
(),
message
,
"writeonly"
,
""
);
if
(
!
builtIn
&&
argQualifier
.
restrict
&&
!
formalQualifier
.
restrict
)
error
(
arguments
->
getLoc
(),
message
,
"restrict"
,
""
);
}
if
(
!
builtIn
&&
argQualifier
.
layoutFormat
!=
formalQualifier
.
layoutFormat
)
{
// we have mismatched formats, which should only be allowed if writeonly
...
...
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