From d15e1226cceb448508c15cb475013deb085d492f Mon Sep 17 00:00:00 2001
From: Andres Gomez <agomez@igalia.com>
Date: Wed, 1 Jul 2020 23:45:08 +0300
Subject: [PATCH] gitlab-ci: build gfxreconstruct from the "dev" branch

We want to use the fix for
https://github.com/LunarG/gfxreconstruct/issues/328 while it is yet
not available in the "master" branch.

Additionally, we get the gfxreconstruct-info tool as an extra.

Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5890>
---
 .gitlab-ci.yml                      |  2 +-
 .gitlab-ci/build-gfxreconstruct.sh  | 10 ++++++----
 .gitlab-ci/container/x86_test-vk.sh |  8 +++++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6ffe2bee5ed..2dbcb4923e4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -299,7 +299,7 @@ x86_test-gl:
 x86_test-vk:
   extends: .use-x86_test-base
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-07-21-tracie"
+    FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-07-21-gfxreconstruct-dev"
 
 # Debian 9 based x86 build image (old LLVM)
 x86_build_old:
diff --git a/.gitlab-ci/build-gfxreconstruct.sh b/.gitlab-ci/build-gfxreconstruct.sh
index c08959b8a20..3f450184d40 100644
--- a/.gitlab-ci/build-gfxreconstruct.sh
+++ b/.gitlab-ci/build-gfxreconstruct.sh
@@ -2,18 +2,20 @@
 
 set -ex
 
-# https://github.com/LunarG/gfxreconstruct/issues/328
-GFXRECONSTRUCT_VERSION=b66cd392a84b226cb60ad9d4130ddeb58a1559cb
+GFXRECONSTRUCT_VERSION=57c588c04af631d1d6d381a48e2b9283f9d9d528
 
-git clone https://github.com/LunarG/gfxreconstruct.git --single-branch --no-checkout /gfxreconstruct
+# Using the "dev" branch by now because it solves a crash and will allow us to
+# use the gfxreconstruct-info tool
+git clone https://github.com/LunarG/gfxreconstruct.git --single-branch -b dev --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 gfxrecon-replay
+ninja -C _build gfxrecon-replay gfxrecon-info
 mkdir -p build/bin
 install _build/tools/replay/gfxrecon-replay build/bin
+install _build/tools/info/gfxrecon-info build/bin
 strip build/bin/*
 find . -not -path './build' -not -path './build/*' -delete
 popd
diff --git a/.gitlab-ci/container/x86_test-vk.sh b/.gitlab-ci/container/x86_test-vk.sh
index 4f8f306ee9f..c3228071015 100644
--- a/.gitlab-ci/container/x86_test-vk.sh
+++ b/.gitlab-ci/container/x86_test-vk.sh
@@ -16,10 +16,10 @@ STABLE_EPHEMERAL=" \
       libpng-dev \
       libvulkan-dev \
       libxcb-ewmh-dev \
-      libxcb-keysyms1-dev \
       libxkbcommon-dev \
       libxrandr-dev \
       libxrender-dev \
+      libzstd-dev \
       meson \
       p7zip \
       pkg-config \
@@ -27,7 +27,13 @@ STABLE_EPHEMERAL=" \
       wget \
       "
 
+# Unfortunately, gfxreconstruct needs the -dev packages:
+# https://github.com/LunarG/gfxreconstruct/issues/402
 apt-get install -y --no-remove \
+      libwayland-dev \
+      libx11-xcb-dev \
+      libxcb-keysyms1-dev \
+      libxcb1-dev \
       $STABLE_EPHEMERAL
 
 # We need multiarch for Wine
-- 
2.30.2