gitlab-ci: build gfxreconstruct into the Vulkan testing container

In preparation for having automated testing with Vulkan traces.

Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
This commit is contained in:
Andres Gomez
2020-02-20 14:18:54 +02:00
committed by Andres Gomez
parent fc2338dc44
commit 028ab482bf
3 changed files with 27 additions and 1 deletions

View File

@@ -131,7 +131,7 @@ x86_test-gl:
x86_test-vk:
extends: x86_build
variables:
DEBIAN_TAG: &x86_test-vk "2020-02-01"
DEBIAN_TAG: &x86_test-vk "2020-02-02"
# Can only be triggered manually on personal branches because RADV is the only
# driver that does Vulkan testing at the moment.
rules:

View File

@@ -0,0 +1,19 @@
#!/bin/bash
set -ex
# https://github.com/LunarG/gfxreconstruct/issues/328
GFXRECONSTRUCT_VERSION=b66cd392a84b226cb60ad9d4130ddeb58a1559cb
git clone https://github.com/LunarG/gfxreconstruct.git --single-branch --no-checkout /gfxreconstruct
pushd /gfxreconstruct
git checkout "$GFXRECONSTRUCT_VERSION"
git submodule update --init
git submodule update
cmake -G Ninja -B_build -H. -DCMAKE_BUILD_TYPE=Release
ninja -C _build -j4 gfxrecon-replay
mkdir -p build/bin
install _build/tools/replay/gfxrecon-replay build/bin
strip build/bin/*
find . -not -path './build' -not -path './build/*' -delete
popd

View File

@@ -35,10 +35,13 @@ apt-get install -y --no-remove \
libexpat1 \
libgbm-dev \
libgles2-mesa-dev \
liblz4-1 \
liblz4-dev \
libpng16-16 \
libpng-dev \
libvulkan1 \
libvulkan-dev \
libwayland-client0 \
libwayland-server0 \
libxcb-randr0 \
libxcb-xfixes0 \
@@ -64,6 +67,9 @@ apt-get install -y --no-remove \
. .gitlab-ci/build-deqp-vk.sh
############### Build gfxreconstruct
. .gitlab-ci/build-gfxreconstruct.sh
############### Uninstall the build software
@@ -75,6 +81,7 @@ apt-get purge -y \
gnupg \
libgbm-dev \
libgles2-mesa-dev \
liblz4-dev \
libpng-dev \
libvulkan-dev \
libxkbcommon-dev \