OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dzn: Descriptor limits are based on binding tier, not heap tier

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20823>
This commit is contained in:
Jesse Natalie
2023-01-20 10:11:42 -08:00
committed by Marge Bot
parent 9f13a4a10a
commit 884d870929
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/microsoft/vulkan/dzn_device.c
View File

@@ -1567,22 +1567,22 @@ dzn_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice,
.sparseAddressSpaceSize = 0, .sparseAddressSpaceSize = 0,
.maxBoundDescriptorSets = MAX_SETS, .maxBoundDescriptorSets = MAX_SETS,
.maxPerStageDescriptorSamplers = .maxPerStageDescriptorSamplers =
pdevice->options.ResourceHeapTier == D3D12_RESOURCE_HEAP_TIER_1 ? pdevice->options.ResourceBindingTier == D3D12_RESOURCE_BINDING_TIER_1 ?
16u : MAX_DESCS_PER_SAMPLER_HEAP, 16u : MAX_DESCS_PER_SAMPLER_HEAP,
.maxPerStageDescriptorUniformBuffers = .maxPerStageDescriptorUniformBuffers =
pdevice->options.ResourceHeapTier <= D3D12_RESOURCE_HEAP_TIER_2 ? pdevice->options.ResourceBindingTier <= D3D12_RESOURCE_BINDING_TIER_2 ?
14u : MAX_DESCS_PER_CBV_SRV_UAV_HEAP, 14u : MAX_DESCS_PER_CBV_SRV_UAV_HEAP,
.maxPerStageDescriptorStorageBuffers = .maxPerStageDescriptorStorageBuffers =
pdevice->options.ResourceHeapTier <= D3D12_RESOURCE_HEAP_TIER_2 ? pdevice->options.ResourceBindingTier <= D3D12_RESOURCE_BINDING_TIER_2 ?
64u : MAX_DESCS_PER_CBV_SRV_UAV_HEAP, 64u : MAX_DESCS_PER_CBV_SRV_UAV_HEAP,
.maxPerStageDescriptorSampledImages = .maxPerStageDescriptorSampledImages =
pdevice->options.ResourceHeapTier == D3D12_RESOURCE_HEAP_TIER_1 ? pdevice->options.ResourceBindingTier == D3D12_RESOURCE_BINDING_TIER_1 ?
128u : MAX_DESCS_PER_CBV_SRV_UAV_HEAP, 128u : MAX_DESCS_PER_CBV_SRV_UAV_HEAP,
.maxPerStageDescriptorStorageImages = .maxPerStageDescriptorStorageImages =
pdevice->options.ResourceHeapTier <= D3D12_RESOURCE_HEAP_TIER_2 ? pdevice->options.ResourceBindingTier <= D3D12_RESOURCE_BINDING_TIER_2 ?
64u : MAX_DESCS_PER_CBV_SRV_UAV_HEAP, 64u : MAX_DESCS_PER_CBV_SRV_UAV_HEAP,
.maxPerStageDescriptorInputAttachments = .maxPerStageDescriptorInputAttachments =
pdevice->options.ResourceHeapTier == D3D12_RESOURCE_HEAP_TIER_1 ? pdevice->options.ResourceBindingTier == D3D12_RESOURCE_BINDING_TIER_1 ?
128u : MAX_DESCS_PER_CBV_SRV_UAV_HEAP, 128u : MAX_DESCS_PER_CBV_SRV_UAV_HEAP,
.maxPerStageResources = MAX_DESCS_PER_CBV_SRV_UAV_HEAP, .maxPerStageResources = MAX_DESCS_PER_CBV_SRV_UAV_HEAP,
.maxDescriptorSetSamplers = MAX_DESCS_PER_SAMPLER_HEAP, .maxDescriptorSetSamplers = MAX_DESCS_PER_SAMPLER_HEAP,