Skip to content
Snippets Groups Projects
Commit 25c34347 authored by Alexander Gauggel's avatar Alexander Gauggel
Browse files

[#70] Fix project after merge

parent 471fb541
No related branches found
No related tags found
1 merge request!57Resolve "Basic voxelization"
Pipeline #25598 passed
......@@ -204,9 +204,7 @@ int main(int argc, const char** argv) {
vkcv::AttachmentDescription(vkcv::AttachmentOperation::DONT_CARE, vkcv::AttachmentOperation::DONT_CARE, voxelizationDummyFormat)});
vkcv::PassHandle voxelizationPass = core.createPass(voxelizationPassConfig);
std::vector<vkcv::DescriptorBinding> voxelizationDescriptorBindings = {
vkcv::DescriptorBinding(vkcv::DescriptorType::IMAGE_STORAGE, 1, vkcv::ShaderStage::FRAGMENT),
vkcv::DescriptorBinding(vkcv::DescriptorType::UNIFORM_BUFFER, 1, vkcv::ShaderStage::FRAGMENT)};
std::vector<vkcv::DescriptorBinding> voxelizationDescriptorBindings = { voxelizationShader.getReflectedDescriptors()[0] };
vkcv::DescriptorSetHandle voxelizationDescriptorSet = core.createDescriptorSet(voxelizationDescriptorBindings);
const vkcv::PipelineConfig voxelizationPipeConfig(
......@@ -244,9 +242,7 @@ int main(int argc, const char** argv) {
voxelVisualisationShader.reflectShader(vkcv::ShaderStage::GEOMETRY);
voxelVisualisationShader.reflectShader(vkcv::ShaderStage::FRAGMENT);
const std::vector<vkcv::DescriptorBinding> voxelVisualisationDescriptorBindings = {
vkcv::DescriptorBinding(vkcv::DescriptorType::IMAGE_STORAGE, 1, vkcv::ShaderStage::VERTEX),
vkcv::DescriptorBinding(vkcv::DescriptorType::UNIFORM_BUFFER, 1, vkcv::ShaderStage::VERTEX) };
const std::vector<vkcv::DescriptorBinding> voxelVisualisationDescriptorBindings = { voxelVisualisationShader.getReflectedDescriptors()[0] };
vkcv::DescriptorSetHandle voxelVisualisationDescriptorSet = core.createDescriptorSet(voxelVisualisationDescriptorBindings);
const vkcv::AttachmentDescription voxelVisualisationColorAttachments(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment