diff options
| author | Tomeu Vizoso <[email protected]> | 2020-03-06 10:09:58 +0100 |
|---|---|---|
| committer | Tomeu Vizoso <[email protected]> | 2020-03-17 07:12:36 +0100 |
| commit | 43873afda4f8faa2b31a2f130fab52fbc24d490f (patch) | |
| tree | 51890a29b616f82636275233e9aca8d1955a2607 /.gitlab-ci/build-apitrace.sh | |
| parent | 2ca662fb61269e3e3d36f8aab5939bc9dce14b4a (diff) | |
gitlab-ci: Use surfaceless platform also for apitrace
In preparation for using apitrace to replay traces in LAVA jobs, build a
newer waffle so apitrace can use the surfaceless EGL platform.
As things were before this commit, Xvfb would have been needed in the
LAVA images.
Signed-off-by: Tomeu Vizoso <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4000>
Diffstat (limited to '.gitlab-ci/build-apitrace.sh')
| -rw-r--r-- | .gitlab-ci/build-apitrace.sh | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/.gitlab-ci/build-apitrace.sh b/.gitlab-ci/build-apitrace.sh index 785a5ae52e7..0361886e7a4 100644 --- a/.gitlab-ci/build-apitrace.sh +++ b/.gitlab-ci/build-apitrace.sh @@ -2,12 +2,24 @@ set -ex +# Need an unreleased version of Waffle for surfaceless support in apitrace +# Replace this build with the Debian package once that's possible + +WAFFLE_VERSION="e3c995d9a2693b687501715b6550619922346089" +git clone https://gitlab.freedesktop.org/mesa/waffle.git --single-branch --no-checkout /waffle +pushd /waffle +git checkout "$WAFFLE_VERSION" +cmake -B_build -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=Release . +make -C _build -j4 install +popd +rm -rf /waffle + APITRACE_VERSION="9.0" git clone https://github.com/apitrace/apitrace.git --single-branch --no-checkout /apitrace pushd /apitrace git checkout "$APITRACE_VERSION" -cmake -G Ninja -B_build -H. -DCMAKE_BUILD_TYPE=Release -DENABLE_GUI=False +cmake -G Ninja -B_build -H. -DCMAKE_BUILD_TYPE=Release -DENABLE_GUI=False -DENABLE_WAFFLE=on -DWaffle_DIR=/usr/local/lib/cmake/Waffle/ ninja -C _build -j4 mkdir build cp _build/apitrace build |