Mesa (staging/21.1): softpipe: ci updates

[GitLab Mirror]

Module: Mesa
Branch: staging/21.1
Commit: 5b34892630d19582dcd403a9bd613b9b60a27377
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5b34892630d19582dcd403a9bd613b9b60a27377

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Thu Apr 22 09:05:46 2021 -0400

softpipe: ci updates

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10398>
(cherry picked from commit 90315b14d1031c91e1021ded6bd3f183a976abf2)

---

 .pick_status.json                                  | 2 +-
 src/gallium/drivers/softpipe/ci/softpipe-quick.txt | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index a2cdb549cb0..0b2cff71965 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -436,7 +436,7 @@
         "description": "softpipe: ci updates",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/softpipe/ci/softpipe-quick.txt b/src/gallium/drivers/softpipe/ci/softpipe-quick.txt
index 45de3631706..51ba750d85a 100644
--- a/src/gallium/drivers/softpipe/ci/softpipe-quick.txt
+++ b/src/gallium/drivers/softpipe/ci/softpipe-quick.txt
@@ -1822,10 +1822,6 @@ spec/arb_transform_feedback_overflow_query/arb_transform_feedback_overflow_query
 spec/arb_transform_feedback_overflow_query/arb_transform_feedback_overflow_query-basic/arb_transform_feedback_overflow_query-buffer_object_no_overflow: skip
 spec/arb_transform_feedback_overflow_query/arb_transform_feedback_overflow_query-basic/arb_transform_feedback_overflow_query-buffer_object_no_overflow_single: skip
 spec/arb_transform_feedback_overflow_query/arb_transform_feedback_overflow_query-basic/arb_transform_feedback_overflow_query-buffer_object_single: skip
-spec/arb_transform_feedback_overflow_query/arb_transform_feedback_overflow_query-basic/arb_transform_feedback_overflow_query-conditional_render_1: fail
-spec/arb_transform_feedback_overflow_query/arb_transform_feedback_overflow_query-basic/arb_transform_feedback_overflow_query-conditional_render_no_overflow: fail
-spec/arb_transform_feedback_overflow_query/arb_transform_feedback_overflow_query-basic/arb_transform_feedback_overflow_query-conditional_render_no_overflow_single: fail
-spec/arb_transform_feedback_overflow_query/arb_transform_feedback_overflow_query-basic/arb_transform_feedback_overflow_query-simple_query_any: fail
 spec/arb_uniform_buffer_object/bufferstorage: skip
 spec/arb_vertex_program/vp-address-02: skip
 spec/arb_vertex_program/vp-address-04: skip