summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2021-06-23 13:22:03 -0700
committerMarge Bot <eric+marge@anholt.net>2021-06-25 19:45:38 +0000
commited77bf3c4ecfc1837eb868cb435f7632d2240ab7 (patch)
treea748dcad381a6a5fd2b32d7b5d2650ea4cad94d6 /.gitlab-ci
parent6a79ee97f48ee99718b97bb8870a74faeecd56d9 (diff)
ci: Unify on MESA_VK_IGNORE_CONFORMANCE_WARNING
Move and rename warn_non_conformant_implementation() to common location of src/vulkan/util/vk_util.c as vk_warn_non_conformant_implementation(). In freedreno/ci, move MESA_VK_IGNORE_CONFORMANCE_WARNING to common location of .baremetal-deqp-test-freedreno-vk. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11563>
Diffstat (limited to '.gitlab-ci')
-rwxr-xr-x.gitlab-ci/common/generate-env.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci/common/generate-env.sh b/.gitlab-ci/common/generate-env.sh
index 849782ab712..a76e2b24a0b 100755
--- a/.gitlab-ci/common/generate-env.sh
+++ b/.gitlab-ci/common/generate-env.sh
@@ -53,6 +53,7 @@ for var in \
MESA_GL_VERSION_OVERRIDE \
MESA_GLSL_VERSION_OVERRIDE \
MESA_GLES_VERSION_OVERRIDE \
+ MESA_VK_IGNORE_CONFORMANCE_WARNING \
MINIO_HOST \
NIR_VALIDATE \
PAN_MESA_DEBUG \
@@ -74,7 +75,6 @@ for var in \
PIPELINE_ARTIFACTS_BASE \
TEST_LD_PRELOAD \
TU_DEBUG \
- TU_IGNORE_CONFORMANCE_WARNING \
VK_CPU \
VK_DRIVER \
; do