Module: Mesa
Branch: staging/23.3
Commit: eebdf4a90cf8a7a08e0121b23a4e70320675e63d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=eebdf4a90cf8a7a08e0121b23a4e70320675e63d
Author: David Heidelberg <david.heidelb...@collabora.com>
Date: Tue Dec 12 15:51:44 2023 +0100
ci/freedreno: timestamp-get no longer fails on Adreno
Fixes: 659e557676d2 ("freedreno: Fix timestamp conversion")
Cc: mesa-stable #23.3
Signed-off-by: David Heidelberg <david.heidelb...@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26611>
(cherry picked from commit 5527c090f41ab665efe1a89936f7306d201a1faa)
---
.pick_status.json | 2 +-
src/freedreno/ci/freedreno-a530-fails.txt | 1 -
src/freedreno/ci/freedreno-a618-fails.txt | 2 --
src/freedreno/ci/freedreno-a630-fails.txt | 2 --
4 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/.pick_status.json b/.pick_status.json
index 13923ee2756..e43c65451bc 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -844,7 +844,7 @@
"description": "ci/freedreno: timestamp-get no longer fails on Adreno",
"nominated": true,
"nomination_type": 0,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": "659e557676d2ccd5c765b95f2d887ffa17349031",
"notes": null
diff --git a/src/freedreno/ci/freedreno-a530-fails.txt
b/src/freedreno/ci/freedreno-a530-fails.txt
index a009feb0186..3e130a15bf4 100644
--- a/src/freedreno/ci/freedreno-a530-fails.txt
+++ b/src/freedreno/ci/freedreno-a530-fails.txt
@@ -208,7 +208,6 @@ spec@arb_separate_shader_objects@400 combinations by
location,Fail
spec@arb_separate_shader_objects@400 combinations by name,Fail
spec@arb_texture_rectangle@1-1-linear-texture,Fail
spec@arb_timer_query@query gl_timestamp,Fail
-spec@arb_timer_query@timestamp-get,Fail
spec@arb_transform_feedback3@gl_skipcomponents1-1,Fail
spec@arb_transform_feedback3@gl_skipcomponents1-2,Fail
spec@arb_transform_feedback3@gl_skipcomponents1-3,Fail
diff --git a/src/freedreno/ci/freedreno-a618-fails.txt
b/src/freedreno/ci/freedreno-a618-fails.txt
index 71e60f91197..c53715299cc 100644
--- a/src/freedreno/ci/freedreno-a618-fails.txt
+++ b/src/freedreno/ci/freedreno-a618-fails.txt
@@ -110,8 +110,6 @@
spec@arb_tessellation_shader@execution@variable-indexing@vs-output-array-dvec4-i
spec@arb_texture_rectangle@1-1-linear-texture,Fail
-spec@arb_timer_query@timestamp-get,Fail
-
spec@arb_vertex_type_2_10_10_10_rev@attrib-p-type-size-match,Fail
# fails unrelated to GL_ARB_enhanced_layouts
diff --git a/src/freedreno/ci/freedreno-a630-fails.txt
b/src/freedreno/ci/freedreno-a630-fails.txt
index c4c169bdc28..1ea5c072d95 100644
--- a/src/freedreno/ci/freedreno-a630-fails.txt
+++ b/src/freedreno/ci/freedreno-a630-fails.txt
@@ -114,8 +114,6 @@
spec@arb_tessellation_shader@execution@variable-indexing@vs-output-array-dvec4-i
spec@arb_texture_rectangle@1-1-linear-texture,Fail
-spec@arb_timer_query@timestamp-get,Fail
-
spec@arb_vertex_type_2_10_10_10_rev@attrib-p-type-size-match,Fail
# fails unrelated to GL_ARB_enhanced_layouts
