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
61d7d7ad
Commit
61d7d7ad
authored
Aug 02, 2015
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revisioning: Include GLSL.std.450 version. Also, the revision.h script now…
Revisioning: Include GLSL.std.450 version. Also, the revision.h script now includes redirection to revision.h.
parent
0da9eaab
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
GLSL450Lib.h
SPIRV/GLSL450Lib.h
+3
-0
StandAlone.cpp
StandAlone/StandAlone.cpp
+1
-0
revision.h
glslang/Include/revision.h
+2
-2
make-revision
make-revision
+2
-1
No files found.
SPIRV/GLSL450Lib.h
View file @
61d7d7ad
...
@@ -27,6 +27,9 @@
...
@@ -27,6 +27,9 @@
namespace
GLSL_STD_450
{
namespace
GLSL_STD_450
{
const
int
Version
=
99
;
const
int
Revision
=
1
;
enum
Entrypoints
{
enum
Entrypoints
{
Round
=
0
,
Round
=
0
,
RoundEven
=
1
,
RoundEven
=
1
,
...
...
StandAlone/StandAlone.cpp
View file @
61d7d7ad
...
@@ -790,6 +790,7 @@ int C_DECL main(int argc, char* argv[])
...
@@ -790,6 +790,7 @@ int C_DECL main(int argc, char* argv[])
std
::
string
spirvVersion
;
std
::
string
spirvVersion
;
glslang
::
GetSpirvVersion
(
spirvVersion
);
glslang
::
GetSpirvVersion
(
spirvVersion
);
printf
(
"SPIR-V Version %s
\n
"
,
spirvVersion
.
c_str
());
printf
(
"SPIR-V Version %s
\n
"
,
spirvVersion
.
c_str
());
printf
(
"GLSL.std.450 Version %d, Revision %d
\n
"
,
GLSL_STD_450
::
Version
,
GLSL_STD_450
::
Revision
);
if
(
Worklist
.
empty
())
if
(
Worklist
.
empty
())
return
ESuccess
;
return
ESuccess
;
}
}
...
...
glslang/Include/revision.h
View file @
61d7d7ad
...
@@ -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 "2.
1.686
"
#define GLSLANG_REVISION "2.
2.687
"
#define GLSLANG_DATE "0
2
-Aug-2015"
#define GLSLANG_DATE "0
3
-Aug-2015"
make-revision
View file @
61d7d7ad
#!/bin/sh
#!/bin/sh
(
echo
"// This header is generated by the make-revision script."
echo
"// This header is generated by the make-revision script."
echo
"// For the version, it uses the latest git tag followed by the number of commits."
echo
"// For the version, it uses the latest git tag followed by the number of commits."
echo
"// For the date, it uses the current date (when then script is run)."
echo
"// For the date, it uses the current date (when then script is run)."
...
@@ -7,3 +7,4 @@ echo "// For the date, it uses the current date (when then script is run)."
...
@@ -7,3 +7,4 @@ echo "// For the date, it uses the current date (when then script is run)."
echo
echo
echo
\#
define GLSLANG_REVISION
\"
`
git describe
--tags
--abbrev
=
0
`
.
`
git log
--oneline
|
wc
-l
`
\"
echo
\#
define GLSLANG_REVISION
\"
`
git describe
--tags
--abbrev
=
0
`
.
`
git log
--oneline
|
wc
-l
`
\"
echo
\#
define GLSLANG_DATE
\"
`
date
+%d-%b-%Y
`
\"
echo
\#
define GLSLANG_DATE
\"
`
date
+%d-%b-%Y
`
\"
)
>
glslang/Include/revision.h
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