Module: Mesa Branch: staging/20.1 Commit: bd123103dd8e7323d9dcf6c442d5dabd0e735649 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bd123103dd8e7323d9dcf6c442d5dabd0e735649
Author: Alyssa Rosenzweig <[email protected]> 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 <[email protected]> Cc: mesa-stable Reviewed-by: Tomeu Vizoso <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6326> (cherry picked from commit e03622e50fcebbcc32b2fd403b1a729c73cb49d5) --- .pick_status.json | 2 +- src/gallium/drivers/panfrost/pan_screen.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index cfcd711740c..fb7ea598832 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -895,7 +895,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 8d3ed98413b..75b7ee9cb45 100644 --- a/src/gallium/drivers/panfrost/pan_screen.c +++ b/src/gallium/drivers/panfrost/pan_screen.c @@ -172,6 +172,10 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param) case PIPE_CAP_VERTEX_BUFFER_STRIDE_4BYTE_ALIGNED_ONLY: return 1; + /* 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: _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
