From 67ff45c08e8255534e92080289c977f95dd680c5 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 2 Jun 2023 08:44:23 -0400 Subject: [PATCH] zink: remove assert for dt in zink_kopper_update this is a valid (harmless) path that can be hit by in some cases cc: mesa-stable Part-of: (cherry picked from commit 43a6f8b9f8ca09328ec27956ebcd4140a0defba9) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_kopper.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 3905114c077..ad3c9cad2ea 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3361,7 +3361,7 @@ "description": "zink: remove assert for dt in zink_kopper_update", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/zink/zink_kopper.c b/src/gallium/drivers/zink/zink_kopper.c index 3ff77d2d638..31f0f3d2a6f 100644 --- a/src/gallium/drivers/zink/zink_kopper.c +++ b/src/gallium/drivers/zink/zink_kopper.c @@ -878,7 +878,6 @@ zink_kopper_update(struct pipe_screen *pscreen, struct pipe_resource *pres, int { struct zink_resource *res = zink_resource(pres); struct zink_screen *screen = zink_screen(pscreen); - assert(pres->bind & PIPE_BIND_DISPLAY_TARGET); if (!res->obj->dt) return false; struct kopper_displaytarget *cdt = res->obj->dt;