From: Kristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Date: Thu, 21 Jan 2016 21:52:41 +0000 (-0800)
Subject: vk: Emit surface state base address before renderpass
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9eab8fc6834bc3b71b0ac477d09252bfac22c605;p=mesa.git

vk: Emit surface state base address before renderpass

If we're continuing a render pass, make sure we don't emit the depth and
stencil buffer addresses before we set the state base addresses.

Fixes crucible func.cmd-buffer.small-secondaries
---

diff --git a/src/vulkan/anv_cmd_buffer.c b/src/vulkan/anv_cmd_buffer.c
index 070b8490e32..4591dd95fec 100644
--- a/src/vulkan/anv_cmd_buffer.c
+++ b/src/vulkan/anv_cmd_buffer.c
@@ -376,6 +376,8 @@ VkResult anv_BeginCommandBuffer(
    assert(cmd_buffer->level == VK_COMMAND_BUFFER_LEVEL_SECONDARY ||
           !(cmd_buffer->usage_flags & VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT));
 
+   anv_cmd_buffer_emit_state_base_address(cmd_buffer);
+
    if (cmd_buffer->usage_flags &
        VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT) {
       cmd_buffer->state.framebuffer =
@@ -389,8 +391,6 @@ VkResult anv_BeginCommandBuffer(
       anv_cmd_buffer_set_subpass(cmd_buffer, subpass);
    }
 
-   anv_cmd_buffer_emit_state_base_address(cmd_buffer);
-
    return VK_SUCCESS;
 }