diff options
| author | Cody Northrop <cody@lunarg.com> | 2015-07-08 09:53:03 -0600 |
|---|---|---|
| committer | Cody Northrop <cody@lunarg.com> | 2015-07-08 16:04:39 -0600 |
| commit | f86fb15498be67c058d73cc191f6a6053aec71e1 (patch) | |
| tree | 6b699ffe13d6dd1b1043e480b7d2039e82a022bd | |
| parent | bde1283be7e9f4d8fcddb17fe75cf11652168e04 (diff) | |
| download | usermoji-f86fb15498be67c058d73cc191f6a6053aec71e1.tar.xz | |
toolchain: Update to latest glslang and LunarGLASS, fix script
glslang hash: e6f7988adec197e0590fb8274b0412811456d3e6
LunarGLASS revision: 1093
Also, ensure update_external_sources.* fetches the repo before
checking out the hash.
| -rw-r--r-- | LunarGLASS_revision | 2 | ||||
| -rw-r--r-- | glslang_revision | 2 | ||||
| -rwxr-xr-x | update_external_sources.bat | 1 | ||||
| -rwxr-xr-x | update_external_sources.sh | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/LunarGLASS_revision b/LunarGLASS_revision index 97938e6e..113c4d24 100644 --- a/LunarGLASS_revision +++ b/LunarGLASS_revision @@ -1 +1 @@ -1091 +1093 diff --git a/glslang_revision b/glslang_revision index 33b51a02..565eaa46 100644 --- a/glslang_revision +++ b/glslang_revision @@ -1 +1 @@ -9e41f362a6ee3118b61f076ee156125b59b3a005 +e6f7988adec197e0590fb8274b0412811456d3e6 diff --git a/update_external_sources.bat b/update_external_sources.bat index e4bb4546..81b29e18 100755 --- a/update_external_sources.bat +++ b/update_external_sources.bat @@ -262,6 +262,7 @@ goto:eof echo.
echo Updating %GLSLANG_DIR%
cd %GLSLANG_DIR%
+ git fetch --all
git checkout %GLSLANG_REVISION%
goto:eof
diff --git a/update_external_sources.sh b/update_external_sources.sh index 5f145f7b..6ffaf5ee 100755 --- a/update_external_sources.sh +++ b/update_external_sources.sh @@ -23,6 +23,7 @@ function create_glslang () { function update_glslang () { echo "Updating $BASEDIR/glslang" cd $BASEDIR/glslang + git fetch --all git checkout $GLSLANG_REVISION } |