Commit a3c0c47f authored by Alexandros Frantzis's avatar Alexandros Frantzis

testing surfaceless renderdoc

parent c4a847c6
Pipeline #68727 failed with stages
in 64 minutes and 59 seconds
......@@ -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-09-03.alf.test"
DEBIAN_VERSION: buster-slim
DEBIAN_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG"
......@@ -125,6 +125,8 @@ mesa-build:
- bash -c "echo MESA_SHA=$MESA_SHA >>$CI_PROJECT_DIR/results/summary.txt"
script:
- cd $CI_PROJECT_DIR/traces-db
- export DISPLAY=
- export EGL_PLATFORM=surfaceless
- python3 $CI_PROJECT_DIR/scripts/dump_trace_images.py --device-name "$DEVICE_NAME" .
- python3 $CI_PROJECT_DIR/scripts/diff_trace_images.py --device-name "$DEVICE_NAME" --output-dir "$CI_PROJECT_DIR/results" .
# Disable performance replays, since we don't need them at the moment and
......
......@@ -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=linux-egl-fallback
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,7 +71,7 @@ make -C _build install
popd
rm -rf apitrace
git clone --depth=1 --branch $RENDERDOC_VERSION https://github.com/baldurk/renderdoc.git
git clone --depth=1 --branch $RENDERDOC_VERSION https://github.com/afrantzis/renderdoc.git
pushd renderdoc
cmake -B_build -H. -DENABLE_QRENDERDOC=false -DCMAKE_BUILD_TYPE=Release
make -C _build install
......
......@@ -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))
......
......@@ -26,7 +26,7 @@ from pathlib import Path
def iter_trace_paths(directory):
for root, dirs, files in os.walk(directory):
for file in files:
if file.endswith(".trace") or file.endswith(".rdc"):
if file.endswith(".rdc"):
yield Path(root) / file
def trace_has_images(trace_path, imagedir):
......
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