mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-08-21 19:22:11 +00:00
642009261e
This is a reland of 96c4019214e0b2d7c0843eacf96398a6a1198d1f It includes a fix to add a dummy descriptor count if the VkDescriptorPool would be empty, and adds a test that a bind group with an empty bind group layout may be created and used. Original change's description: > Slab-allocate VkDescriptorSets > > This introduces a slab allocator for VkDescriptorSets which creates > a VkDescriptorPool pre-allocated with multiple VkDescriptorSets per > BindGroupLayout. In the future, we can deduplicate pools that have > the same, or roughly the same, descriptor counts. > > This CL also removes the old DescriptorSetService and moves most of > the functionality onto the DescriptorSetAllocator itself to keep > the tracking logic in one place. > > Bug: dawn:340 > Change-Id: I785b17f4353fb3d40c9ccc33746600d6794efe7c > Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/19320 > Reviewed-by: Austin Eng <enga@chromium.org> > Commit-Queue: Austin Eng <enga@chromium.org> Bug: dawn:340 Change-Id: Iabb744f110d0cab442bb857b31c87ba46bf0ad7a Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/20321 Commit-Queue: Austin Eng <enga@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org>
126 lines
5.3 KiB
C++
126 lines
5.3 KiB
C++
// Copyright 2018 The Dawn Authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
#include "dawn_native/vulkan/BindGroupVk.h"
|
|
|
|
#include "common/BitSetIterator.h"
|
|
#include "dawn_native/vulkan/BindGroupLayoutVk.h"
|
|
#include "dawn_native/vulkan/BufferVk.h"
|
|
#include "dawn_native/vulkan/DeviceVk.h"
|
|
#include "dawn_native/vulkan/FencedDeleter.h"
|
|
#include "dawn_native/vulkan/SamplerVk.h"
|
|
#include "dawn_native/vulkan/TextureVk.h"
|
|
#include "dawn_native/vulkan/VulkanError.h"
|
|
|
|
namespace dawn_native { namespace vulkan {
|
|
|
|
// static
|
|
ResultOrError<BindGroup*> BindGroup::Create(Device* device,
|
|
const BindGroupDescriptor* descriptor) {
|
|
return ToBackend(descriptor->layout)->AllocateBindGroup(device, descriptor);
|
|
}
|
|
|
|
BindGroup::BindGroup(Device* device,
|
|
const BindGroupDescriptor* descriptor,
|
|
DescriptorSetAllocation descriptorSetAllocation)
|
|
: BindGroupBase(this, device, descriptor),
|
|
mDescriptorSetAllocation(descriptorSetAllocation) {
|
|
// Now do a write of a single descriptor set with all possible chained data allocated on the
|
|
// stack.
|
|
uint32_t numWrites = 0;
|
|
std::array<VkWriteDescriptorSet, kMaxBindingsPerGroup> writes;
|
|
std::array<VkDescriptorBufferInfo, kMaxBindingsPerGroup> writeBufferInfo;
|
|
std::array<VkDescriptorImageInfo, kMaxBindingsPerGroup> writeImageInfo;
|
|
|
|
for (const auto& it : GetLayout()->GetBindingMap()) {
|
|
BindingNumber bindingNumber = it.first;
|
|
BindingIndex bindingIndex = it.second;
|
|
const BindingInfo& bindingInfo = GetLayout()->GetBindingInfo(bindingIndex);
|
|
|
|
auto& write = writes[numWrites];
|
|
write.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
|
|
write.pNext = nullptr;
|
|
write.dstSet = GetHandle();
|
|
write.dstBinding = bindingNumber;
|
|
write.dstArrayElement = 0;
|
|
write.descriptorCount = 1;
|
|
write.descriptorType =
|
|
VulkanDescriptorType(bindingInfo.type, bindingInfo.hasDynamicOffset);
|
|
|
|
switch (bindingInfo.type) {
|
|
case wgpu::BindingType::UniformBuffer:
|
|
case wgpu::BindingType::StorageBuffer:
|
|
case wgpu::BindingType::ReadonlyStorageBuffer: {
|
|
BufferBinding binding = GetBindingAsBufferBinding(bindingIndex);
|
|
|
|
writeBufferInfo[numWrites].buffer = ToBackend(binding.buffer)->GetHandle();
|
|
writeBufferInfo[numWrites].offset = binding.offset;
|
|
writeBufferInfo[numWrites].range = binding.size;
|
|
write.pBufferInfo = &writeBufferInfo[numWrites];
|
|
break;
|
|
}
|
|
|
|
case wgpu::BindingType::Sampler:
|
|
case wgpu::BindingType::ComparisonSampler: {
|
|
Sampler* sampler = ToBackend(GetBindingAsSampler(bindingIndex));
|
|
writeImageInfo[numWrites].sampler = sampler->GetHandle();
|
|
write.pImageInfo = &writeImageInfo[numWrites];
|
|
break;
|
|
}
|
|
|
|
case wgpu::BindingType::SampledTexture: {
|
|
TextureView* view = ToBackend(GetBindingAsTextureView(bindingIndex));
|
|
|
|
writeImageInfo[numWrites].imageView = view->GetHandle();
|
|
// TODO(cwallez@chromium.org): This isn't true in general: if the image has
|
|
// two read-only usages one of which is Sampled. Works for now though :)
|
|
writeImageInfo[numWrites].imageLayout =
|
|
VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
|
|
|
|
write.pImageInfo = &writeImageInfo[numWrites];
|
|
break;
|
|
}
|
|
|
|
case wgpu::BindingType::ReadonlyStorageTexture:
|
|
case wgpu::BindingType::WriteonlyStorageTexture: {
|
|
TextureView* view = ToBackend(GetBindingAsTextureView(bindingIndex));
|
|
|
|
writeImageInfo[numWrites].imageView = view->GetHandle();
|
|
writeImageInfo[numWrites].imageLayout = VK_IMAGE_LAYOUT_GENERAL;
|
|
|
|
write.pImageInfo = &writeImageInfo[numWrites];
|
|
break;
|
|
}
|
|
default:
|
|
UNREACHABLE();
|
|
}
|
|
|
|
numWrites++;
|
|
}
|
|
|
|
// TODO(cwallez@chromium.org): Batch these updates
|
|
device->fn.UpdateDescriptorSets(device->GetVkDevice(), numWrites, writes.data(), 0,
|
|
nullptr);
|
|
}
|
|
|
|
BindGroup::~BindGroup() {
|
|
ToBackend(GetLayout())->DeallocateBindGroup(this, &mDescriptorSetAllocation);
|
|
}
|
|
|
|
VkDescriptorSet BindGroup::GetHandle() const {
|
|
return mDescriptorSetAllocation.set;
|
|
}
|
|
|
|
}} // namespace dawn_native::vulkan
|