<div dir="auto">Please fix the title to use the correct variable name. Otherwise r-b</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Jun 12, 2019, 11:44 AM Samuel Pitoiset <<a href="mailto:samuel.pitoiset@gmail.com">samuel.pitoiset@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Signed-off-by: Samuel Pitoiset <<a href="mailto:samuel.pitoiset@gmail.com" target="_blank" rel="noreferrer">samuel.pitoiset@gmail.com</a>><br>
---<br>
src/amd/vulkan/radv_meta_resolve.c | 2 +-<br>
src/amd/vulkan/radv_pass.c | 4 ++--<br>
src/amd/vulkan/radv_private.h | 4 ++--<br>
3 files changed, 5 insertions(+), 5 deletions(-)<br>
<br>
diff --git a/src/amd/vulkan/radv_meta_resolve.c b/src/amd/vulkan/radv_meta_resolve.c<br>
index 8c4bfa63ac7..5027bfdb93b 100644<br>
--- a/src/amd/vulkan/radv_meta_resolve.c<br>
+++ b/src/amd/vulkan/radv_meta_resolve.c<br>
@@ -621,7 +621,7 @@ radv_cmd_buffer_resolve_subpass(struct radv_cmd_buffer *cmd_buffer)<br>
struct radv_meta_saved_state saved_state;<br>
enum radv_resolve_method resolve_method = RESOLVE_HW;<br>
<br>
- if (!subpass->has_resolve)<br>
+ if (!subpass->has_color_resolve)<br>
return;<br>
<br>
for (uint32_t i = 0; i < subpass->color_count; ++i) {<br>
diff --git a/src/amd/vulkan/radv_pass.c b/src/amd/vulkan/radv_pass.c<br>
index 8fa098eaac8..728b6113206 100644<br>
--- a/src/amd/vulkan/radv_pass.c<br>
+++ b/src/amd/vulkan/radv_pass.c<br>
@@ -132,7 +132,7 @@ radv_render_pass_compile(struct radv_render_pass *pass)<br>
depth_sample_count);<br>
<br>
/* We have to handle resolve attachments specially */<br>
- subpass->has_resolve = false;<br>
+ subpass->has_color_resolve = false;<br>
if (subpass->resolve_attachments) {<br>
for (uint32_t j = 0; j < subpass->color_count; j++) {<br>
struct radv_subpass_attachment *resolve_att =<br>
@@ -141,7 +141,7 @@ radv_render_pass_compile(struct radv_render_pass *pass)<br>
if (resolve_att->attachment == VK_ATTACHMENT_UNUSED)<br>
continue;<br>
<br>
- subpass->has_resolve = true;<br>
+ subpass->has_color_resolve = true;<br>
}<br>
}<br>
}<br>
diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h<br>
index 8f2e80b3017..848fd427ef0 100644<br>
--- a/src/amd/vulkan/radv_private.h<br>
+++ b/src/amd/vulkan/radv_private.h<br>
@@ -1910,8 +1910,8 @@ struct radv_subpass {<br>
struct radv_subpass_attachment * resolve_attachments;<br>
struct radv_subpass_attachment * depth_stencil_attachment;<br>
<br>
- /** Subpass has at least one resolve attachment */<br>
- bool has_resolve;<br>
+ /** Subpass has at least one color resolve attachment */<br>
+ bool has_color_resolve;<br>
<br>
/** Subpass has at least one color attachment */<br>
bool has_color_att;<br>
-- <br>
2.22.0<br>
<br>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank" rel="noreferrer">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a></blockquote></div>