fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 11:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

dzn: Partial revert of 8887852d

Browse source 
Turns out there was a good reason for having both buffer count
and desc_count. They served different purposes.

Fixes: 8887852d ("dzn: Add some docs around descriptor sets and remove redundant/unused data")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23218>
(cherry picked from commit b4852c4efb)
This commit is contained in:
Jesse Natalie 2023-05-24 10:41:40 -07:00 • committed by Eric Engestrom
parent 04affaa567
commit a59bb82ce7
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -652,7 +652,7 @@
"description": "dzn: Partial revert of 8887852d",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "8887852d208821b48c0b6d844e8224957fdcdef5"
},

8
src/microsoft/vulkan/dzn_descriptor_set.c
View file

@ -421,8 +421,9 @@ dzn_descriptor_set_layout_create(struct dzn_device *device,
if (is_dynamic) {
range->OffsetInDescriptorsFromTableStart =
set_layout->dynamic_buffers.range_offset +
set_layout->dynamic_buffers.count;
set_layout->dynamic_buffers.desc_count;
set_layout->dynamic_buffers.count += range->NumDescriptors;
set_layout->dynamic_buffers.desc_count += range->NumDescriptors;
} else {
range->OffsetInDescriptorsFromTableStart = set_layout->range_desc_count[type];
if (!binfos[binding].variable_size)
@ -440,7 +441,8 @@ dzn_descriptor_set_layout_create(struct dzn_device *device,
if (is_dynamic) {
range->OffsetInDescriptorsFromTableStart =
set_layout->dynamic_buffers.range_offset +
set_layout->dynamic_buffers.count;
set_layout->dynamic_buffers.desc_count;
set_layout->dynamic_buffers.desc_count += range->NumDescriptors;
} else {
range->OffsetInDescriptorsFromTableStart = set_layout->range_desc_count[type];
set_layout->range_desc_count[type] += range->NumDescriptors;
@ -679,7 +681,7 @@ dzn_pipeline_layout_create(struct dzn_device *device,
}
if (!device->bindless)
layout->desc_count[D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV] += set_layout->dynamic_buffers.count;
layout->desc_count[D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV] += set_layout->dynamic_buffers.desc_count;
dynamic_buffer_base += set_layout->dynamic_buffers.count;
for (uint32_t o = 0, elem = 0; o < set_layout->dynamic_buffers.count; o++, elem++) {

1
src/microsoft/vulkan/dzn_private.h
View file

@ -794,6 +794,7 @@ struct dzn_descriptor_set_layout {
struct {
uint32_t bindings[MAX_DYNAMIC_BUFFERS];
uint32_t count;
uint32_t desc_count;
uint32_t range_offset;
} dynamic_buffers;
uint32_t buffer_count;