Mesa (main): ci/freedreno: Enable the MSAA deqp tests.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 366de834aa6d8c578b4d9cd0905b0c42353cbe89
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=366de834aa6d8c578b4d9cd0905b0c42353cbe89

Author: Emma Anholt <emma at anholt.net>
Date:   Thu Jul 22 11:15:19 2021 -0700

ci/freedreno: Enable the MSAA deqp tests.

We've had issues with these before when merging to Chrome OS, so let's
make sure we're testing them now that we can do surfaceless pbuffer MSAA.

Reviewed-by: Adam Jackson <ajax at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1859>

---

 .gitlab-ci/bare-metal/arm64_a630_gles_others.sh | 34 ++++++++++++-------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci/bare-metal/arm64_a630_gles_others.sh b/.gitlab-ci/bare-metal/arm64_a630_gles_others.sh
index 6e2399c8b55..fd52f25a978 100755
--- a/.gitlab-ci/bare-metal/arm64_a630_gles_others.sh
+++ b/.gitlab-ci/bare-metal/arm64_a630_gles_others.sh
@@ -58,24 +58,22 @@ if ! env \
     EXIT=1
 fi
 
-# gles3-multisample mustpass -- disabled pending https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1859
-# if ! env \
-#   DEQP_RESULTS_DIR=results/gles3-multisample \
-#   DEQP_VER=gles3 \
-#   DEQP_CONFIG="rgba8888d24s8ms4" \
-#   DEQP_VARIANT="multisample" \
-#   /install/deqp-runner.sh; then
-#     EXIT=1
-# fi
+if ! env \
+  DEQP_RESULTS_DIR=results/gles3-multisample \
+  DEQP_VER=gles3 \
+  DEQP_CONFIG="rgba8888d24s8ms4" \
+  DEQP_VARIANT="multisample" \
+  /install/deqp-runner.sh; then
+    EXIT=1
+fi
 
-# gles31-multisample mustpass -- disabled pending https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1859
-# if ! env \
-#   DEQP_RESULTS_DIR=results/gles31-multisample \
-#   DEQP_VER=gles31 \
-#   DEQP_CONFIG="rgba8888d24s8ms4" \
-#   DEQP_VARIANT="multisample" \
-#   /install/deqp-runner.sh; then
-#     EXIT=1
-# fi
+if ! env \
+  DEQP_RESULTS_DIR=results/gles31-multisample \
+  DEQP_VER=gles31 \
+  DEQP_CONFIG="rgba8888d24s8ms4" \
+  DEQP_VARIANT="multisample" \
+  /install/deqp-runner.sh; then
+    EXIT=1
+fi
 
 exit $EXIT