Skip to content
Snippets Groups Projects

Resolve "Shader Program Class"

Merged Mark Oliver Mints requested to merge 10-shader-program-class into develop
5 unresolved threads
1 file
+ 11
9
Compare changes
  • Side-by-side
  • Inline
+ 11
9
@@ -575,6 +575,7 @@ namespace vkcv
@@ -575,6 +575,7 @@ namespace vkcv
std::vector<vk::AttachmentReference> colorAttachmentReferences{};
std::vector<vk::AttachmentReference> colorAttachmentReferences{};
// individual reference to depth attachment (of a subpass)
// individual reference to depth attachment (of a subpass)
vk::AttachmentReference depthAttachmentReference{};
vk::AttachmentReference depthAttachmentReference{};
 
vk::AttachmentReference *pDepthAttachment = nullptr; //stays nullptr if no depth attachment used
for(uint32_t i = 0; i < pass.attachments.size(); i++)
for(uint32_t i = 0; i < pass.attachments.size(); i++)
{
{
@@ -587,6 +588,7 @@ namespace vkcv
@@ -587,6 +588,7 @@ namespace vkcv
depthAttachmentReference.attachment = i;
depthAttachmentReference.attachment = i;
depthAttachmentReference.layout = getVkLayoutFromAttachLayout(pass.attachments[i].layout_in_pass);
depthAttachmentReference.layout = getVkLayoutFromAttachLayout(pass.attachments[i].layout_in_pass);
 
pDepthAttachment = &depthAttachmentReference;
}
}
else
else
{
{
@@ -608,15 +610,15 @@ namespace vkcv
@@ -608,15 +610,15 @@ namespace vkcv
}
}
vk::SubpassDescription subpassDescription({},
vk::SubpassDescription subpassDescription({},
vk::PipelineBindPoint::eGraphics,
vk::PipelineBindPoint::eGraphics,
0,
0,
{},
{},
static_cast<uint32_t>(colorAttachmentReferences.size()),
static_cast<uint32_t>(colorAttachmentReferences.size()),
colorAttachmentReferences.data(),
colorAttachmentReferences.data(),
{},
{},
&depthAttachmentReference,
pDepthAttachment,
0,
0,
{});
{});
vk::RenderPassCreateInfo passInfo({},
vk::RenderPassCreateInfo passInfo({},
static_cast<uint32_t>(attachmentDescriptions.size()),
static_cast<uint32_t>(attachmentDescriptions.size()),
Loading