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
fd1e8a78
Commit
fd1e8a78
authored
Dec 29, 2017
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
HLSL: Fix 1201: Accept 'layout' as an identifier.
parent
046bae0b
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
1 deletion
+3
-1
hlsl.layout.frag.out
Test/baseResults/hlsl.layout.frag.out
+0
-0
hlsl.layout.frag
Test/hlsl.layout.frag
+2
-1
hlslGrammar.cpp
hlsl/hlslGrammar.cpp
+1
-0
No files found.
Test/baseResults/hlsl.layout.frag.out
View file @
fd1e8a78
This diff is collapsed.
Click to expand it.
Test/hlsl.layout.frag
View file @
fd1e8a78
...
...
@@ -14,5 +14,6 @@ tbuffer tbufName2 : layout(set=4,binding=7) {
float4
PixelShaderFunction
(
float4
input
)
:
COLOR0
{
return
input
+
v1
+
v5
+
v1PostLayout
;
float4
layout
=
2
.
0
;
return
input
+
v1
+
v5
+
v1PostLayout
*
layout
;
}
hlsl/hlslGrammar.cpp
View file @
fd1e8a78
...
...
@@ -4077,6 +4077,7 @@ const char* HlslGrammar::getTypeString(EHlslTokenClass tokenClass) const
case
EHTokMin16int
:
return
"min16int"
;
case
EHTokMin12int
:
return
"min12int"
;
case
EHTokConstantBuffer
:
return
"ConstantBuffer"
;
case
EHTokLayout
:
return
"layout"
;
default
:
return
nullptr
;
}
...
...
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