@@ -111,7 +111,9 @@ int main()
111
111
const auto swapchainImageUsage = static_cast <asset::IImage::E_USAGE_FLAGS>(asset::IImage::EUF_COLOR_ATTACHMENT_BIT | asset::IImage::EUF_TRANSFER_DST_BIT);
112
112
const video::ISurface::SFormat surfaceFormat;
113
113
114
- auto initOutput = CommonAPI::Init (
114
+ CommonAPI::InitOutput initOutput;
115
+ CommonAPI::Init (
116
+ initOutput,
115
117
video::EAT_VULKAN,
116
118
" Compute Shader PathTracer" ,
117
119
requiredInstanceFeatures,
@@ -554,9 +556,9 @@ int main()
554
556
// cube envmap handle
555
557
{
556
558
cb->bindComputePipeline (gpuComputePipeline.get ());
557
- cb->bindDescriptorSets (EPBP_COMPUTE, gpuComputePipeline->getLayout (), 0u , 1u , &descriptorSets0[imgnum].get (), nullptr );
558
- cb->bindDescriptorSets (EPBP_COMPUTE, gpuComputePipeline->getLayout (), 1u , 1u , &uboDescriptorSet1.get (), nullptr );
559
- cb->bindDescriptorSets (EPBP_COMPUTE, gpuComputePipeline->getLayout (), 2u , 1u , &descriptorSet2.get (), nullptr );
559
+ cb->bindDescriptorSets (EPBP_COMPUTE, gpuComputePipeline->getLayout (), 0u , 1u , &descriptorSets0[imgnum].get ());
560
+ cb->bindDescriptorSets (EPBP_COMPUTE, gpuComputePipeline->getLayout (), 1u , 1u , &uboDescriptorSet1.get ());
561
+ cb->bindDescriptorSets (EPBP_COMPUTE, gpuComputePipeline->getLayout (), 2u , 1u , &descriptorSet2.get ());
560
562
cb->dispatch (dispatchInfo.workGroupCount [0 ], dispatchInfo.workGroupCount [1 ], dispatchInfo.workGroupCount [2 ]);
561
563
}
562
564
// TODO: tone mapping and stuff
@@ -627,7 +629,7 @@ int main()
627
629
imageBarriers[0 ].barrier .srcAccessMask = asset::EAF_TRANSFER_WRITE_BIT;
628
630
imageBarriers[0 ].barrier .dstAccessMask = static_cast <asset::E_ACCESS_FLAGS>(0u );
629
631
imageBarriers[0 ].oldLayout = asset::EIL_TRANSFER_DST_OPTIMAL;
630
- imageBarriers[0 ].newLayout = asset::EIL_PRESENT_SRC_KHR ;
632
+ imageBarriers[0 ].newLayout = asset::EIL_PRESENT_SRC ;
631
633
imageBarriers[0 ].srcQueueFamilyIndex = graphicsCmdPoolQueueFamIdx;
632
634
imageBarriers[0 ].dstQueueFamilyIndex = graphicsCmdPoolQueueFamIdx;
633
635
imageBarriers[0 ].image = dstImgViewCreationParams.image ;
0 commit comments