From: Kristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Date: Fri, 12 Jun 2015 04:57:43 +0000 (-0700)
Subject: vk: Use compute pipeline layout when binding compute sets
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fbc9fe3c92580208896d2799f117f23d477896f7;p=mesa.git

vk: Use compute pipeline layout when binding compute sets
---

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];