diff --git a/src/nouveau/vulkan/nvk_cmd_buffer.c b/src/nouveau/vulkan/nvk_cmd_buffer.c
index 84a334372a3..417e1ac2583 100644
--- a/src/nouveau/vulkan/nvk_cmd_buffer.c
+++ b/src/nouveau/vulkan/nvk_cmd_buffer.c
@@ -842,6 +842,38 @@ nvk_CmdSetDescriptorBufferOffsets2EXT(VkCommandBuffer commandBuffer,
    }
 }
 
+static void
+nvk_bind_embedded_samplers(struct nvk_cmd_buffer *cmd,
+                           struct nvk_descriptor_state *desc,
+                           const VkBindDescriptorBufferEmbeddedSamplersInfoEXT *info)
+{
+   VK_FROM_HANDLE(vk_pipeline_layout, pipeline_layout, info->layout);
+   const struct nvk_descriptor_set_layout *set_layout =
+      vk_to_nvk_descriptor_set_layout(pipeline_layout->set_layouts[info->set]);
+
+   struct nvk_buffer_address set_addr = {
+      .base_addr = set_layout->embedded_samplers_addr,
+      .size = set_layout->non_variable_descriptor_buffer_size,
+   };
+   nvk_descriptor_state_set_root(cmd, desc, sets[info->set], set_addr);
+}
+
+VKAPI_ATTR void VKAPI_CALL
+nvk_CmdBindDescriptorBufferEmbeddedSamplers2EXT(
+    VkCommandBuffer commandBuffer,
+    const VkBindDescriptorBufferEmbeddedSamplersInfoEXT *pInfo)
+{
+   VK_FROM_HANDLE(nvk_cmd_buffer, cmd, commandBuffer);
+
+   if (pInfo->stageFlags & NVK_VK_GRAPHICS_STAGE_BITS) {
+      nvk_bind_embedded_samplers(cmd, &cmd->state.gfx.descriptors, pInfo);
+   }
+
+   if (pInfo->stageFlags & VK_SHADER_STAGE_COMPUTE_BIT) {
+      nvk_bind_embedded_samplers(cmd, &cmd->state.cs.descriptors, pInfo);
+   }
+}
+
 static void
 nvk_push_constants(UNUSED struct nvk_cmd_buffer *cmd,
                    struct nvk_descriptor_state *desc,
diff --git a/src/nouveau/vulkan/nvk_descriptor_set_layout.c b/src/nouveau/vulkan/nvk_descriptor_set_layout.c
index 50e820a4386..c96a69b72b1 100644
--- a/src/nouveau/vulkan/nvk_descriptor_set_layout.c
+++ b/src/nouveau/vulkan/nvk_descriptor_set_layout.c
@@ -110,6 +110,23 @@ nvk_descriptor_get_type_list(VkDescriptorType type,
    return type_list;
 }
 
+static void
+nvk_descriptor_set_layout_destroy(struct vk_device *vk_dev,
+                                  struct vk_descriptor_set_layout *vk_layout)
+{
+   struct nvk_device *dev = container_of(vk_dev, struct nvk_device, vk);
+   struct nvk_descriptor_set_layout *layout =
+      vk_to_nvk_descriptor_set_layout(vk_layout);
+
+   if (layout->embedded_samplers_addr != 0) {
+      nvk_heap_free(dev, &dev->shader_heap,
+                    layout->embedded_samplers_addr,
+                    layout->non_variable_descriptor_buffer_size);
+   }
+
+   vk_object_free(&dev->vk, NULL, layout);
+}
+
 VKAPI_ATTR VkResult VKAPI_CALL
 nvk_CreateDescriptorSetLayout(VkDevice device,
                               const VkDescriptorSetLayoutCreateInfo *pCreateInfo,
@@ -150,6 +167,7 @@ nvk_CreateDescriptorSetLayout(VkDevice device,
    if (!vk_descriptor_set_layout_multizalloc(&dev->vk, &ma))
       return vk_error(dev, VK_ERROR_OUT_OF_HOST_MEMORY);
 
+   layout->vk.destroy = nvk_descriptor_set_layout_destroy;
    layout->flags = pCreateInfo->flags;
    layout->binding_count = num_bindings;
 
@@ -312,6 +330,51 @@ nvk_CreateDescriptorSetLayout(VkDevice device,
 
    _mesa_blake3_final(&blake3_ctx, layout->vk.blake3);
 
+    if (pCreateInfo->flags &
+        VK_DESCRIPTOR_SET_LAYOUT_CREATE_EMBEDDED_IMMUTABLE_SAMPLERS_BIT_EXT) {
+      void *sampler_desc_data =
+         vk_alloc2(&dev->vk.alloc, pAllocator, buffer_size, 4,
+                   VK_SYSTEM_ALLOCATION_SCOPE_COMMAND);
+      if (sampler_desc_data == NULL) {
+         nvk_descriptor_set_layout_destroy(&dev->vk, &layout->vk);
+         return vk_error(dev, VK_ERROR_OUT_OF_HOST_MEMORY);
+      }
+
+      for (uint32_t b = 0; b < num_bindings; b++) {
+         assert(layout->binding[b].type == VK_DESCRIPTOR_TYPE_SAMPLER);
+         assert(layout->binding[b].array_size == 1);
+         assert(layout->binding[b].immutable_samplers != NULL);
+         assert(!(layout->binding[b].flags &
+                  VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT));
+
+         /* I'm paranoid */
+         if (layout->binding[b].immutable_samplers == NULL)
+            continue;
+
+         struct nvk_sampler *sampler = layout->binding[b].immutable_samplers[0];
+
+         /* YCbCr has to come in through a combined image/sampler */
+         assert(sampler->plane_count == 1);
+
+         assert(sampler->planes[0].desc_index < (1 << 12));
+         struct nvk_sampled_image_descriptor desc = {
+            .sampler_index = sampler->planes[0].desc_index,
+         };
+         memcpy(sampler_desc_data + layout->binding[b].offset,
+                &desc, sizeof(desc));
+      }
+
+      VkResult result = nvk_heap_upload(dev, &dev->shader_heap,
+                                        sampler_desc_data, buffer_size,
+                                        nvk_min_cbuf_alignment(&pdev->info),
+                                        &layout->embedded_samplers_addr);
+      vk_free2(&dev->vk.alloc, pAllocator, sampler_desc_data);
+      if (result != VK_SUCCESS) {
+         nvk_descriptor_set_layout_destroy(&dev->vk, &layout->vk);
+         return result;
+      }
+   }
+
    *pSetLayout = nvk_descriptor_set_layout_to_handle(layout);
 
    return VK_SUCCESS;
diff --git a/src/nouveau/vulkan/nvk_descriptor_set_layout.h b/src/nouveau/vulkan/nvk_descriptor_set_layout.h
index b8b8ce80e95..642b11ebae0 100644
--- a/src/nouveau/vulkan/nvk_descriptor_set_layout.h
+++ b/src/nouveau/vulkan/nvk_descriptor_set_layout.h
@@ -63,6 +63,13 @@ struct nvk_descriptor_set_layout {
    /* Number of bindings in this descriptor set */
    uint32_t binding_count;
 
+   /* Address to the embedded sampler descriptor buffer.
+    *
+    * This is allocated from nvk_device::heap and has the size
+    * non_variable_descriptor_buffer_size.
+    */
+   uint64_t embedded_samplers_addr;
+
    /* Bindings in this descriptor set */
    struct nvk_descriptor_set_binding_layout binding[0];
 };