From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Tue, 8 Dec 2015 05:45:41 +0000 (-0800)
Subject: gen8/cmd_buffer: Flush push constants after descriptor sets
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f4aee5d82fedcb426e34bb0503d004d6f2e39f73;p=mesa.git

gen8/cmd_buffer: Flush push constants after descriptor sets

This is because, if storage images are used, flushing descriptor sets can
cause push constants to become dirty.
---

diff --git a/src/vulkan/gen8_cmd_buffer.c b/src/vulkan/gen8_cmd_buffer.c
index 68ee6bb5696..df97d271138 100644
--- a/src/vulkan/gen8_cmd_buffer.c
+++ b/src/vulkan/gen8_cmd_buffer.c
@@ -208,12 +208,12 @@ cmd_buffer_flush_state(struct anv_cmd_buffer *cmd_buffer)
       cmd_buffer->state.pipeline->active_stages;
 #endif
 
-   if (cmd_buffer->state.push_constants_dirty)
-      cmd_buffer_flush_push_constants(cmd_buffer);
-
    if (cmd_buffer->state.descriptors_dirty)
       gen7_cmd_buffer_flush_descriptor_sets(cmd_buffer);
 
+   if (cmd_buffer->state.push_constants_dirty)
+      cmd_buffer_flush_push_constants(cmd_buffer);
+
    if (cmd_buffer->state.dirty & ANV_CMD_DIRTY_DYNAMIC_VIEWPORT)
       gen8_cmd_buffer_emit_viewport(cmd_buffer);