radeonsi: optimize no-op cases in si_upload_shader_descriptors
authorMarek Olšák <marek.olsak@amd.com>
Tue, 12 Jan 2021 06:29:28 +0000 (01:29 -0500)
committerMarek Olšák <marek.olsak@amd.com>
Sat, 30 Jan 2021 20:41:23 +0000 (15:41 -0500)
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8794>

src/gallium/drivers/radeonsi/si_descriptors.c

index 426591c..ac5fca0 100644 (file)
@@ -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;
 }