Skip to content

Commit 027f38d

Browse files
zeuxzeux
committed
Add most of the remaining descriptor heap scaffolding
We now support buffers as well as acceleration structures via DescriptorInfo; for samplers, for now we map them via constant offset (which maps all samplers to index 0... a problem to figure out later!) Also map descriptor set 1 to descriptor heap 1-1; this takes care of the bindless texture array.
1 parent 84639ec commit 027f38d

File tree

2 files changed

+90
-26
lines changed

2 files changed

+90
-26
lines changed

‎src/niagara.cpp‎

Lines changed: 60 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -134,28 +134,60 @@ void pushDescriptors(VkCommandBuffer commandBuffer, FrameDescriptors& framedesc,
134134
#if VK_EXT_descriptor_heap
135135
assert(framedesc.descriptorOffset + program.pushDescriptorCount <= framedesc.descriptorOffsetEnd);
136136

137+
uint32_t descriptorOffset = framedesc.descriptorOffset;
138+
VkPushDataInfoEXT pushDataInfo = { VK_STRUCTURE_TYPE_PUSH_DATA_INFO_EXT };
139+
pushDataInfo.offset = program.pushConstantSize;
140+
pushDataInfo.data.address = &descriptorOffset;
141+
pushDataInfo.data.size = sizeof(descriptorOffset);
142+
143+
vkCmdPushDataEXT(commandBuffer, &pushDataInfo);
144+
137145
for (int i = 0; i < 32; ++i)
138146
if (program.resourceMask & (1 << i))
139147
{
140148
const DescriptorInfo& info = descriptors[i];
141149

142-
assert(program.resourceTypes[i] == VK_DESCRIPTOR_TYPE_STORAGE_IMAGE || program.resourceTypes[i] == VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE);
143-
assert(info.resource);
144-
145-
const Image* image = static_cast<const Image*>(info.resource);
146150
char descriptor[128];
147-
getDescriptor(framedesc.device, image->image, image->format, 0, VK_REMAINING_MIP_LEVELS, program.resourceTypes[i], descriptor, framedesc.descriptorSize);
148151

149-
memcpy(static_cast<char*>(framedesc.descriptorHeap) + (framedesc.descriptorOffset + i) * framedesc.descriptorSize, descriptor, framedesc.descriptorSize);
150-
}
152+
switch (program.resourceTypes[i])
153+
{
154+
case VK_DESCRIPTOR_TYPE_SAMPLER:
155+
{
156+
// mapped via constant offsets... sloppily
157+
continue;
158+
}
159+
case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE:
160+
case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE:
161+
{
162+
const Image* image = static_cast<const Image*>(info.resource);
163+
assert(image);
164+
getDescriptor(framedesc.device, image->image, image->format, 0, VK_REMAINING_MIP_LEVELS, program.resourceTypes[i], descriptor, framedesc.descriptorSize);
165+
break;
166+
}
151167

152-
uint32_t descriptorOffset = framedesc.descriptorOffset;
153-
VkPushDataInfoEXT pushDataInfo = { VK_STRUCTURE_TYPE_PUSH_DATA_INFO_EXT };
154-
pushDataInfo.offset = program.pushConstantSize;
155-
pushDataInfo.data.address = &descriptorOffset;
156-
pushDataInfo.data.size = sizeof(descriptorOffset);
168+
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER:
169+
case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER:
170+
{
171+
const Buffer* buffer = static_cast<const Buffer*>(info.resource);
172+
assert(buffer);
173+
getDescriptor(framedesc.device, buffer->address, buffer->size, program.resourceTypes[i], descriptor, framedesc.descriptorSize);
174+
break;
175+
}
157176

158-
vkCmdPushDataEXT(commandBuffer, &pushDataInfo);
177+
case VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR:
178+
{
179+
VkAccelerationStructureDeviceAddressInfoKHR addressInfo = { VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_DEVICE_ADDRESS_INFO_KHR };
180+
addressInfo.accelerationStructure = info.accelerationStructure;
181+
VkDeviceAddress address = vkGetAccelerationStructureDeviceAddressKHR(framedesc.device, &addressInfo);
182+
getDescriptor(framedesc.device, address, 0, program.resourceTypes[i], descriptor, framedesc.descriptorSize);
183+
break;
184+
}
185+
default:
186+
assert(!"Unsupported descriptor type");
187+
}
188+
189+
memcpy(static_cast<char*>(framedesc.descriptorHeap) + (framedesc.descriptorOffset + i) * framedesc.descriptorSize, descriptor, framedesc.descriptorSize);
190+
}
159191

