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
60a7f3f7
Commit
60a7f3f7
authored
Jan 18, 2016
by
John Kessenich
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:KhronosGroup/glslang
parents
28ad350b
5996961b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
0 deletions
+9
-0
StandAlone.cpp
StandAlone/StandAlone.cpp
+9
-0
No files found.
StandAlone/StandAlone.cpp
View file @
60a7f3f7
...
@@ -435,6 +435,8 @@ void ProcessConfigFile()
...
@@ -435,6 +435,8 @@ void ProcessConfigFile()
}
}
if
(
configStrings
)
if
(
configStrings
)
FreeFileData
(
configStrings
);
FreeFileData
(
configStrings
);
else
delete
[]
config
;
}
}
// thread-safe list of shaders to asynchronously grab and compile
// thread-safe list of shaders to asynchronously grab and compile
...
@@ -863,6 +865,11 @@ int C_DECL main(int argc, char* argv[])
...
@@ -863,6 +865,11 @@ int C_DECL main(int argc, char* argv[])
glslang
::
InitializeProcess
();
glslang
::
InitializeProcess
();
CompileAndLinkShaderFiles
();
CompileAndLinkShaderFiles
();
glslang
::
FinalizeProcess
();
glslang
::
FinalizeProcess
();
for
(
int
w
=
0
;
w
<
NumWorkItems
;
++
w
)
{
if
(
Work
[
w
])
{
delete
Work
[
w
];
}
}
}
else
{
}
else
{
ShInitialize
();
ShInitialize
();
...
@@ -895,6 +902,8 @@ int C_DECL main(int argc, char* argv[])
...
@@ -895,6 +902,8 @@ int C_DECL main(int argc, char* argv[])
ShFinalize
();
ShFinalize
();
}
}
delete
[]
Work
;
if
(
CompileFailed
)
if
(
CompileFailed
)
return
EFailCompile
;
return
EFailCompile
;
if
(
LinkFailed
)
if
(
LinkFailed
)
...
...
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