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
78388726
Commit
78388726
authored
Mar 08, 2017
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
HLSL: Non-functional: Don't process function name/parameters before expected a…
HLSL: Non-functional: Don't process function name/parameters before expected a function declaration.
parent
b7201f8e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
8 deletions
+14
-8
revision.h
glslang/Include/revision.h
+2
-2
hlslGrammar.cpp
hlsl/hlslGrammar.cpp
+12
-6
No files found.
glslang/Include/revision.h
View file @
78388726
...
...
@@ -2,5 +2,5 @@
// 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).
#define GLSLANG_REVISION "Overload400-PrecQual.188
2
"
#define GLSLANG_DATE "0
7
-Mar-2017"
#define GLSLANG_REVISION "Overload400-PrecQual.188
5
"
#define GLSLANG_DATE "0
8
-Mar-2017"
hlsl/hlslGrammar.cpp
View file @
78388726
...
...
@@ -326,14 +326,20 @@ bool HlslGrammar::acceptDeclaration(TIntermNode*& nodeList)
HlslToken
idToken
;
TIntermAggregate
*
initializers
=
nullptr
;
while
(
acceptIdentifier
(
idToken
))
{
TString
*
fnName
=
idToken
.
string
;
if
(
peekTokenClass
(
EHTokLeftParen
))
{
// looks like function parameters
TString
*
fnName
=
idToken
.
string
;
// Potentially rename shader entry point function. No-op most of the time.
parseContext
.
renameShaderFunction
(
fnName
);
// Potentially rename shader entry point function. No-op most of the time.
parseContext
.
renameShaderFunction
(
fnName
);
// function_parameters
TFunction
&
function
=
*
new
TFunction
(
fnName
,
declaredType
);
if
(
!
acceptFunctionParameters
(
function
))
{
expected
(
"function parameter list"
);
return
false
;
}
// function_parameters
TFunction
&
function
=
*
new
TFunction
(
fnName
,
declaredType
);
if
(
acceptFunctionParameters
(
function
))
{
// post_decls
acceptPostDecls
(
function
.
getWritableType
().
getQualifier
());
...
...
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