From: Nanley Chery Date: Mon, 9 Jan 2017 12:47:31 +0000 (-0800) Subject: anv: Use ::anv_attachment_state for toggling HiZ per subpass X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=168985fca1b59d345471277d5c8ce4a82cdc74f4;p=mesa.git anv: Use ::anv_attachment_state for toggling HiZ per subpass We're about to enable HiZ support for multiple subpasses. Use this field to keep track of whether or not subpass operations should treat the depth buffer as having an auxiliary HiZ buffer. Signed-off-by: Nanley Chery Reviewed-by: Jason Ekstrand --- diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index a372e6420fe..47d3322e485 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -459,7 +459,7 @@ genX(cmd_buffer_setup_attachments)(struct anv_cmd_buffer *cmd_buffer, state->attachments[i].aux_usage, state->attachments[i].color_rt_state); } else { - state->attachments[i].aux_usage = ISL_AUX_USAGE_NONE; + state->attachments[i].aux_usage = iview->image->aux_usage; state->attachments[i].input_aux_usage = ISL_AUX_USAGE_NONE; } @@ -2087,7 +2087,9 @@ cmd_buffer_emit_depth_stencil(struct anv_cmd_buffer *cmd_buffer) anv_cmd_buffer_get_depth_stencil_view(cmd_buffer); const struct anv_image *image = iview ? iview->image : NULL; const bool has_depth = image && (image->aspects & VK_IMAGE_ASPECT_DEPTH_BIT); - const bool has_hiz = image != NULL && image->aux_usage == ISL_AUX_USAGE_HIZ; + const uint32_t ds = cmd_buffer->state.subpass->depth_stencil_attachment; + const bool has_hiz = image != NULL && + cmd_buffer->state.attachments[ds].aux_usage == ISL_AUX_USAGE_HIZ; const bool has_stencil = image && (image->aspects & VK_IMAGE_ASPECT_STENCIL_BIT);