<div dir="ltr">Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>><br></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Jan 30, 2017 at 2:37 PM, Nanley Chery <span dir="ltr"><<a href="mailto:nanleychery@gmail.com" target="_blank">nanleychery@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Commit 2852efcda40274acf3272611c6a3b7<wbr>731523a72d moved the location of<br>
the depth input attachment surface state from the render pass to the<br>
image view, but failed to update the surface state location used when<br>
emitting the binding table. Fix this by loading the surface state from<br>
the correct location.<br>
<br>
Cc: "17.0" <<a href="mailto:mesa-stable@lists.freedesktop.org">mesa-stable@lists.<wbr>freedesktop.org</a>><br>
Cc: Iago Toral <<a href="mailto:itoral@igalia.com">itoral@igalia.com</a>><br>
Cc: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>><br>
Signed-off-by: Nanley Chery <<a href="mailto:nanley.g.chery@intel.com">nanley.g.chery@intel.com</a>><br>
---<br>
src/intel/vulkan/genX_cmd_<wbr>buffer.c | 12 ++++++------<br>
1 file changed, 6 insertions(+), 6 deletions(-)<br>
<br>
diff --git a/src/intel/vulkan/genX_cmd_<wbr>buffer.c b/src/intel/vulkan/genX_cmd_<wbr>buffer.c<br>
index f7894a0574..d93d377055 100644<br>
--- a/src/intel/vulkan/genX_cmd_<wbr>buffer.c<br>
+++ b/src/intel/vulkan/genX_cmd_<wbr>buffer.c<br>
@@ -1177,9 +1177,9 @@ emit_binding_table(struct anv_cmd_buffer *cmd_buffer,<br>
<br>
case VK_DESCRIPTOR_TYPE_INPUT_<wbr>ATTACHMENT:<br>
assert(stage == MESA_SHADER_FRAGMENT);<br>
- if (desc->image_view->aspect_mask == VK_IMAGE_ASPECT_STENCIL_BIT) {<br>
- /* For stencil input attachments, we treat it like any old texture<br>
- * that a user may have bound.<br>
+ if (desc->image_view->aspect_mask != VK_IMAGE_ASPECT_COLOR_BIT) {<br>
+ /* For depth and stencil input attachments, we treat it like any<br>
+ * old texture that a user may have bound.<br>
*/<br>
surface_state = desc->image_view->sampler_<wbr>surface_state;<br>
assert(surface_state.alloc_<wbr>size);<br>
@@ -1187,9 +1187,9 @@ emit_binding_table(struct anv_cmd_buffer *cmd_buffer,<br>
desc->image_view->image->aux_<wbr>usage,<br>
surface_state);<br>
} else {<br>
- /* For depth and color input attachments, we create the surface<br>
- * state at vkBeginRenderPass time so that we can include aux<br>
- * and clear color information.<br>
+ /* For color input attachments, we create the surface state at<br>
+ * vkBeginRenderPass time so that we can include aux and clear<br>
+ * color information.<br>
*/<br>
assert(binding->input_<wbr>attachment_index < subpass->input_count);<br>
const unsigned subpass_att = binding->input_attachment_<wbr>index;<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.11.0<br>
<br>
</font></span></blockquote></div><br></div>