It finally works

This commit is contained in:
Dynamitos
2024-04-23 19:11:06 +02:00
parent 80963edfd4
commit 72336aa64f
15 changed files with 31 additions and 74 deletions
-13
View File
@@ -81,14 +81,6 @@ void ShaderCompiler::compile()
layout->addDescriptorLayout(vd->getVertexDataLayout());
layout->addDescriptorLayout(vd->getInstanceDataLayout());
layout->addDescriptorLayout(mat->getDescriptorLayout());
Map<std::string, uint32> mapping;
mapping["pLightCullingData"] = 1;
mapping["pMaterial"] = 2;
mapping["pViewParams"] = 3;
mapping["pVertexData"] = 4;
mapping["pScene"] = 5;
mapping["pLightEnv"] = 6;
layout->addMapping(mapping);
permutation.setMaterial(mat->getName());
createShaders(permutation, std::move(layout));
}
@@ -98,11 +90,6 @@ void ShaderCompiler::compile()
OPipelineLayout layout = graphics->createPipelineLayout(pass.baseLayout->getName(), pass.baseLayout);
layout->addDescriptorLayout(vd->getVertexDataLayout());
layout->addDescriptorLayout(vd->getInstanceDataLayout());
Map<std::string, uint32> mapping;
mapping["pViewParams"] = 1;
mapping["pVertexData"] = 2;
mapping["pScene"] = 3;
layout->addMapping(mapping);
createShaders(permutation, std::move(layout));
}
}