aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Fischer <greg@lunarg.com>2015-10-08 17:53:48 -0600
committerGreg Fischer <greg@lunarg.com>2015-10-08 17:53:48 -0600
commitc8ab86c230ebf0cf6bbc8294c2e466e73fc6484d (patch)
treed2e7c5e2a214735997cf3f7976de3e8d29d9a6c0
parent2550066d27ae52a62cd433f5e4d10b3de6a24cb8 (diff)
downloadusermoji-c8ab86c230ebf0cf6bbc8294c2e466e73fc6484d.tar.xz
update_external_sources: move up to latest glslang
Also remove a few redundant redundancies.
-rw-r--r--glslang_revision2
-rwxr-xr-xupdate_external_sources.bat4
2 files changed, 2 insertions, 4 deletions
diff --git a/glslang_revision b/glslang_revision
index fdd226ac..a1a947be 100644
--- a/glslang_revision
+++ b/glslang_revision
@@ -1 +1 @@
-c833e3fa03ed2bcdbc3cca12e748cfef30996a5e
+4ec329
diff --git a/update_external_sources.bat b/update_external_sources.bat
index 2586875f..dd444691 100755
--- a/update_external_sources.bat
+++ b/update_external_sources.bat
@@ -257,8 +257,6 @@ REM // ======== Functions ======== //
mkdir %GLSLANG_DIR%
cd %GLSLANG_DIR%
git clone git@gitlab.khronos.org:GLSL/glslang.git .
- git branch --track Rev32 origin/Rev32
- git checkout Rev32
git checkout %GLSLANG_REVISION%
if not exist %GLSLANG_DIR%\SPIRV (
echo glslang source download failed!
@@ -270,7 +268,7 @@ goto:eof
echo.
echo Updating %GLSLANG_DIR%
cd %GLSLANG_DIR%
- git checkout Rev32
+ git fetch --all
git checkout %GLSLANG_REVISION%
goto:eof