160192
framedesc.descriptorOffset += program.pushDescriptorCount;
161193
#endif
@@ -581,7 +613,7 @@ int main(int argc, const char** argv)
581613
Program shadowblurProgram = {};
582614
if (raytracingSupported)
583615
{
584-
shadowProgram = createProgram(device, VK_PIPELINE_BIND_POINT_COMPUTE, { &shaders["shadow.comp"] }, sizeof(ShadowData), false, textureSetLayout);
616+
shadowProgram = createProgram(device, VK_PIPELINE_BIND_POINT_COMPUTE, { &shaders["shadow.comp"] }, sizeof(ShadowData), 0, textureSetLayout);
585617
shadowfillProgram = createProgram(device, VK_PIPELINE_BIND_POINT_COMPUTE, { &shaders["shadowfill.comp"] }, sizeof(vec4));
586618
shadowblurProgram = createProgram(device, VK_PIPELINE_BIND_POINT_COMPUTE, { &shaders["shadowblur.comp"] }, sizeof(vec4));
587619
}
@@ -705,6 +737,12 @@ int main(int argc, const char** argv)
705737

706738
createBuffer(resourceHeap, device, memoryProperties, resourceDescriptorCount * resourceDescriptorSize + descheapProperties.minResourceHeapReservedRange, VK_BUFFER_USAGE_DESCRIPTOR_HEAP_BIT_EXT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT);
707739
createBuffer(samplerHeap, device, memoryProperties, DESCRIPTOR_LIMIT_SAMPLERS * descheapProperties.samplerDescriptorSize + descheapProperties.minSamplerHeapReservedRange, VK_BUFFER_USAGE_DESCRIPTOR_HEAP_BIT_EXT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT);
740+
741+
// fill sampler[0] with texture sampler and sampler[1] with depth sampler
742+
getDescriptor(device, VK_FILTER_LINEAR, VK_SAMPLER_MIPMAP_MODE_LINEAR, VK_SAMPLER_ADDRESS_MODE_REPEAT, VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE,
743+
static_cast<char*>(samplerHeap.data) + 0 * descheapProperties.samplerDescriptorSize, descheapProperties.samplerDescriptorSize);
744+
getDescriptor(device, VK_FILTER_LINEAR, VK_SAMPLER_MIPMAP_MODE_NEAREST, VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE, VK_SAMPLER_REDUCTION_MODE_MIN,
745+
static_cast<char*>(samplerHeap.data) + 1 * descheapProperties.samplerDescriptorSize, descheapProperties.samplerDescriptorSize);
708746
}
709747
#endif
710748

@@ -1470,7 +1508,8 @@ int main(int argc, const char** argv)
14701508
DescriptorInfo descriptors[] = { dcb, db, mlb, mdb, vb, cib, DescriptorInfo(), textureSampler, mtb };
14711509
pushDescriptors(commandBuffer, framedesc, clusterProgram, descriptors);
14721510

1473-
vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, clusterProgram.layout, 1, 1, &textureSet.second, 0, nullptr);
1511+
if (!clusterProgram.descriptorSize)
1512+
vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, clusterProgram.layout, 1, 1, &textureSet.second, 0, nullptr);
14741513

14751514
pushConstants(commandBuffer, framedesc, clusterProgram, passGlobals);
14761515
vkCmdDrawMeshTasksIndirectEXT(commandBuffer, ccb.buffer, 4, 1, 0);
@@ -1483,7 +1522,8 @@ int main(int argc, const char** argv)
14831522
DescriptorInfo descriptors[] = { dcb, db, mlb, mdb, vb, mvb, depthPyramid, textureSampler, mtb, depthSampler };
14841523
pushDescriptors(commandBuffer, framedesc, meshtaskProgram, descriptors);
14851524

1486-
vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, meshtaskProgram.layout, 1, 1, &textureSet.second, 0, nullptr);
1525+
if (!meshtaskProgram.descriptorSize)
1526+
vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, meshtaskProgram.layout, 1, 1, &textureSet.second, 0, nullptr);
14871527

14881528
pushConstants(commandBuffer, framedesc, meshtaskProgram, passGlobals);
14891529
vkCmdDrawMeshTasksIndirectEXT(commandBuffer, dccb.buffer, 4, 1, 0);
@@ -1495,7 +1535,8 @@ int main(int argc, const char** argv)
14951535
DescriptorInfo descriptors[] = { dcb, db, vb, DescriptorInfo(), DescriptorInfo(), DescriptorInfo(), DescriptorInfo(), textureSampler, mtb };
14961536
pushDescriptors(commandBuffer, framedesc, meshProgram, descriptors);
14971537

1498-
vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, meshProgram.layout, 1, 1, &textureSet.second, 0, nullptr);
1538+
if (!meshProgram.descriptorSize)
1539+
vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, meshProgram.layout, 1, 1, &textureSet.second, 0, nullptr);
14991540

15001541
vkCmdBindIndexBuffer(commandBuffer, ib.buffer, 0, VK_INDEX_TYPE_UINT32);
15011542

@@ -1589,7 +1630,8 @@ int main(int argc, const char** argv)
15891630
{
15901631
vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_COMPUTE, shadowQuality == 0 ? shadowlqPipeline : shadowhqPipeline);
15911632

1592-
vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_COMPUTE, shadowProgram.layout, 1, 1, &textureSet.second, 0, nullptr);
1633+
if (!shadowProgram.descriptorSize)
1634+
vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_COMPUTE, shadowProgram.layout, 1, 1, &textureSet.second, 0, nullptr);
15931635

