From e8dda30c6f97e1daaaf4da988006db1349feb6b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 12 Jan 2021 01:29:28 -0500 Subject: [PATCH] radeonsi: optimize no-op cases in si_upload_shader_descriptors Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/gallium/drivers/radeonsi/si_descriptors.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index 426591ce1dd..ac5fca07a8c 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -2621,20 +2621,19 @@ static bool si_upload_shader_descriptors(struct si_context *sctx, unsigned mask) { unsigned dirty = sctx->descriptors_dirty & mask; - /* Assume nothing will go wrong: */ - sctx->shader_pointers_dirty |= dirty; + if (dirty) { + unsigned iter_mask = dirty; - while (dirty) { - unsigned i = u_bit_scan(&dirty); + do { + if (!si_upload_descriptors(sctx, &sctx->descriptors[u_bit_scan(&iter_mask)])) + return false; + } while (iter_mask); - if (!si_upload_descriptors(sctx, &sctx->descriptors[i])) - return false; + sctx->descriptors_dirty &= ~dirty; + sctx->shader_pointers_dirty |= dirty; } - sctx->descriptors_dirty &= ~mask; - si_upload_bindless_descriptors(sctx); - return true; }