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
65d538c8
Commit
65d538c8
authored
Jan 11, 2017
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Infrastructure: Protect against missing built-in symbol table generators.
parent
ce80197c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
+11
-4
revision.h
glslang/Include/revision.h
+2
-2
ShaderLang.cpp
glslang/MachineIndependent/ShaderLang.cpp
+9
-2
No files found.
glslang/Include/revision.h
View file @
65d538c8
...
@@ -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.175
0
"
#define GLSLANG_REVISION "Overload400-PrecQual.175
9
"
#define GLSLANG_DATE "
06
-Jan-2017"
#define GLSLANG_DATE "
11
-Jan-2017"
glslang/MachineIndependent/ShaderLang.cpp
View file @
65d538c8
...
@@ -296,6 +296,9 @@ bool InitializeSymbolTables(TInfoSink& infoSink, TSymbolTable** commonTable, TS
...
@@ -296,6 +296,9 @@ bool InitializeSymbolTables(TInfoSink& infoSink, TSymbolTable** commonTable, TS
{
{
std
::
unique_ptr
<
TBuiltInParseables
>
builtInParseables
(
CreateBuiltInParseables
(
infoSink
,
source
));
std
::
unique_ptr
<
TBuiltInParseables
>
builtInParseables
(
CreateBuiltInParseables
(
infoSink
,
source
));
if
(
builtInParseables
==
nullptr
)
return
false
;
builtInParseables
->
initialize
(
version
,
profile
,
spvVersion
);
builtInParseables
->
initialize
(
version
,
profile
,
spvVersion
);
// do the common tables
// do the common tables
...
@@ -342,6 +345,9 @@ bool AddContextSpecificSymbols(const TBuiltInResource* resources, TInfoSink& inf
...
@@ -342,6 +345,9 @@ bool AddContextSpecificSymbols(const TBuiltInResource* resources, TInfoSink& inf
{
{
std
::
unique_ptr
<
TBuiltInParseables
>
builtInParseables
(
CreateBuiltInParseables
(
infoSink
,
source
));
std
::
unique_ptr
<
TBuiltInParseables
>
builtInParseables
(
CreateBuiltInParseables
(
infoSink
,
source
));
if
(
builtInParseables
==
nullptr
)
return
false
;
builtInParseables
->
initialize
(
*
resources
,
version
,
profile
,
spvVersion
,
language
);
builtInParseables
->
initialize
(
*
resources
,
version
,
profile
,
spvVersion
,
language
);
InitializeSymbolTable
(
builtInParseables
->
getCommonString
(),
version
,
profile
,
spvVersion
,
language
,
source
,
infoSink
,
symbolTable
);
InitializeSymbolTable
(
builtInParseables
->
getCommonString
(),
version
,
profile
,
spvVersion
,
language
,
source
,
infoSink
,
symbolTable
);
builtInParseables
->
identifyBuiltIns
(
version
,
profile
,
spvVersion
,
language
,
symbolTable
,
*
resources
);
builtInParseables
->
identifyBuiltIns
(
version
,
profile
,
spvVersion
,
language
,
symbolTable
,
*
resources
);
...
@@ -736,8 +742,9 @@ bool ProcessDeferred(
...
@@ -736,8 +742,9 @@ bool ProcessDeferred(
// Add built-in symbols that are potentially context dependent;
// Add built-in symbols that are potentially context dependent;
// they get popped again further down.
// they get popped again further down.
AddContextSpecificSymbols
(
resources
,
compiler
->
infoSink
,
symbolTable
,
version
,
profile
,
spvVersion
,
if
(
!
AddContextSpecificSymbols
(
resources
,
compiler
->
infoSink
,
symbolTable
,
version
,
profile
,
spvVersion
,
compiler
->
getLanguage
(),
source
);
compiler
->
getLanguage
(),
source
))
return
false
;
//
//
// Now we can process the full shader under proper symbols and rules.
// Now we can process the full shader under proper symbols and rules.
...
...
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