From 5f4d7d99d751bd3210f58ec9130b1f8d641033d6 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Fri, 19 Feb 2021 15:58:16 -0500 Subject: [PATCH] panfrost: Don't advertise OES_copy_image We don't support it yet. Fixes: 61d3ae6e0bd ("panfrost: Initial stub for Panfrost driver") Signed-off-by: Alyssa Rosenzweig Reviewed-by: Boris Brezillon Part-of: (cherry picked from commit 5eff64e3a318f911326499e9940ee773f6f58c21) --- .pick_status.json | 2 +- src/gallium/drivers/panfrost/pan_screen.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index ae48ab9bc48..8251f5bbef9 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2551,7 +2551,7 @@ "description": "panfrost: Don't advertise OES_copy_image", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "61d3ae6e0bde93c5601278d1a60c44be655a7cb5" }, diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c index 6822678ca1c..7c1c18e6381 100644 --- a/src/gallium/drivers/panfrost/pan_screen.c +++ b/src/gallium/drivers/panfrost/pan_screen.c @@ -155,13 +155,17 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param) case PIPE_CAP_UMA: case PIPE_CAP_TEXTURE_FLOAT_LINEAR: case PIPE_CAP_TEXTURE_HALF_FLOAT_LINEAR: - case PIPE_CAP_COPY_BETWEEN_COMPRESSED_AND_PLAIN_FORMATS: case PIPE_CAP_TGSI_ARRAY_COMPONENTS: case PIPE_CAP_CS_DERIVED_SYSTEM_VALUES_SUPPORTED: case PIPE_CAP_TEXTURE_BUFFER_OBJECTS: case PIPE_CAP_TEXTURE_BUFFER_SAMPLER: return 1; + /* We need this for OES_copy_image, but currently there are some awful + * interactions with AFBC that need to be worked out. */ + case PIPE_CAP_COPY_BETWEEN_COMPRESSED_AND_PLAIN_FORMATS: + return 0; + case PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS: return 4; case PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS: