Merge remote-tracking branch 'mesa/18.3' into oreo-x86

[android-x86/external-mesa.git] / src / amd / vulkan / radv_descriptor_set.c

diff --git a/src/amd/vulkan/radv_descriptor_set.c b/src/amd/vulkan/radv_descriptor_set.c
index 6ee949c..7f7d682 100644 (file)
--- a/src/amd/vulkan/radv_descriptor_set.c
+++ b/src/amd/vulkan/radv_descriptor_set.c
@@ -965,9 +965,11 @@ void radv_update_descriptor_sets(
                        }
                        src_ptr += src_binding_layout->size / 4;
                        dst_ptr += dst_binding_layout->size / 4;
-                       dst_buffer_list[j] = src_buffer_list[j];
-                       ++src_buffer_list;
-                       ++dst_buffer_list;
+
+                       if (src_binding_layout->type != VK_DESCRIPTOR_TYPE_SAMPLER) {
+                               /* Sampler descriptors don't have a buffer list. */
+                               dst_buffer_list[j] = src_buffer_list[j];
+                       }
                }
        }
 }