Mesa (main): zink: drop paranoid code

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Jun 16 12:52:06 UTC 2021


Module: Mesa
Branch: main
Commit: b20c1c2a3bd368c86adb15606d55e5cd0ed2b8b1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b20c1c2a3bd368c86adb15606d55e5cd0ed2b8b1

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Wed Jun 16 02:36:05 2021 -0700

zink: drop paranoid code

If we ever get here, res->dt is non-NULL. No need to assert, and no need
to check twice.

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11414>

---

 src/gallium/drivers/zink/zink_screen.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 7f0f831464a..6d5d64c6a81 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -1132,9 +1132,7 @@ zink_flush_frontbuffer(struct pipe_screen *pscreen,
       winsys->displaytarget_unmap(winsys, res->dt);
    }
 
-   assert(res->dt);
-   if (res->dt)
-      winsys->displaytarget_display(winsys, res->dt, winsys_drawable_handle, sub_box);
+   winsys->displaytarget_display(winsys, res->dt, winsys_drawable_handle, sub_box);
 }
 
 bool



More information about the mesa-commit mailing list