projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ac,radv: remove the vec3 restriction with LLVM 9+
[mesa.git]
/
src
/
amd
/
vulkan
/
radv_meta_resolve_fs.c
diff --git
a/src/amd/vulkan/radv_meta_resolve_fs.c
b/src/amd/vulkan/radv_meta_resolve_fs.c
index af4a6fe7a66be032d806d0c8af96f3eb6092f11a..9f20f6753e2d0ebfaaddab50cb23afe069b6fb86 100644
(file)
--- a/
src/amd/vulkan/radv_meta_resolve_fs.c
+++ b/
src/amd/vulkan/radv_meta_resolve_fs.c
@@
-232,8
+232,8
@@
create_resolve_pipeline(struct radv_device *device,
.attachment = VK_ATTACHMENT_UNUSED,
.layout = VK_IMAGE_LAYOUT_GENERAL,
},
.attachment = VK_ATTACHMENT_UNUSED,
.layout = VK_IMAGE_LAYOUT_GENERAL,
},
- .preserveAttachmentCount =
1
,
- .pPreserveAttachments =
(uint32_t[]) { 0 }
,
+ .preserveAttachmentCount =
0
,
+ .pPreserveAttachments =
NULL
,
},
.dependencyCount = 0,
}, &device->meta_state.alloc, rp + dst_layout);
},
.dependencyCount = 0,
}, &device->meta_state.alloc, rp + dst_layout);
@@
-610,8
+610,7
@@
radv_cmd_buffer_resolve_subpass_fs(struct radv_cmd_buffer *cmd_buffer)
struct radv_subpass_attachment src_att = subpass->color_attachments[i];
struct radv_subpass_attachment dest_att = subpass->resolve_attachments[i];
struct radv_subpass_attachment src_att = subpass->color_attachments[i];
struct radv_subpass_attachment dest_att = subpass->resolve_attachments[i];
- if (src_att.attachment == VK_ATTACHMENT_UNUSED ||
- dest_att.attachment == VK_ATTACHMENT_UNUSED)
+ if (dest_att.attachment == VK_ATTACHMENT_UNUSED)
continue;
struct radv_image_view *dest_iview = cmd_buffer->state.framebuffer->attachments[dest_att.attachment].attachment;
continue;
struct radv_image_view *dest_iview = cmd_buffer->state.framebuffer->attachments[dest_att.attachment].attachment;
@@
-620,10
+619,10
@@
radv_cmd_buffer_resolve_subpass_fs(struct radv_cmd_buffer *cmd_buffer)
struct radv_subpass resolve_subpass = {
.color_count = 1,
.color_attachments = (struct radv_subpass_attachment[]) { dest_att },
struct radv_subpass resolve_subpass = {
.color_count = 1,
.color_attachments = (struct radv_subpass_attachment[]) { dest_att },
- .depth_stencil_attachment =
{ .attachment = VK_ATTACHMENT_UNUSED }
,
+ .depth_stencil_attachment =
NULL
,
};
};
- radv_cmd_buffer_set_subpass(cmd_buffer, &resolve_subpass
, false
);
+ radv_cmd_buffer_set_subpass(cmd_buffer, &resolve_subpass);
emit_resolve(cmd_buffer,
src_iview,
emit_resolve(cmd_buffer,
src_iview,
@@
-633,6
+632,7
@@
radv_cmd_buffer_resolve_subpass_fs(struct radv_cmd_buffer *cmd_buffer)
&(VkExtent2D) { fb->width, fb->height });
}
&(VkExtent2D) { fb->width, fb->height });
}
- cmd_buffer->state.subpass = subpass;
+ radv_cmd_buffer_set_subpass(cmd_buffer, subpass);
+
radv_meta_restore(&saved_state, cmd_buffer);
}
radv_meta_restore(&saved_state, cmd_buffer);
}