mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revisioning: Include GLSL.std.450 version. Also, the revision.h script now includes redirection to revision.h.

Browse Source
This commit is contained in:
John Kessenich 2015-08-02 16:11:21 -06:00
parent 0da9eaabe8
commit 61d7d7ad73
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SPIRV/GLSL450Lib.h
View File

@ -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,

1
StandAlone/StandAlone.cpp
View File

@ -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;
} }

4
glslang/Include/revision.h
View File

@ -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 "02-Aug-2015" #define GLSLANG_DATE "03-Aug-2015"

3
make-revision
View File

@ -1,5 +1,5 @@
#!/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)."
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