Commit dbd339a5 authored by Alexandros Frantzis's avatar Alexandros Frantzis

Update renderdoc to version with surfaceless support

Signed-off-by: Alexandros Frantzis's avatarAlexandros Frantzis <alexandros.frantzis@collabora.com>
parent c4a847c6
......@@ -14,7 +14,7 @@
# repository's registry will be used there as well.
variables:
# UPSTREAM_REPO: mesa/mesa
DEBIAN_TAG: "2019-09-26.0"
DEBIAN_TAG: "2019-10-23"
DEBIAN_VERSION: buster-slim
DEBIAN_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG"
......
......@@ -58,10 +58,10 @@ apt-get install -y mesa-utils
# Renderdoc and apitrace
export APITRACE_VERSION=0f541f460bba86a69c8c714076db5a7607cc8d16
export RENDERDOC_VERSION=v1.4
export RENDERDOC_VERSION=ba3df46052afd78b8d24a136aa450c08548ef2c9
apt-get install -y git xvfb cmake autoconf gcc g++ make python3-pil python3-pilkit
apt-get install -y libx11-dev libx11-xcb-dev mesa-common-dev libgl1-mesa-dev libxcb-keysyms1-dev \
cmake python3-dev bison autoconf automake libpcre3-dev
cmake python3-dev bison autoconf automake libpcre3-dev qt5-qmake qt5-default
git clone https://github.com/apitrace/apitrace.git
pushd apitrace
......@@ -71,8 +71,9 @@ make -C _build install
popd
rm -rf apitrace
git clone --depth=1 --branch $RENDERDOC_VERSION https://github.com/baldurk/renderdoc.git
git clone https://github.com/baldurk/renderdoc.git
pushd renderdoc
git checkout $RENDERDOC_VERSION
cmake -B_build -H. -DENABLE_QRENDERDOC=false -DCMAKE_BUILD_TYPE=Release
make -C _build install
mkdir -p /usr/local/lib/$(py3versions -d)/site-packages
......
......@@ -73,7 +73,7 @@ def loadCapture(filename):
if not cap.LocalReplaySupport():
raise RuntimeError("Capture cannot be replayed")
status,controller = cap.OpenCapture(None)
status,controller = cap.OpenCapture(rd.ReplayOptions(), None)
if status != rd.ReplayStatus.Succeeded:
raise RuntimeError("Couldn't initialise replay: " + str(status))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment