From be18be9deb0d22dfdc34e830e44df0d62a01f22e Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Sat, 4 Nov 2023 09:49:33 +0000 Subject: [PATCH] Revert "ci: backport two mesh/task query fixes for VKCTS" This reverts commit dcc4e1b4d78bf964f001d6b8b907ab7ac263fb87. The hashes added there are incorrect, and fixing them regresses a bunch of drivers, so let's just revert for now, and the next commit fixes the bug that allowed incorrect backports to go in undetected. Part-of: --- .gitlab-ci/container/build-deqp.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index f92da36f458..949685e7492 100644 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -26,11 +26,6 @@ pushd /VK-GL-CTS # patches. cts_commits_to_backport=( - # Take multiview into account for task shader inv. stats - db6a4697c28f46da967bcc982c018d09aef2c742 - - # Remove illegal mesh shader query tests - 8fc585d85cd13fae9c2ff3eb407ee7e56281a016 ) for commit in "${cts_commits_to_backport[@]}"