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
14b85d3f
Commit
14b85d3f
authored
Jun 04, 2018
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix #1395: GLSL volatile maps to SPIR-V Volatile and Coherent.
The major version number was bumped in the previous commit to support this.
parent
d6c97557
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
GlslangToSpv.cpp
SPIRV/GlslangToSpv.cpp
+3
-1
spv.memoryQualifier.frag.out
Test/baseResults/spv.memoryQualifier.frag.out
+2
-0
revision.h
glslang/Include/revision.h
+1
-1
No files found.
SPIRV/GlslangToSpv.cpp
View file @
14b85d3f
...
...
@@ -340,8 +340,10 @@ void TranslateMemoryDecoration(const glslang::TQualifier& qualifier, std::vector
{
if
(
qualifier
.
coherent
)
memory
.
push_back
(
spv
::
DecorationCoherent
);
if
(
qualifier
.
volatil
)
if
(
qualifier
.
volatil
)
{
memory
.
push_back
(
spv
::
DecorationVolatile
);
memory
.
push_back
(
spv
::
DecorationCoherent
);
}
if
(
qualifier
.
restrict
)
memory
.
push_back
(
spv
::
DecorationRestrict
);
if
(
qualifier
.
readonly
)
...
...
Test/baseResults/spv.memoryQualifier.frag.out
View file @
14b85d3f
...
...
@@ -35,6 +35,7 @@ spv.memoryQualifier.frag
Decorate 19(i2D) DescriptorSet 0
Decorate 19(i2D) Binding 1
Decorate 19(i2D) Volatile
Decorate 19(i2D) Coherent
Decorate 28(i2DRect) DescriptorSet 0
Decorate 28(i2DRect) Binding 2
Decorate 28(i2DRect) Restrict
...
...
@@ -48,6 +49,7 @@ spv.memoryQualifier.frag
MemberDecorate 49(Data) 1 Offset 8
MemberDecorate 50(Buffer) 0 Coherent
MemberDecorate 50(Buffer) 0 Volatile
MemberDecorate 50(Buffer) 0 Coherent
MemberDecorate 50(Buffer) 0 Offset 0
MemberDecorate 50(Buffer) 1 Coherent
MemberDecorate 50(Buffer) 1 Restrict
...
...
glslang/Include/revision.h
View file @
14b85d3f
// This header is generated by the make-revision script.
#define GLSLANG_PATCH_LEVEL 276
4
#define GLSLANG_PATCH_LEVEL 276
5
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