1 files changed, 41 insertions, 0 deletions
diff --git a/source/blender/draw/intern/draw_manager_shader.c b/source/blender/draw/intern/draw_manager_shader.c
index 04a9f3fdd2d..40b05dff51f 100644
--- a/source/blender/draw/intern/draw_manager_shader.c
+++ b/source/blender/draw/intern/draw_manager_shader.c
@@ -237,6 +237,42 @@ static void drw_deferred_shader_add(GPUMaterial *mat, bool deferred)
   WM_jobs_start(wm, wm_job);
 }
 
+static void drw_register_shader_vlattrs(GPUMaterial *mat)
+{
+  const ListBase *attrs = GPU_material_layer_attributes(mat);
+
+  if (!attrs) {
+    return;
+  }
+
+  GHash *hash = DST.vmempool->vlattrs_name_cache;
+  ListBase *list = &DST.vmempool->vlattrs_name_list;
+
+  LISTBASE_FOREACH (GPULayerAttr *, attr, attrs) {
+    GPULayerAttr **p_val;
+
+    /* Add to the table and list if newly seen. */
+    if (!BLI_ghash_ensure_p(hash, POINTER_FROM_UINT(attr->hash_code), (void ***)&p_val)) {
+      DST.vmempool->vlattrs_ubo_ready = false;
+
+      GPULayerAttr *new_link = *p_val = MEM_dupallocN(attr);
+
+      /* Insert into the list ensuring sorted order. */
+      GPULayerAttr *link = list->first;
+
+      while (link && link->hash_code <= attr->hash_code) {
+        link = link->next;
+      }
+
+      new_link->prev = new_link->next = NULL;
+      BLI_insertlinkbefore(list, link, new_link);
+    }
+
+    /* Reset the unused frames counter. */
+    (*p_val)->users = 0;
+  }
+}
+
 void DRW_deferred_shader_remove(GPUMaterial *mat)
 {
   LISTBASE_FOREACH (wmWindowManager *, wm, &G_MAIN->wm) {
@@ -382,6 +418,9 @@ GPUMaterial *DRW_shader_from_world(World *wo,
                                                 false,
                                                 callback,
                                                 thunk);
+
+  drw_register_shader_vlattrs(mat);
+
   if (DRW_state_is_image_render()) {
     /* Do not deferred if doing render. */
     deferred = false;
@@ -411,6 +450,8 @@ GPUMaterial *DRW_shader_from_material(Material *ma,
                                                 callback,
                                                 thunk);
 
+  drw_register_shader_vlattrs(mat);
+
   if (DRW_state_is_image_render()) {
     /* Do not deferred if doing render. */
     deferred = false;