From 452a2fb99587c5aa536495d00c70fad3fd630270 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 18 Apr 2022 17:33:35 -0400 Subject: [PATCH] zink: remove ZINK_NO_TIMELINES Acked-by: Adam Jackson Part-of: --- src/gallium/drivers/zink/ci/deqp-zink-lvp.toml | 10 ---------- src/gallium/drivers/zink/ci/gitlab-ci.yml | 14 -------------- 2 files changed, 24 deletions(-) diff --git a/src/gallium/drivers/zink/ci/deqp-zink-lvp.toml b/src/gallium/drivers/zink/ci/deqp-zink-lvp.toml index 31c009c9c89..e52705618f3 100644 --- a/src/gallium/drivers/zink/ci/deqp-zink-lvp.toml +++ b/src/gallium/drivers/zink/ci/deqp-zink-lvp.toml @@ -56,13 +56,3 @@ profile = "gpu" process_isolation = true timeout = 180.0 [piglit.env] - -# Whoops, no prefix support for piglit yet. Looks like we're going to need a new deqp-runner. -#[[piglit]] -#piglit_folder = "/piglit" -#profile = "quick_gl" -#process_isolation = true -#prefix = "no-timeline-" -#timeout = 180.0 -# [piglit.env] -# ZINK_NO_TIMELINES = "1" diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml index ff81f6b0a7a..57a038081eb 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml @@ -22,17 +22,3 @@ zink: PIGLIT_NO_WINDOW: 1 script: - xvfb-run --server-args='-noreset' sh -c "GALLIUM_DRIVER=zink VK_DRIVER=lvp install/deqp-runner.sh" - -# Should be merged into the main zink job once we have prefix support in deqp-runner. -.zink-piglit-quick_gl: - extends: - - .test-gl - - .zink-lvp-test - variables: - PIGLIT_PROFILES: quick_gl - PIGLIT_NO_WINDOW: 1 - PIGLIT_RUNNER_OPTIONS: "--timeout 180" - # No taking more than our fair share of CPU on fd.o shared runners. - LP_NUM_THREADS: 0 - script: - - xvfb-run --server-args='-noreset' sh -c "ZINK_NO_TIMELINES=1 GALLIUM_DRIVER=zink VK_DRIVER=lvp install/piglit/piglit-runner.sh"