OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci/traces: GC unused code for DXVK trace replay.

Browse Source 
I haven't found any use of it since it was introduced, and it got in the
way of zink trace testing.

Reviewed-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17125>
This commit is contained in:
Emma Anholt
2022-06-02 15:23:11 -07:00
committed by Marge Bot
parent 67bbe79d35
commit 83709ac3cf
1 changed files with 35 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
.gitlab-ci/piglit/piglit-traces.sh
View File

@@ -13,6 +13,7 @@ mkdir -p "$RESULTS"
# using a command wrapper. Hence, we will just set it when running the # using a command wrapper. Hence, we will just set it when running the
# command. # command.
export __LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL/lib/" export __LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL/lib/"
export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.${VK_CPU:-`uname -m`}.json"
# Sanity check to ensure that our environment is sufficient to make our tests # Sanity check to ensure that our environment is sufficient to make our tests
# run against the Mesa built by CI, rather than any installed distro version. # run against the Mesa built by CI, rather than any installed distro version.
@@ -33,48 +34,6 @@ quiet() {
set -x set -x
} }
if [ "$VK_DRIVER" ]; then
### VULKAN ###
# Set the Vulkan driver to use.
export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json"
# Set environment for Wine.
export WINEDEBUG="-all"
export WINEPREFIX="/dxvk-wine64"
export WINEESYNC=1
# Set environment for DXVK.
export DXVK_LOG_LEVEL="none"
export DXVK_STATE_CACHE=0
# Set environment for gfxreconstruct executables.
export PATH="/gfxreconstruct/build/bin:$PATH"
SANITY_MESA_VERSION_CMD="vulkaninfo"
HANG_DETECTION_CMD="/parallel-deqp-runner/build/bin/hang-detection"
# Set up the Window System Interface (WSI)
if [ ${TEST_START_XORG:-0} -eq 1 ]; then
"$INSTALL"/common/start-x.sh "$INSTALL"
export DISPLAY=:0
else
# Run vulkan against the host's running X server (xvfb doesn't
# have DRI3 support).
# Set the DISPLAY env variable in each gitlab-runner's
# configuration file:
# https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section
quiet printf "%s%s\n" "Running against the hosts' X server. " \
"DISPLAY is \"$DISPLAY\"."
fi
else
### GL/ES ###
# Set environment for apitrace executable. # Set environment for apitrace executable.
export PATH="/apitrace/build:$PATH" export PATH="/apitrace/build:$PATH"
@@ -90,7 +49,6 @@ else
# Set up the platform windowing system. # Set up the platform windowing system.
if [ "x$EGL_PLATFORM" = "xsurfaceless" ]; then if [ "x$EGL_PLATFORM" = "xsurfaceless" ]; then
# Use the surfaceless EGL platform. # Use the surfaceless EGL platform.
export DISPLAY= export DISPLAY=
export WAFFLE_PLATFORM="surfaceless_egl" export WAFFLE_PLATFORM="surfaceless_egl"
@@ -119,7 +77,6 @@ else
SANITY_MESA_VERSION_CMD="$SANITY_MESA_VERSION_CMD --platform glx --api gl --profile core" SANITY_MESA_VERSION_CMD="$SANITY_MESA_VERSION_CMD --platform glx --api gl --profile core"
RUN_CMD_WRAPPER="xvfb-run --server-args=\"-noreset\" sh -c" RUN_CMD_WRAPPER="xvfb-run --server-args=\"-noreset\" sh -c"
fi fi
fi
if [ "$ZINK_USE_LAVAPIPE" ]; then if [ "$ZINK_USE_LAVAPIPE" ]; then
export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/lvp_icd.x86_64.json" export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/lvp_icd.x86_64.json"