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
36b218de
Commit
36b218de
authored
Mar 15, 2017
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
HLSL: Fix #771: add inline keyword.
parent
95e736c8
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
3 deletions
+9
-3
hlsl.inoutquals.frag
Test/hlsl.inoutquals.frag
+1
-1
revision.h
glslang/Include/revision.h
+2
-2
hlslGrammar.cpp
hlsl/hlslGrammar.cpp
+3
-0
hlslScanContext.cpp
hlsl/hlslScanContext.cpp
+2
-0
hlslTokens.h
hlsl/hlslTokens.h
+1
-0
No files found.
Test/hlsl.inoutquals.frag
View file @
36b218de
...
@@ -4,7 +4,7 @@ struct PS_OUTPUT
...
@@ -4,7 +4,7 @@ struct PS_OUTPUT
float
Depth
:
SV_Depth
;
float
Depth
:
SV_Depth
;
};
};
void
MyFunc
(
in
float
x
,
out
float
y
,
inout
float
z
)
inline
void
MyFunc
(
in
float
x
,
out
float
y
,
inout
float
z
)
{
{
y
=
x
;
y
=
x
;
z
=
y
;
z
=
y
;
...
...
glslang/Include/revision.h
View file @
36b218de
...
@@ -2,5 +2,5 @@
...
@@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits.
// For the version, it uses the latest git tag followed by the number of commits.
// For the date, it uses the current date (when then script is run).
// For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "Overload400-PrecQual.191
4
"
#define GLSLANG_REVISION "Overload400-PrecQual.191
6
"
#define GLSLANG_DATE "1
4
-Mar-2017"
#define GLSLANG_DATE "1
5
-Mar-2017"
hlsl/hlslGrammar.cpp
View file @
36b218de
...
@@ -627,6 +627,9 @@ bool HlslGrammar::acceptQualifier(TQualifier& qualifier)
...
@@ -627,6 +627,9 @@ bool HlslGrammar::acceptQualifier(TQualifier& qualifier)
case
EHTokGloballyCoherent
:
case
EHTokGloballyCoherent
:
qualifier
.
coherent
=
true
;
qualifier
.
coherent
=
true
;
break
;
break
;
case
EHTokInline
:
// TODO: map this to SPIR-V function control
break
;
// GS geometries: these are specified on stage input variables, and are an error (not verified here)
// GS geometries: these are specified on stage input variables, and are an error (not verified here)
// for output variables.
// for output variables.
...
...
hlsl/hlslScanContext.cpp
View file @
36b218de
...
@@ -119,6 +119,7 @@ void HlslScanContext::fillInKeywordMap()
...
@@ -119,6 +119,7 @@ void HlslScanContext::fillInKeywordMap()
(
*
KeywordMap
)[
"inout"
]
=
EHTokInOut
;
(
*
KeywordMap
)[
"inout"
]
=
EHTokInOut
;
(
*
KeywordMap
)[
"layout"
]
=
EHTokLayout
;
(
*
KeywordMap
)[
"layout"
]
=
EHTokLayout
;
(
*
KeywordMap
)[
"globallycoherent"
]
=
EHTokGloballyCoherent
;
(
*
KeywordMap
)[
"globallycoherent"
]
=
EHTokGloballyCoherent
;
(
*
KeywordMap
)[
"inline"
]
=
EHTokInline
;
(
*
KeywordMap
)[
"point"
]
=
EHTokPoint
;
(
*
KeywordMap
)[
"point"
]
=
EHTokPoint
;
(
*
KeywordMap
)[
"line"
]
=
EHTokLine
;
(
*
KeywordMap
)[
"line"
]
=
EHTokLine
;
...
@@ -616,6 +617,7 @@ EHlslTokenClass HlslScanContext::tokenizeIdentifier()
...
@@ -616,6 +617,7 @@ EHlslTokenClass HlslScanContext::tokenizeIdentifier()
case
EHTokPrecise
:
case
EHTokPrecise
:
case
EHTokLayout
:
case
EHTokLayout
:
case
EHTokGloballyCoherent
:
case
EHTokGloballyCoherent
:
case
EHTokInline
:
return
keyword
;
return
keyword
;
// primitive types
// primitive types
...
...
hlsl/hlslTokens.h
View file @
36b218de
...
@@ -66,6 +66,7 @@ enum EHlslTokenClass {
...
@@ -66,6 +66,7 @@ enum EHlslTokenClass {
EHTokInOut
,
EHTokInOut
,
EHTokLayout
,
EHTokLayout
,
EHTokGloballyCoherent
,
EHTokGloballyCoherent
,
EHTokInline
,
// primitive types
// primitive types
EHTokPoint
,
EHTokPoint
,
...
...
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