AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dzn: When binding a bindless root signature, bind descriptor heaps first

Browse Source 
The D3D spec says it must be so, and not doing this causes problems
on some hardware.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21913>
This commit is contained in:
Jesse Natalie
2023-03-13 12:44:26 -07:00
committed by Marge Bot
parent 8d52a480fe
commit 7edff267cc
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/microsoft/vulkan/dzn_cmd_buffer.c
+20
View File
@@ -3014,6 +3014,7 @@ dzn_cmd_buffer_update_pipeline(struct dzn_cmd_buffer *cmdbuf, uint32_t bindpoint
if (!pipeline)
return;
struct dzn_device *device = container_of(cmdbuf->vk.base.device, struct dzn_device, vk);
ID3D12PipelineState *old_pipeline_state =
cmdbuf->state.pipeline ? cmdbuf->state.pipeline->state : NULL;
@@ -3022,6 +3023,25 @@ dzn_cmd_buffer_update_pipeline(struct dzn_cmd_buffer *cmdbuf, uint32_t bindpoint
cmdbuf->state.bindpoint[bindpoint].root_sig = pipeline->root.sig;
/* Changing root signature always requires re-binding descriptor heaps */
cmdbuf->state.bindpoint[bindpoint].dirty |= DZN_CMD_BINDPOINT_DIRTY_HEAPS;
if (device->bindless) {
/* Note: The D3D12 spec for descriptor heap indexing requires that the descriptor heaps
* are bound *before* the root signature. */
bool bind_heaps = false;
dzn_foreach_pool_type(type) {
if (cmdbuf->state.heaps[type] != &device->device_heaps[type].heap) {
bind_heaps = true;
cmdbuf->state.heaps[type] = &device->device_heaps[type].heap;
}
}
if (bind_heaps) {
ID3D12DescriptorHeap *heaps[NUM_POOL_TYPES];
dzn_foreach_pool_type(type)
heaps[type] = cmdbuf->state.heaps[type]->heap;
ID3D12GraphicsCommandList1_SetDescriptorHeaps(cmdbuf->cmdlist, NUM_POOL_TYPES, heaps);
}
}
if (bindpoint == VK_PIPELINE_BIND_POINT_GRAPHICS)
ID3D12GraphicsCommandList1_SetGraphicsRootSignature(cmdbuf->cmdlist, pipeline->root.sig);
else