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
1fe4a447
Commit
1fe4a447
authored
Mar 19, 2018
by
Neil Roberts
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add locations to opaque types for OpenGL
parent
95b1334a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
1 deletion
+4
-1
spv.debugInfo.1.1.frag.out
Test/baseResults/spv.debugInfo.1.1.frag.out
+1
-0
spv.debugInfo.frag.out
Test/baseResults/spv.debugInfo.frag.out
+1
-0
iomapper.cpp
glslang/MachineIndependent/iomapper.cpp
+2
-1
No files found.
Test/baseResults/spv.debugInfo.1.1.frag.out
View file @
1fe4a447
...
...
@@ -94,6 +94,7 @@ void main()
MemberDecorate 54(ubuf) 0 Offset 0
Decorate 54(ubuf) Block
Decorate 56 DescriptorSet 3
Decorate 69(s2d) Location 0
Decorate 69(s2d) DescriptorSet 3
3: TypeVoid
4: TypeFunction 3
...
...
Test/baseResults/spv.debugInfo.frag.out
View file @
1fe4a447
...
...
@@ -97,6 +97,7 @@ void main()
Decorate 54(ubuf) Block
Decorate 56 DescriptorSet 3
Decorate 56 Binding 0
Decorate 69(s2d) Location 0
Decorate 69(s2d) DescriptorSet 3
Decorate 69(s2d) Binding 1
3: TypeVoid
...
...
glslang/MachineIndependent/iomapper.cpp
View file @
1fe4a447
...
...
@@ -431,7 +431,8 @@ struct TDefaultIoResolverBase : public glslang::TIoMapResolver
// no locations added if already present, a built-in variable, a block, or an opaque
if
(
type
.
getQualifier
().
hasLocation
()
||
type
.
isBuiltIn
()
||
type
.
getBasicType
()
==
EbtBlock
||
type
.
containsOpaque
())
type
.
getBasicType
()
==
EbtBlock
||
(
type
.
containsOpaque
()
&&
intermediate
.
getSpv
().
openGl
==
0
))
return
-
1
;
// no locations on blocks of built-in variables
...
...
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