gitlab-ci: add the vulkan overlay layer to the vulkan build

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>

[ Michel Dänzer: Take changes affecting the docker image from !299,
  plus remove the unzip package again before generating the image ]
This commit is contained in:
Eric Engestrom 2019-05-08 18:08:11 +02:00 committed by Michel Dänzer
parent fcf75534ec
commit c6306125b5
1 changed files with 9 additions and 0 deletions

View File

@ -10,6 +10,7 @@ apt-get install -y \
ca-certificates \
curl \
wget \
unzip \
gnupg \
software-properties-common
@ -77,6 +78,13 @@ apt-get install -y \
# for 64bit windows cross-builds
apt-get install -y mingw-w64
# for the vulkan overlay layer
wget https://github.com/KhronosGroup/glslang/releases/download/master-tot/glslang-master-linux-Release.zip
unzip glslang-master-linux-Release.zip bin/glslangValidator
install -m755 bin/glslangValidator /usr/local/bin/
rm bin/glslangValidator glslang-master-linux-Release.zip
# dependencies where we want a specific version
export XORG_RELEASES=https://xorg.freedesktop.org/releases/individual
export XCB_RELEASES=https://xcb.freedesktop.org/dist
@ -179,6 +187,7 @@ apt-get purge -y \
libtool \
make \
curl \
unzip \
wget \
gnupg \
software-properties-common