ci: Install librenderdoc from Debian bullseye

Debian bullseye has a separate command-line-only renderdoc package, so
no need to install Qt packages and build renderdoc anymore.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3125
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9833>

8 files changed, 5 insertions, 54 deletions

diff --git a/.gitlab-ci/container/build-renderdoc.sh b/.gitlab-ci/container/build-renderdoc.sh
deleted file mode 100644
index b44fb302011..00000000000
--- a/.gitlab-ci/container/build-renderdoc.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-RENDERDOC_VERSION=da02e88201dc3b64316fc33ce6ff69cc729689aa
-
-git clone https://github.com/baldurk/renderdoc.git --single-branch --no-checkout /renderdoc
-pushd /renderdoc
-git checkout "$RENDERDOC_VERSION"
-cmake -S . -B _build -G Ninja -DENABLE_QRENDERDOC=false -DCMAKE_BUILD_TYPE=Release $EXTRA_CMAKE_ARGS
-ninja -C _build
-mkdir -p build/lib
-${STRIP_CMD:-strip} _build/lib/*.so
-cp _build/lib/renderdoc.so build/lib
-cp _build/lib/librenderdoc.so build/lib
-find . -not -path './build' -not -path './build/*' -delete
-popd
diff --git a/.gitlab-ci/container/container_pre_build.sh b/.gitlab-ci/container/container_pre_build.sh
index 59c889421bc..43cadc739b8 100755
--- a/.gitlab-ci/container/container_pre_build.sh
+++ b/.gitlab-ci/container/container_pre_build.sh
@@ -8,7 +8,6 @@ export CCACHE_DIR=/cache/mesa/ccache
 export PATH=/usr/lib/ccache:$PATH
 
 # CMake ignores $PATH, so we have to force CC/GCC to the ccache versions.
-# Watch out, you can't have spaces in here because the renderdoc build fails.
 export CC="/usr/lib/ccache/gcc"
 export CXX="/usr/lib/ccache/g++"
 
diff --git a/.gitlab-ci/container/create-rootfs.sh b/.gitlab-ci/container/create-rootfs.sh
index 5fb7f1a092d..783bb5fdf90 100644
--- a/.gitlab-ci/container/create-rootfs.sh
+++ b/.gitlab-ci/container/create-rootfs.sh
@@ -57,6 +57,7 @@ apt-get -y install --no-install-recommends \
     python3-numpy \
     python3-packaging \
     python3-pil \
+    python3-renderdoc \
     python3-requests \
     python3-simplejson \
     python3-yaml \
diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index 079321181cd..6bee014131d 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -73,48 +73,36 @@ apt-get install -y --no-remove \
                    cmake \
                    debootstrap \
                    git \
-                   libboost-dev \
                    libegl1-mesa-dev \
                    libgbm-dev \
                    libgles2-mesa-dev \
-                   libpcre3-dev \
-                   libpython3-dev \
                    libssl-dev \
                    libudev-dev \
                    libvulkan-dev \
                    libwaffle-dev \
                    libwayland-dev \
                    libx11-xcb-dev \
-                   libxcb-keysyms1-dev \
                    libxkbcommon-dev \
                    patch \
-                   python3-dev \
                    python3-distutils \
                    python3-mako \
                    python3-numpy \
                    python3-serial \
-                   qt5-qmake \
-                   qtbase5-dev \
                    wget
 
 
 if [[ "$DEBIAN_ARCH" = "armhf" ]]; then
     apt-get install -y --no-remove \
-                       libboost-dev:armhf \
                        libegl1-mesa-dev:armhf \
                        libelf-dev:armhf \
                        libgbm-dev:armhf \
                        libgles2-mesa-dev:armhf \
-                       libpcre3-dev:armhf \
-                       libpython3-dev:armhf \
                        libudev-dev:armhf \
                        libvulkan-dev:armhf \
                        libwaffle-dev:armhf \
                        libwayland-dev:armhf \
                        libx11-xcb-dev:armhf \
-                       libxcb-keysyms1-dev:armhf \
-                       libxkbcommon-dev:armhf \
-                       qtbase5-dev:armhf
+                       libxkbcommon-dev:armhf
 fi
 
 
@@ -141,14 +129,6 @@ mv /deqp /lava-files/rootfs-${DEBIAN_ARCH}/.
 mv /piglit /lava-files/rootfs-${DEBIAN_ARCH}/.
 
 
-############### Build renderdoc
-EXTRA_CMAKE_ARGS+=" -DENABLE_XCB=false"
-. .gitlab-ci/container/build-renderdoc.sh
-mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/renderdoc
-mv /renderdoc/build /lava-files/rootfs-${DEBIAN_ARCH}/renderdoc
-rm -rf /renderdoc
-
-
 ############### Build libdrm
 EXTRA_MESON_ARGS+=" -D prefix=/libdrm"
 . .gitlab-ci/container/build-libdrm.sh
diff --git a/.gitlab-ci/container/x86_test-base.sh b/.gitlab-ci/container/x86_test-base.sh
index d0c3f1a05f4..0f0f8a630e5 100644
--- a/.gitlab-ci/container/x86_test-base.sh
+++ b/.gitlab-ci/container/x86_test-base.sh
@@ -29,14 +29,12 @@ apt-get install -y --no-remove \
       libllvm11 \
       libllvm9 \
       liblz4-1 \
-      libpcre32-3 \
       libpng16-16 \
       libpython3.9 \
       libvulkan1 \
       libwayland-client0 \
       libwayland-server0 \
       libxcb-ewmh2 \
-      libxcb-keysyms1 \
       libxcb-randr0 \
       libxcb-xfixes0 \
       libxkbcommon0 \
@@ -50,8 +48,6 @@ apt-get install -y --no-remove \
       python3-requests \
       python3-six \
       python3-yaml \
-      qtbase5-dev \
-      qt5-qmake \
       vulkan-tools \
       waffle-utils \
       xauth \
diff --git a/.gitlab-ci/container/x86_test-gl.sh b/.gitlab-ci/container/x86_test-gl.sh
index 4149a82eee0..f92b3099c02 100644
--- a/.gitlab-ci/container/x86_test-gl.sh
+++ b/.gitlab-ci/container/x86_test-gl.sh
@@ -16,14 +16,12 @@ STABLE_EPHEMERAL=" \
       libclang-cpp11-dev \
       libgbm-dev \
       libgles2-mesa-dev \
-      libpcre3-dev \
       libpciaccess-dev \
       libudev-dev \
       libvulkan-dev \
       libwaffle-dev \
       libwayland-dev \
       libx11-xcb-dev \
-      libxcb-keysyms1-dev \
       libxkbcommon-dev \
       libxrender-dev \
       llvm-11-dev \
@@ -33,7 +31,6 @@ STABLE_EPHEMERAL=" \
       patch \
       pkg-config \
       python3-distutils \
-      python3-dev \
       wget \
       xz-utils \
       "
@@ -44,9 +41,11 @@ apt-get install -y --no-remove \
       clinfo \
       libclang-common-11-dev \
       libclang-cpp11 \
+      libegl1 \
       libxcb-shm0 \
       ocl-icd-libopencl1 \
       python3-lxml \
+      python3-renderdoc \
       python3-simplejson
 
 
@@ -82,9 +81,6 @@ rm -rf /root/.rustup /root/.cargo
 
 DEQP_TARGET=surfaceless . .gitlab-ci/container/build-deqp.sh
 
-############### Build renderdoc
-
-. .gitlab-ci/container/build-renderdoc.sh
 
 ############### Uninstall the build software
 
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index b6f9283804f..9e537831ceb 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -14,7 +14,7 @@
   variables:
     KERNEL_URL: "https://gitlab.freedesktop.org/tomeu/linux/-/archive/v5.10-rc2-for-mesa-ci/linux-v5.10-rc2-for-mesa-ci.tar.gz"
     INSTALL_KERNEL_MODULES: 1
-    MESA_ROOTFS_TAG: &lava-rootfs "2021-04-14-bullseye"
+    MESA_ROOTFS_TAG: &lava-rootfs "2021-04-14-librenderdoc"
     MINIO_SUFFIX: "lava"
     PIGLIT_BUILD_TARGETS: "piglit_replayer"
 
diff --git a/.gitlab-ci/piglit/run.sh b/.gitlab-ci/piglit/run.sh
index a7b49a91d21..116f363d07d 100755
--- a/.gitlab-ci/piglit/run.sh
+++ b/.gitlab-ci/piglit/run.sh
@@ -57,10 +57,6 @@ else
     ### GL/ES ###
 
     if [ "x$PIGLIT_PROFILES" = "xreplay" ]; then
-        # Set environment for renderdoc libraries.
-        export PYTHONPATH="$PYTHONPATH:/renderdoc/build/lib"
-        export __LD_LIBRARY_PATH="$__LD_LIBRARY_PATH:/renderdoc/build/lib"
-
         # Set environment for apitrace executable.
         export PATH="/apitrace/build:$PATH"