From d965740df1fbab7a5fc52244e01d7df25fb4be0a Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 17 Jan 2023 14:43:51 -0500 Subject: [PATCH] zink: store drm format as internal_format for imported resources internal_format is the "real" format of a resource, and the "real" format of imported resources is the external-facing format, not the pipe format this ensures the correct format is available for internal ops, such as nplanes queries Fixes: 2e2775c11b0 ("zink: fix PIPE_RESOURCE_PARAM_NPLANES with format modifier") Part-of: (cherry picked from commit 072e29a22e2cd3c738a3bee463f6aebd40159966) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_resource.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 87f6a859332..ad0e4c0ab01 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -220,7 +220,7 @@ "description": "zink: store drm format as internal_format for imported resources", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "2e2775c11b0d17472afd53b1398a3af7d9086a75" }, diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c index 476e3014e84..b68d711ee11 100644 --- a/src/gallium/drivers/zink/zink_resource.c +++ b/src/gallium/drivers/zink/zink_resource.c @@ -1553,6 +1553,7 @@ zink_resource_from_handle(struct pipe_screen *pscreen, res->valid = true; else tc_buffer_disable_cpu_storage(pres); + res->internal_format = whandle->format; } return pres; #else