anv: Add a layout to anv_descriptor_set

diff --git a/src/vulkan/anv_device.c b/src/vulkan/anv_device.c
index 26d0fe57a425f377e4bfedd788927c6eed8d9b29..156a9d2b1b6949b40832d3973c90e3b1a3797ebb 100644 (file)
--- a/src/vulkan/anv_device.c
+++ b/src/vulkan/anv_device.c
@@ -1646,6 +1646,8 @@ anv_descriptor_set_create(struct anv_device *device,
     */
    memset(set, 0, size);
 
+   set->layout = layout;
+
    /* Go through and fill out immutable samplers if we have any */
    struct anv_descriptor *desc = set->descriptors;
    for (uint32_t b = 0; b < layout->binding_count; b++) {

diff --git a/src/vulkan/anv_private.h b/src/vulkan/anv_private.h
index 858063da45c88cd4f06380a0266e4309cfbfd2e4..a208162bbb67b54da30aedc5d2591d4de411db32 100644 (file)
--- a/src/vulkan/anv_private.h
+++ b/src/vulkan/anv_private.h
@@ -751,6 +751,7 @@ struct anv_descriptor {
 };
 
 struct anv_descriptor_set {
+   const struct anv_descriptor_set_layout *layout;
    struct anv_descriptor descriptors[0];
 };