From fbc9fe3c92580208896d2799f117f23d477896f7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg=20Kristensen?= Date: Thu, 11 Jun 2015 21:57:43 -0700 Subject: [PATCH] vk: Use compute pipeline layout when binding compute sets --- src/vulkan/device.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/vulkan/device.c b/src/vulkan/device.c index b27bd6d765b..0126b248233 100644 --- a/src/vulkan/device.c +++ b/src/vulkan/device.c @@ -2761,12 +2761,17 @@ void anv_CmdBindDescriptorSets( const uint32_t* pDynamicOffsets) { struct anv_cmd_buffer *cmd_buffer = (struct anv_cmd_buffer *) cmdBuffer; - struct anv_pipeline_layout *layout = cmd_buffer->pipeline->layout; + struct anv_pipeline_layout *layout; struct anv_descriptor_set *set; struct anv_descriptor_set_layout *set_layout; assert(firstSet + setCount < MAX_SETS); + if (pipelineBindPoint == VK_PIPELINE_BIND_POINT_GRAPHICS) + layout = cmd_buffer->pipeline->layout; + else + layout = cmd_buffer->compute_pipeline->layout; + uint32_t dynamic_slot = 0; for (uint32_t i = 0; i < setCount; i++) { set = (struct anv_descriptor_set *) pDescriptorSets[i]; -- 2.30.2