15941636
DescriptorInfo descriptors[] = { shadowTarget, depthTarget, tlas, db, mb, mtb, vb, ib, textureSampler };
15951637

‎src/shaders.cpp‎

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -406,25 +406,47 @@ static VkDescriptorUpdateTemplate createUpdateTemplate(VkDevice device, VkPipeli
406406
}
407407

408408
#if VK_EXT_descriptor_heap
409-
static VkShaderDescriptorSetAndBindingMappingInfoEXT generateHeapMapping(uint32_t resourceMask, const VkDescriptorType resourceTypes[32], size_t pushConstantSize, size_t descriptorSize, VkDescriptorSetAndBindingMappingEXT mappings[32])
409+
static VkShaderDescriptorSetAndBindingMappingInfoEXT generateHeapMapping(uint32_t resourceMask, const VkDescriptorType (&resourceTypes)[32], size_t pushConstantSize, size_t descriptorSize, VkDescriptorSetAndBindingMappingEXT (&mappings)[33])
410410
{
411411
uint32_t mappingOffset = 0;
412412

413+
// push descriptors
413414
for (uint32_t i = 0; i < 32; ++i)
414415
if (resourceMask & (1 << i))
415416
{
416417
VkDescriptorSetAndBindingMappingEXT& mapping = mappings[mappingOffset++];
417418
mapping.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_AND_BINDING_MAPPING_EXT;
419+
mapping.descriptorSet = 0;
418420
mapping.firstBinding = i;
419421
mapping.bindingCount = 1;
420422
mapping.resourceMask = VK_SPIRV_RESOURCE_TYPE_ALL_EXT;
421-
mapping.source = VK_DESCRIPTOR_MAPPING_SOURCE_HEAP_WITH_PUSH_INDEX_EXT;
422-
mapping.sourceData.pushIndex.heapOffset = i * descriptorSize;
423-
mapping.sourceData.pushIndex.pushOffset = pushConstantSize;
424-
mapping.sourceData.pushIndex.heapIndexStride = descriptorSize;
425-
mapping.sourceData.pushIndex.heapArrayStride = descriptorSize;
423+
424+
if (resourceTypes[i] == VK_DESCRIPTOR_TYPE_SAMPLER)
425+
{
426+
mapping.source = VK_DESCRIPTOR_MAPPING_SOURCE_HEAP_WITH_CONSTANT_OFFSET_EXT;
427+
}
428+
else
429+
{
430+
mapping.source = VK_DESCRIPTOR_MAPPING_SOURCE_HEAP_WITH_PUSH_INDEX_EXT;
431+
mapping.sourceData.pushIndex.heapOffset = i * descriptorSize;
432+
mapping.sourceData.pushIndex.pushOffset = pushConstantSize;
433+
mapping.sourceData.pushIndex.heapIndexStride = descriptorSize;
434+
mapping.sourceData.pushIndex.heapArrayStride = descriptorSize;
435+
}
426436
}
427437

438+
// texture array descriptor
439+
{
440+
VkDescriptorSetAndBindingMappingEXT& mapping = mappings[mappingOffset++];
441+
mapping.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_AND_BINDING_MAPPING_EXT;
442+
mapping.descriptorSet = 1;
443+
mapping.firstBinding = 0;
444+
mapping.bindingCount = 1;
445+
mapping.resourceMask = VK_SPIRV_RESOURCE_TYPE_ALL_EXT;
446+
mapping.source = VK_DESCRIPTOR_MAPPING_SOURCE_HEAP_WITH_CONSTANT_OFFSET_EXT;
447+
mapping.sourceData.constantOffset.heapArrayStride = descriptorSize;
448+
}
449+
428450
VkShaderDescriptorSetAndBindingMappingInfoEXT result = { VK_STRUCTURE_TYPE_SHADER_DESCRIPTOR_SET_AND_BINDING_MAPPING_INFO_EXT };
429451
result.mappingCount = mappingOffset;
430452
result.pMappings = mappings;
@@ -572,7 +594,7 @@ VkPipeline createGraphicsPipeline(VkDevice device, VkPipelineCache pipelineCache
572594

573595
#if VK_EXT_descriptor_heap
574596
VkShaderDescriptorSetAndBindingMappingInfoEXT heapMapping = {};
575-
VkDescriptorSetAndBindingMappingEXT heapMappingTable[32] = {};
597+
VkDescriptorSetAndBindingMappingEXT heapMappingTable[33] = {};
576598

577599
if (program.descriptorSize)
578600
{
@@ -709,7 +731,7 @@ VkPipeline createComputePipeline(VkDevice device, VkPipelineCache pipelineCache,
709731

710732
#if VK_EXT_descriptor_heap
711733
VkShaderDescriptorSetAndBindingMappingInfoEXT heapMapping = {};
712-
VkDescriptorSetAndBindingMappingEXT heapMappingTable[32] = {};
734+
VkDescriptorSetAndBindingMappingEXT heapMappingTable[33] = {};
713735

714736
if (program.descriptorSize)
715737
{

0 commit comments

Comments
 (0)