ci/traces: drop the freedoom-phase2-gl-high.trace

See https://gitlab.freedesktop.org/mesa/mesa/-/issues/8080#note_2154467

Fixes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8080
Cc: mesa-stable
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26199>
(cherry picked from commit 1eff68dd2a6d9fc8acd53078d609e92f693c2556)

diff --git a/.pick_status.json b/.pick_status.json
index fd110a8..9804b54 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -44,7 +44,7 @@
         "description": "ci/traces: drop the freedoom-phase2-gl-high.trace",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null

diff --git a/src/broadcom/ci/traces-broadcom.yml b/src/broadcom/ci/traces-broadcom.yml
index 4808e2d..0b1fa9a 100644 (file)
--- a/src/broadcom/ci/traces-broadcom.yml
+++ b/src/broadcom/ci/traces-broadcom.yml
@@ -27,11 +27,6 @@ traces:
       label: [unsupported]
       text: needs GL 4.1
 
-  freedoom/freedoom-phase2-gl-high.trace:
-    broadcom-rpi4:
-      label: [unsupported]
-      text: needs GL 4.6
-
   glxgears/glxgears-2-v2.trace:
     broadcom-rpi4:
       label: [skip, flakes]

diff --git a/src/freedreno/ci/traces-freedreno.yml b/src/freedreno/ci/traces-freedreno.yml
index a870127..2aca3af 100644 (file)
--- a/src/freedreno/ci/traces-freedreno.yml
+++ b/src/freedreno/ci/traces-freedreno.yml
@@ -704,27 +704,6 @@ traces:
       label: [skip, flakes]
       text: Inconsistent rendering, but looks good.
 
-  freedoom/freedoom-phase2-gl-high.trace:
-    freedreno-a306:
-      label: [unsupported]
-    freedreno-a530:
-      label: [unsupported]
-      text: needs GL 4.6
-    freedreno-a618:
-      checksum: a2dbcd27c404a1bb0f7d60476d93d22c
-    freedreno-a630:
-      checksum: a2dbcd27c404a1bb0f7d60476d93d22c
-    zink-a618:
-      label: [crash]
-      text: |-
-        ../src/gallium/drivers/zink/zink_context.c:541: update_descriptor_state_ubo:
-        Assertion `ctx->di.ubos[shader][slot].range <= screen->info.props.limits.maxUniformBufferRange' failed.
-    zink-a630:
-      label: [crash]
-      text: |-
-        ../src/gallium/drivers/zink/zink_context.c:541: update_descriptor_state_ubo:
-        Assertion `ctx->di.ubos[shader][slot].range <= screen->info.props.limits.maxUniformBufferRange' failed.
-
   unvanquished/unvanquished-lowest.trace:
     freedreno-a306:
       label: [skip]

diff --git a/src/gallium/drivers/crocus/ci/traces-crocus.yml b/src/gallium/drivers/crocus/ci/traces-crocus.yml
index 4da4f03..fac535e 100644 (file)
--- a/src/gallium/drivers/crocus/ci/traces-crocus.yml
+++ b/src/gallium/drivers/crocus/ci/traces-crocus.yml
@@ -164,13 +164,6 @@ traces:
       label: [unsupported]
     crocus-hsw:
       checksum: c07530897dc5a6882cbf35737334336b
-  freedoom/freedoom-phase2-gl-high.trace:
-    crocus-g41:
-      label: [unsupported]
-    crocus-hsw:
-      label: [skip, crash]
-      checksum: 997ec70d945fdbda8a98efe831000338
-      text: "abort() called"
   unvanquished/unvanquished-lowest.trace:
     crocus-g41:
       label: [unsupported]

diff --git a/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml b/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml
index 0d4277a..fd85705 100644 (file)
--- a/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml
+++ b/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml
@@ -153,9 +153,6 @@ traces:
     gl-vmware-llvmpipe:
       label: [skip, broken]
       text: missing background, error Too many compute shader storage blocks (9/8)
-  freedoom/freedoom-phase2-gl-high.trace:
-    gl-vmware-llvmpipe:
-      label: [unsupported]
   unvanquished/unvanquished-lowest.trace:
     gl-vmware-llvmpipe:
       label: [unsupported]

diff --git a/src/gallium/drivers/zink/ci/traces-zink.yml b/src/gallium/drivers/zink/ci/traces-zink.yml
index 8890204..a94101a 100644 (file)
--- a/src/gallium/drivers/zink/ci/traces-zink.yml
+++ b/src/gallium/drivers/zink/ci/traces-zink.yml
@@ -22,11 +22,6 @@ traces:
       label: [skip, broken, flakes]
       checksum: 9b5090a236350f04cb2a61c5f0c0fe0f
       text: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8986
-  freedoom/freedoom-phase2-gl-high.trace:
-    gl-zink-anv-tgl:
-      label: [skip]
-      text: "Fails on CI as well as when run locally"
-      checksum: 288b762ac80ed76e18f848649a618be1
   glxgears/glxgears-2-v2.trace:
     gl-zink-anv-tgl:
       checksum: f53ac20e17da91c0359c31f2fa3f401e

diff --git a/src/intel/ci/traces-iris.yml b/src/intel/ci/traces-iris.yml
index 59cb340..7bc335c 100644 (file)
--- a/src/intel/ci/traces-iris.yml
+++ b/src/intel/ci/traces-iris.yml
@@ -514,19 +514,6 @@ traces:
       checksum: f11aa01f5ef3a563567e2a85998c418e
     gl-intel-cml:
       checksum: f11aa01f5ef3a563567e2a85998c418e
-  freedoom/freedoom-phase2-gl-high.trace:
-    gl-intel-apl:
-      checksum: b9951727c5c869d5ca510d83a557711b
-    gl-intel-glx:
-      checksum: b9951727c5c869d5ca510d83a557711b
-    gl-intel-amly:
-      checksum: b9951727c5c869d5ca510d83a557711b
-    gl-intel-kbl:
-      checksum: b9951727c5c869d5ca510d83a557711b
-    gl-intel-whl:
-      checksum: b9951727c5c869d5ca510d83a557711b
-    gl-intel-cml:
-      checksum: b9951727c5c869d5ca510d83a557711b
   unvanquished/unvanquished-lowest.trace:
     gl-intel-apl:
       checksum: 884096b6dd40e2f500d0837501287fac

diff --git a/src/panfrost/ci/traces-panfrost.yml b/src/panfrost/ci/traces-panfrost.yml
index 02125b9..c14f25d 100644 (file)
--- a/src/panfrost/ci/traces-panfrost.yml
+++ b/src/panfrost/ci/traces-panfrost.yml
@@ -122,11 +122,6 @@ traces:
       label: [unsupported]
     gl-panfrost-t860:
       label: [unsupported]
-  freedoom/freedoom-phase2-gl-high.trace:
-    gl-panfrost-t760:
-      label: [unsupported]
-    gl-panfrost-t860:
-      label: [unsupported]
   unvanquished/unvanquished-lowest.trace:
     gl-panfrost-t760:
       label: [unsupported]