Group descriptor sets by binding frequency (#2892)
This commit is contained in:
@@ -405,81 +405,20 @@ bool Drawable::bindAttributes(CommandEncoder& encoder) const noexcept {
|
||||
bool Drawable::bindDescriptors(CommandEncoder& encoder) const noexcept {
|
||||
if (!shader) return false;
|
||||
|
||||
auto& context = encoder.getContext();
|
||||
const auto& device = context.getBackend().getDevice();
|
||||
const auto& descriptorPool = context.getCurrentDescriptorPool();
|
||||
const auto& descriptorSetLayouts = context.getDescriptorSetLayouts();
|
||||
// bind uniforms
|
||||
impl->uniformBuffers.bindDescriptorSets(encoder);
|
||||
|
||||
const auto descriptorAllocInfo =
|
||||
vk::DescriptorSetAllocateInfo().setDescriptorPool(*descriptorPool).setSetLayouts(descriptorSetLayouts);
|
||||
|
||||
const auto& drawableDescriptorSets = device->allocateDescriptorSets(descriptorAllocInfo);
|
||||
const auto& uniformDescriptorSet = drawableDescriptorSets[0];
|
||||
|
||||
const auto updateUniformDescriptors = [&](const auto& buffer, bool fillGaps) {
|
||||
for (size_t id = 0; id < buffer.allocatedSize(); ++id) {
|
||||
vk::DescriptorBufferInfo descriptorBufferInfo;
|
||||
|
||||
if (const auto& uniformBuffer = buffer.get(id)) {
|
||||
const auto& uniformBufferImpl = static_cast<const UniformBuffer&>(*uniformBuffer);
|
||||
const auto& bufferResource = uniformBufferImpl.getBufferResource();
|
||||
descriptorBufferInfo.setBuffer(bufferResource.getVulkanBuffer())
|
||||
.setOffset(bufferResource.getVulkanBufferOffset())
|
||||
.setRange(bufferResource.getSizeInBytes());
|
||||
} else if (fillGaps) {
|
||||
descriptorBufferInfo.setBuffer(context.getDummyUniformBuffer()->getVulkanBuffer())
|
||||
.setOffset(0)
|
||||
.setRange(VK_WHOLE_SIZE);
|
||||
} else {
|
||||
continue;
|
||||
}
|
||||
|
||||
const auto writeDescriptorSet = vk::WriteDescriptorSet()
|
||||
.setBufferInfo(descriptorBufferInfo)
|
||||
.setDescriptorCount(1)
|
||||
.setDescriptorType(vk::DescriptorType::eUniformBuffer)
|
||||
.setDstBinding(static_cast<uint32_t>(id))
|
||||
.setDstSet(uniformDescriptorSet);
|
||||
|
||||
device->updateDescriptorSets(writeDescriptorSet, nullptr);
|
||||
const auto& shaderImpl = static_cast<const mbgl::vulkan::ShaderProgram&>(*shader);
|
||||
if (shaderImpl.hasTextures()) {
|
||||
// update image set
|
||||
if (!impl->imageDescriptorSet) {
|
||||
impl->imageDescriptorSet = std::make_unique<ImageDescriptorSet>(encoder.getContext());
|
||||
}
|
||||
};
|
||||
const auto& globalUniforms = context.getGlobalUniformBuffers();
|
||||
for (size_t i = 0; i < globalUniforms.allocatedSize(); ++i) {
|
||||
if (globalUniforms.get(i)) impl->uniformBuffers.set(i, globalUniforms.get(i));
|
||||
|
||||
impl->imageDescriptorSet->update(textures);
|
||||
impl->imageDescriptorSet->bind(encoder);
|
||||
}
|
||||
|
||||
updateUniformDescriptors(getUniformBuffers(), true);
|
||||
|
||||
if (drawableDescriptorSets.size() >= 2) {
|
||||
const auto& imageDescriptorSet = drawableDescriptorSets[1];
|
||||
|
||||
for (size_t id = 0; id < shaders::maxTextureCountPerShader; ++id) {
|
||||
const auto& texture = id < textures.size() ? textures[id] : nullptr;
|
||||
auto& textureImpl = texture ? static_cast<Texture2D&>(*texture) : *context.getDummyTexture();
|
||||
|
||||
const auto descriptorImageInfo = vk::DescriptorImageInfo()
|
||||
.setImageLayout(textureImpl.getVulkanImageLayout())
|
||||
.setImageView(textureImpl.getVulkanImageView().get())
|
||||
.setSampler(textureImpl.getVulkanSampler());
|
||||
|
||||
const auto writeDescriptorSet = vk::WriteDescriptorSet()
|
||||
.setImageInfo(descriptorImageInfo)
|
||||
.setDescriptorCount(1)
|
||||
.setDescriptorType(vk::DescriptorType::eCombinedImageSampler)
|
||||
.setDstBinding(static_cast<uint32_t>(id))
|
||||
.setDstSet(imageDescriptorSet);
|
||||
|
||||
device->updateDescriptorSets(writeDescriptorSet, nullptr);
|
||||
}
|
||||
}
|
||||
|
||||
if (drawableDescriptorSets.empty()) return true;
|
||||
|
||||
const auto& commandBuffer = encoder.getCommandBuffer();
|
||||
commandBuffer->bindDescriptorSets(
|
||||
vk::PipelineBindPoint::eGraphics, context.getGeneralPipelineLayout().get(), 0, drawableDescriptorSets, nullptr);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user