Mesa (staging/20.2): panfrost: Set STRIDE_4BYTE_ALIGNED_ONLY

[GitLab Mirror]

Module: Mesa
Branch: staging/20.2
Commit: 2891ddb99694864e2b9ce905559d776f9056a936
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2891ddb99694864e2b9ce905559d776f9056a936

Author: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Date:   Thu Aug 13 15:19:07 2020 -0400

panfrost: Set STRIDE_4BYTE_ALIGNED_ONLY

It isn't clear to me why, but this breaks in some cases (such as some
dEQP cases where the blob does a translate too).

This reverts commit 9f2997dad061ee38e06f654f524dffbffc5b2a4b.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Cc: mesa-stable
Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6326>
(cherry picked from commit e03622e50fcebbcc32b2fd403b1a729c73cb49d5)

---

 .gitlab-ci/deqp-panfrost-t860-fails.txt   | 1 -
 .pick_status.json                         | 2 +-
 src/gallium/drivers/panfrost/pan_screen.c | 4 ++++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci/deqp-panfrost-t860-fails.txt b/.gitlab-ci/deqp-panfrost-t860-fails.txt
index 9b4218b7b98..8e5d0678b61 100644
--- a/.gitlab-ci/deqp-panfrost-t860-fails.txt
+++ b/.gitlab-ci/deqp-panfrost-t860-fails.txt
@@ -42,4 +42,3 @@ dEQP-GLES3.functional.fbo.msaa.4_samples.stencil_index8
 dEQP-GLES3.functional.fence_sync.client_wait_sync_finish
 dEQP-GLES3.functional.draw.random.156
 dEQP-GLES3.functional.draw.random.208
-dEQP-GLES3.functional.vertex_arrays.single_attribute.strides.int2_10_10_10.user_ptr_stride17_components4_quads256
diff --git a/.pick_status.json b/.pick_status.json
index 6b412d850ff..a872686f8b5 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -652,7 +652,7 @@
         "description": "panfrost: Set STRIDE_4BYTE_ALIGNED_ONLY",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c
index c2e4b9beb65..dd35e4bf717 100644
--- a/src/gallium/drivers/panfrost/pan_screen.c
+++ b/src/gallium/drivers/panfrost/pan_screen.c
@@ -191,6 +191,10 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param)
         case PIPE_CAP_CONDITIONAL_RENDER:
                 return is_gl3;
 
+        /* TODO: Where does this req come from in practice? */
+        case PIPE_CAP_VERTEX_BUFFER_STRIDE_4BYTE_ALIGNED_ONLY:
+                return 1;
+
         case PIPE_CAP_MAX_TEXTURE_2D_SIZE:
                 return 4096;
         case PIPE_CAP_MAX_TEXTURE_3D_LEVELS: