diff options
| author | GregF <greg@LunarG.com> | 2015-10-02 13:11:01 -0600 |
|---|---|---|
| committer | GregF <greg@LunarG.com> | 2015-10-02 13:12:51 -0600 |
| commit | 72c558551c954efaf0fda73575e70626ca1af352 (patch) | |
| tree | 713114c84d824ac8858ff8b6fc679cb1d808d236 | |
| parent | 9ab0c71acff42e898e303b84bc9d451c50f97746 (diff) | |
| download | usermoji-72c558551c954efaf0fda73575e70626ca1af352.tar.xz | |
update_external_sources: get glslang from gitlab
This is the new way to get SPIR-V rev32 source.
| -rw-r--r-- | glslang_revision | 2 | ||||
| -rwxr-xr-x | update_external_sources.sh | 19 |
2 files changed, 8 insertions, 13 deletions
diff --git a/glslang_revision b/glslang_revision index 9b004730..fdd226ac 100644 --- a/glslang_revision +++ b/glslang_revision @@ -1 +1 @@ -142d7780a4d9e57e127bc8808a10c3093756da0f +c833e3fa03ed2bcdbc3cca12e748cfef30996a5e diff --git a/update_external_sources.sh b/update_external_sources.sh index 56713377..cade2b6d 100755 --- a/update_external_sources.sh +++ b/update_external_sources.sh @@ -21,24 +21,19 @@ function create_glslang () { echo "Creating local glslang repository ($BASEDIR/glslang)." mkdir -p $BASEDIR/glslang cd $BASEDIR/glslang - git clone https://github.com/KhronosGroup/glslang.git . - git checkout $GLSLANG_REVISION - svn checkout --force https://cvs.khronos.org/svn/repos/SPIRV/trunk/glslang/ . - svn update -r $GLSLANG_REVISION_R32 - svn revert -R . + git clone git@gitlab.khronos.org:GLSL/glslang.git . + git branch --track Rev32 origin/Rev32 + git checkout Rev32 + # git checkout $GLSLANG_REVISION } function update_glslang () { echo "Updating $BASEDIR/glslang" cd $BASEDIR/glslang git fetch --all + git checkout Rev32 git checkout -f . - git checkout $GLSLANG_REVISION - if [ ! -d "$BASEDIR/glslang/.svn" ]; then - svn checkout --force https://cvs.khronos.org/svn/repos/SPIRV/trunk/glslang/ . - fi - svn update -r $GLSLANG_REVISION_R32 - svn revert -R . + # git checkout $GLSLANG_REVISION } function create_LunarGLASS () { @@ -106,7 +101,7 @@ function build_LunarGLASS () { make install } -if [ ! -d "$BASEDIR/glslang" -o ! -d "$BASEDIR/glslang/.git" ]; then +if [ ! -d "$BASEDIR/glslang" -o ! -d "$BASEDIR/glslang/.git" -o -d "$BASEDIR/glslang/.svn" ]; then create_glslang fi if [ ! -d "$BASEDIR/LunarGLASS" -o ! -d "$BASEDIR/LunarGLASS/.git" ]; then |