Skip to content

[vulkan] Fixup colour attachment setup for render pass. #572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sarahM0 merged 4 commits into from
Jul 8, 2019
Merged

[vulkan] Fixup colour attachment setup for render pass. #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e93e6bf
[vulkan] Fixup colour attachment setup for render pass.
dj2 Jul 6, 2019
12c43b8
Update graphics_pipeline.cc
dj2 Jul 8, 2019
1bb5c12
Update graphics_pipeline.cc
dj2 Jul 8, 2019
b2cf5f6
Update graphics_pipeline.h
dj2 Jul 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 30 additions & 26 deletions src/vulkan/graphics_pipeline.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,11 +422,9 @@ Result GraphicsPipeline::CreateRenderPass() {
ref.attachment = static_cast<uint32_t>(attachment_desc.size() - 1);
ref.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
color_refer.push_back(ref);

subpass_desc.colorAttachmentCount =
static_cast<uint32_t>(color_refer.size());
subpass_desc.pColorAttachments = color_refer.data();
}
subpass_desc.colorAttachmentCount = static_cast<uint32_t>(color_refer.size());
subpass_desc.pColorAttachments = color_refer.data();

if (depth_stencil_format_.IsFormatKnown()) {
attachment_desc.push_back(kDefaultAttachmentDesc);
Expand Down Expand Up @@ -503,26 +501,31 @@ GraphicsPipeline::GetVkPipelineDepthStencilInfo(
return depthstencil_info;
}

VkPipelineColorBlendAttachmentState
std::vector<VkPipelineColorBlendAttachmentState>
GraphicsPipeline::GetVkPipelineColorBlendAttachmentState(
const PipelineData* pipeline_data) {
VkPipelineColorBlendAttachmentState colorblend_attachment =
VkPipelineColorBlendAttachmentState();
colorblend_attachment.blendEnable = pipeline_data->GetEnableBlend();
colorblend_attachment.srcColorBlendFactor =
ToVkBlendFactor(pipeline_data->GetSrcColorBlendFactor());
colorblend_attachment.dstColorBlendFactor =
ToVkBlendFactor(pipeline_data->GetDstColorBlendFactor());
colorblend_attachment.colorBlendOp =
ToVkBlendOp(pipeline_data->GetColorBlendOp());
colorblend_attachment.srcAlphaBlendFactor =
ToVkBlendFactor(pipeline_data->GetSrcAlphaBlendFactor());
colorblend_attachment.dstAlphaBlendFactor =
ToVkBlendFactor(pipeline_data->GetDstAlphaBlendFactor());
colorblend_attachment.alphaBlendOp =
ToVkBlendOp(pipeline_data->GetAlphaBlendOp());
colorblend_attachment.colorWriteMask = pipeline_data->GetColorWriteMask();
return colorblend_attachment;
std::vector<VkPipelineColorBlendAttachmentState> states;

for (size_t i = 0; i < color_buffers_.size(); ++i) {
VkPipelineColorBlendAttachmentState colorblend_attachment =
VkPipelineColorBlendAttachmentState();
colorblend_attachment.blendEnable = pipeline_data->GetEnableBlend();
colorblend_attachment.srcColorBlendFactor =
ToVkBlendFactor(pipeline_data->GetSrcColorBlendFactor());
colorblend_attachment.dstColorBlendFactor =
ToVkBlendFactor(pipeline_data->GetDstColorBlendFactor());
colorblend_attachment.colorBlendOp =
ToVkBlendOp(pipeline_data->GetColorBlendOp());
colorblend_attachment.srcAlphaBlendFactor =
ToVkBlendFactor(pipeline_data->GetSrcAlphaBlendFactor());
colorblend_attachment.dstAlphaBlendFactor =
ToVkBlendFactor(pipeline_data->GetDstAlphaBlendFactor());
colorblend_attachment.alphaBlendOp =
ToVkBlendOp(pipeline_data->GetAlphaBlendOp());
colorblend_attachment.colorWriteMask = pipeline_data->GetColorWriteMask();
states.push_back(colorblend_attachment);
}
return states;
}

Result GraphicsPipeline::CreateVkGraphicsPipeline(
Expand Down Expand Up @@ -653,16 +656,17 @@ Result GraphicsPipeline::CreateVkGraphicsPipeline(

VkPipelineColorBlendStateCreateInfo colorblend_info =
VkPipelineColorBlendStateCreateInfo();
VkPipelineColorBlendAttachmentState colorblend_attachment;

colorblend_attachment = GetVkPipelineColorBlendAttachmentState(pipeline_data);
auto colorblend_attachment =
GetVkPipelineColorBlendAttachmentState(pipeline_data);

colorblend_info.sType =
VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO;
colorblend_info.logicOpEnable = pipeline_data->GetEnableLogicOp();
colorblend_info.logicOp = ToVkLogicOp(pipeline_data->GetLogicOp());
colorblend_info.attachmentCount = 1;
colorblend_info.pAttachments = &colorblend_attachment;
colorblend_info.attachmentCount =
static_cast<uint32_t>(colorblend_attachment.size());
colorblend_info.pAttachments = colorblend_attachment.data();
pipeline_info.pColorBlendState = &colorblend_info;

pipeline_info.layout = pipeline_layout;
Expand Down
4 changes: 2 additions & 2 deletions src/vulkan/graphics_pipeline.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ class GraphicsPipeline : public Pipeline {

VkPipelineDepthStencilStateCreateInfo GetVkPipelineDepthStencilInfo(
const PipelineData* pipeline_data);
VkPipelineColorBlendAttachmentState GetVkPipelineColorBlendAttachmentState(
const PipelineData* pipeline_data);
std::vector<VkPipelineColorBlendAttachmentState>
GetVkPipelineColorBlendAttachmentState(const PipelineData* pipeline_data);

VkRenderPass render_pass_ = VK_NULL_HANDLE;
std::unique_ptr<FrameBuffer> frame_;
Expand Down