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
523e20dc
Commit
523e20dc
authored
Mar 10, 2017
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PP: Recognize the '::' token, and translate appropriately to GLSL/HLSL token.
parent
6212e86f
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
26 additions
and
3 deletions
+26
-3
450.vert
Test/450.vert
+5
-0
450.vert.out
Test/baseResults/450.vert.out
+4
-1
revision.h
glslang/Include/revision.h
+2
-2
Scan.cpp
glslang/MachineIndependent/Scan.cpp
+4
-0
PpAtom.cpp
glslang/MachineIndependent/preprocessor/PpAtom.cpp
+2
-0
PpScanner.cpp
glslang/MachineIndependent/preprocessor/PpScanner.cpp
+6
-0
PpTokens.h
glslang/MachineIndependent/preprocessor/PpTokens.h
+2
-0
hlslTokens.h
hlsl/hlslTokens.h
+1
-0
No files found.
Test/450.vert
View file @
523e20dc
...
@@ -21,3 +21,8 @@ struct SA { float f[4]; };
...
@@ -21,3 +21,8 @@ struct SA { float f[4]; };
out
SA
outSA
;
out
SA
outSA
;
struct
SS
{
float
f
;
S
s
;
};
struct
SS
{
float
f
;
S
s
;
};
out
SS
outSS
;
out
SS
outSS
;
void
foo
()
{
SS
::
f
;
}
Test/baseResults/450.vert.out
View file @
523e20dc
...
@@ -2,7 +2,8 @@
...
@@ -2,7 +2,8 @@
Warning, version 450 is not yet complete; most version-specific features are present, but some are missing.
Warning, version 450 is not yet complete; most version-specific features are present, but some are missing.
ERROR: 0:12: 'out' : cannot be bool
ERROR: 0:12: 'out' : cannot be bool
ERROR: 0:13: 'sampler2D' : sampler/image types can only be used in uniform variables or function parameters: outo
ERROR: 0:13: 'sampler2D' : sampler/image types can only be used in uniform variables or function parameters: outo
ERROR: 2 compilation errors. No code generated.
ERROR: 0:27: '::' : not supported
ERROR: 3 compilation errors. No code generated.
Shader version: 450
Shader version: 450
...
@@ -20,6 +21,8 @@ ERROR: node is still EOpNull!
...
@@ -20,6 +21,8 @@ ERROR: node is still EOpNull!
0:9 2 (const int)
0:9 2 (const int)
0:9 Constant:
0:9 Constant:
0:9 4.500000
0:9 4.500000
0:25 Function Definition: foo( (global void)
0:25 Function Parameters:
0:? Linker Objects
0:? Linker Objects
0:? 'anon@0' (out block{out 3-element array of float CullDistance gl_CullDistance})
0:? 'anon@0' (out block{out 3-element array of float CullDistance gl_CullDistance})
0:? 'outb' (smooth out bool)
0:? 'outb' (smooth out bool)
...
...
glslang/Include/revision.h
View file @
523e20dc
...
@@ -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.189
2
"
#define GLSLANG_REVISION "Overload400-PrecQual.189
7
"
#define GLSLANG_DATE "
09
-Mar-2017"
#define GLSLANG_DATE "
10
-Mar-2017"
glslang/MachineIndependent/Scan.cpp
View file @
523e20dc
...
@@ -701,6 +701,10 @@ int TScanContext::tokenize(TPpContext* pp, TParserToken& token)
...
@@ -701,6 +701,10 @@ int TScanContext::tokenize(TPpContext* pp, TParserToken& token)
case
PpAtomDecrement
:
return
DEC_OP
;
case
PpAtomDecrement
:
return
DEC_OP
;
case
PpAtomIncrement
:
return
INC_OP
;
case
PpAtomIncrement
:
return
INC_OP
;
case
PpAtomColonColon
:
parseContext
.
error
(
loc
,
"not supported"
,
"::"
,
""
);
break
;
case
PpAtomConstInt
:
parserToken
->
sType
.
lex
.
i
=
ppToken
.
ival
;
return
INTCONSTANT
;
case
PpAtomConstInt
:
parserToken
->
sType
.
lex
.
i
=
ppToken
.
ival
;
return
INTCONSTANT
;
case
PpAtomConstUint
:
parserToken
->
sType
.
lex
.
i
=
ppToken
.
ival
;
return
UINTCONSTANT
;
case
PpAtomConstUint
:
parserToken
->
sType
.
lex
.
i
=
ppToken
.
ival
;
return
UINTCONSTANT
;
case
PpAtomConstInt64
:
parserToken
->
sType
.
lex
.
i64
=
ppToken
.
i64val
;
return
INT64CONSTANT
;
case
PpAtomConstInt64
:
parserToken
->
sType
.
lex
.
i64
=
ppToken
.
i64val
;
return
INT64CONSTANT
;
...
...
glslang/MachineIndependent/preprocessor/PpAtom.cpp
View file @
523e20dc
...
@@ -120,6 +120,8 @@ const struct {
...
@@ -120,6 +120,8 @@ const struct {
{
PpAtomDecrement
,
"--"
},
{
PpAtomDecrement
,
"--"
},
{
PpAtomIncrement
,
"++"
},
{
PpAtomIncrement
,
"++"
},
{
PpAtomColonColon
,
"::"
},
{
PpAtomDefine
,
"define"
},
{
PpAtomDefine
,
"define"
},
{
PpAtomUndef
,
"undef"
},
{
PpAtomUndef
,
"undef"
},
{
PpAtomIf
,
"if"
},
{
PpAtomIf
,
"if"
},
...
...
glslang/MachineIndependent/preprocessor/PpScanner.cpp
View file @
523e20dc
...
@@ -691,6 +691,12 @@ int TPpContext::tStringInput::scan(TPpToken* ppToken)
...
@@ -691,6 +691,12 @@ int TPpContext::tStringInput::scan(TPpToken* ppToken)
pp
->
parseContext
.
ppError
(
ppToken
->
loc
,
"End of line in string"
,
"string"
,
""
);
pp
->
parseContext
.
ppError
(
ppToken
->
loc
,
"End of line in string"
,
"string"
,
""
);
}
}
return
PpAtomConstString
;
return
PpAtomConstString
;
case
':'
:
ch
=
getch
();
if
(
ch
==
':'
)
return
PpAtomColonColon
;
ungetch
();
return
':'
;
}
}
ch
=
getch
();
ch
=
getch
();
...
...
glslang/MachineIndependent/preprocessor/PpTokens.h
View file @
523e20dc
...
@@ -117,6 +117,8 @@ enum EFixedAtoms {
...
@@ -117,6 +117,8 @@ enum EFixedAtoms {
PpAtomDecrement
,
PpAtomDecrement
,
PpAtomIncrement
,
PpAtomIncrement
,
PpAtomColonColon
,
PpAtomPaste
,
PpAtomPaste
,
// Constants
// Constants
...
...
hlsl/hlslTokens.h
View file @
523e20dc
...
@@ -328,6 +328,7 @@ enum EHlslTokenClass {
...
@@ -328,6 +328,7 @@ enum EHlslTokenClass {
EHTokDot
,
EHTokDot
,
EHTokComma
,
EHTokComma
,
EHTokColon
,
EHTokColon
,
EHTokColonColon
,
EHTokSemicolon
,
EHTokSemicolon
,
EHTokBang
,
EHTokBang
,
EHTokDash
,
EHTokDash
,
...
...
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