mirrors
/
vkd3d-proton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vkd3d: Rename BINDLESS_UAV_COUNTERS -> RAW_VA_UAV_COUNTERS. 

For clarity, since we'll be moving to full bindless anyway.

Signed-off-by: Philip Rebohle <philip.rebohle@tu-dortmund.de>
This commit is contained in:
Philip Rebohle 2020-07-23 14:29:02 +02:00 committed by Hans-Kristian Arntzen
parent 7f36039c9c
commit 3766e7e994
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/vkd3d/command.c
View File

@ -2464,7 +2464,7 @@ static void d3d12_command_list_invalidate_root_parameters(struct d3d12_command_l
if (bindings->root_signature->descriptor_table_count)
bindings->dirty_flags |= VKD3D_PIPELINE_DIRTY_DESCRIPTOR_TABLE_OFFSETS;
if (bindings->root_signature->flags & VKD3D_ROOT_SIGNATURE_USE_BINDLESS_UAV_COUNTERS)
if (bindings->root_signature->flags & VKD3D_ROOT_SIGNATURE_USE_RAW_VA_UAV_COUNTERS)
bindings->dirty_flags |= VKD3D_PIPELINE_DIRTY_UAV_COUNTER_BINDING;
bindings->root_descriptor_dirty_mask = bindings->root_signature->root_descriptor_mask;
@ -3661,7 +3661,7 @@ static bool vk_write_descriptor_set_from_uav_counter_binding(struct d3d12_comman
bindings->dirty_flags &= ~VKD3D_PIPELINE_DIRTY_UAV_COUNTER_BINDING;
if (!list->uav_counter_address_buffer || !(root_signature->flags & VKD3D_ROOT_SIGNATURE_USE_BINDLESS_UAV_COUNTERS))
if (!list->uav_counter_address_buffer || !(root_signature->flags & VKD3D_ROOT_SIGNATURE_USE_RAW_VA_UAV_COUNTERS))
return false;
vk_buffer_info->buffer = list->uav_counter_address_buffer;
@ -5446,7 +5446,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetDescriptorHeaps(d3d12_comman
bindings->descriptor_heap_dirty_mask = dirty_mask;
if (dirty_uav_counters && bindings->root_signature &&
(bindings->root_signature->flags & VKD3D_ROOT_SIGNATURE_USE_BINDLESS_UAV_COUNTERS))
(bindings->root_signature->flags & VKD3D_ROOT_SIGNATURE_USE_RAW_VA_UAV_COUNTERS))
bindings->dirty_flags |= VKD3D_PIPELINE_DIRTY_UAV_COUNTER_BINDING;
}
}

4
libs/vkd3d/resource.c
View File

@ -3766,7 +3766,7 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_
assert(d3d12_resource_is_buffer(counter_resource));
assert(desc->Buffer.StructureByteStride);
if (device->bindless_state.flags & VKD3D_BINDLESS_UAV_COUNTER)
if (device->bindless_state.flags & VKD3D_RAW_VA_UAV_COUNTER)
{
VkDeviceAddress address = vkd3d_get_buffer_device_address(device, counter_resource->vk_buffer);
@ -4728,7 +4728,7 @@ static HRESULT d3d12_descriptor_heap_init(struct d3d12_descriptor_heap *descript
}
if (desc->Type == D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV &&
(device->bindless_state.flags & VKD3D_BINDLESS_UAV_COUNTER))
(device->bindless_state.flags & VKD3D_RAW_VA_UAV_COUNTER))
{
if (FAILED(hr = d3d12_descriptor_heap_create_uav_counter_buffer(descriptor_heap,
&descriptor_heap->uav_counters)))

16
libs/vkd3d/state.c
View File

@ -421,7 +421,7 @@ static HRESULT d3d12_root_signature_info_count_descriptors(struct d3d12_root_sig
/* separate image + buffer descriptors */
info->binding_count += 2;
if (device->bindless_state.flags & VKD3D_BINDLESS_UAV_COUNTER)
if (device->bindless_state.flags & VKD3D_RAW_VA_UAV_COUNTER)
{
info->binding_count += 1;
info->has_uav_counters = true;
@ -459,7 +459,7 @@ static HRESULT d3d12_root_signature_info_count_descriptors(struct d3d12_root_sig
/* separate image + buffer descriptors */
descriptor_count = range->NumDescriptors * 2;
if (device->bindless_state.flags & VKD3D_BINDLESS_UAV_COUNTER)
if (device->bindless_state.flags & VKD3D_RAW_VA_UAV_COUNTER)
{
info->binding_count += 1;
info->has_uav_counters = true;
@ -705,7 +705,7 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo
/* Add UAV counter bindings */
if (is_uav)
{
if (root_signature->flags & VKD3D_ROOT_SIGNATURE_USE_BINDLESS_UAV_COUNTERS)
if (root_signature->flags & VKD3D_ROOT_SIGNATURE_USE_RAW_VA_UAV_COUNTERS)
{
binding.register_index = range->BaseShaderRegister;
binding.register_count = range->NumDescriptors;
@ -779,7 +779,7 @@ static HRESULT d3d12_root_signature_init_root_descriptors(struct d3d12_root_sign
HRESULT hr;
rs_flags = VKD3D_ROOT_SIGNATURE_USE_INLINE_UNIFORM_BLOCK |
VKD3D_ROOT_SIGNATURE_USE_BINDLESS_UAV_COUNTERS;
VKD3D_ROOT_SIGNATURE_USE_RAW_VA_UAV_COUNTERS;
if (!info->push_descriptor_count && !(root_signature->flags & rs_flags))
return S_OK;
@ -826,7 +826,7 @@ static HRESULT d3d12_root_signature_init_root_descriptors(struct d3d12_root_sign
context->vk_binding += 1;
}
if (root_signature->flags & VKD3D_ROOT_SIGNATURE_USE_BINDLESS_UAV_COUNTERS)
if (root_signature->flags & VKD3D_ROOT_SIGNATURE_USE_RAW_VA_UAV_COUNTERS)
{
vk_binding = &vk_binding_info[j++];
vk_binding->binding = context->vk_binding;
@ -1013,7 +1013,7 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa
}
if (info.has_uav_counters)
root_signature->flags |= VKD3D_ROOT_SIGNATURE_USE_BINDLESS_UAV_COUNTERS;
root_signature->flags |= VKD3D_ROOT_SIGNATURE_USE_RAW_VA_UAV_COUNTERS;
if (FAILED(hr = d3d12_root_signature_init_root_descriptors(root_signature, desc,
&info, &root_signature->push_constant_range, &context,
@ -3304,7 +3304,7 @@ static uint32_t vkd3d_bindless_state_get_bindless_flags(struct d3d12_device *dev
flags |= VKD3D_BINDLESS_CBV | VKD3D_BINDLESS_CBV_AS_SSBO;
if (device_info->buffer_device_address_features.bufferDeviceAddress && (flags & VKD3D_BINDLESS_UAV))
flags |= VKD3D_BINDLESS_UAV_COUNTER;
flags |= VKD3D_RAW_VA_UAV_COUNTER;
return flags;
}
@ -3351,7 +3351,7 @@ HRESULT vkd3d_bindless_state_init(struct vkd3d_bindless_state *bindless_state,
D3D12_DESCRIPTOR_RANGE_TYPE_UAV, VKD3D_SHADER_BINDING_FLAG_IMAGE)))
goto fail;
if (!(bindless_state->flags & VKD3D_BINDLESS_UAV_COUNTER))
if (!(bindless_state->flags & VKD3D_RAW_VA_UAV_COUNTER))
{
if (FAILED(hr = vkd3d_bindless_state_add_binding(bindless_state, device,
D3D12_DESCRIPTOR_RANGE_TYPE_UAV, VKD3D_SHADER_BINDING_FLAG_COUNTER)))

4
libs/vkd3d/vkd3d_private.h
View File

@ -792,7 +792,7 @@ enum vkd3d_root_signature_flag
{
VKD3D_ROOT_SIGNATURE_USE_PUSH_DESCRIPTORS = 0x00000001u,
VKD3D_ROOT_SIGNATURE_USE_INLINE_UNIFORM_BLOCK = 0x00000002u,
VKD3D_ROOT_SIGNATURE_USE_BINDLESS_UAV_COUNTERS = 0x00000004u,
VKD3D_ROOT_SIGNATURE_USE_RAW_VA_UAV_COUNTERS = 0x00000004u,
};
struct d3d12_root_descriptor_table
@ -1475,7 +1475,7 @@ enum vkd3d_bindless_flags
VKD3D_BINDLESS_CBV = (1u << 1),
VKD3D_BINDLESS_SRV = (1u << 2),
VKD3D_BINDLESS_UAV = (1u << 3),
VKD3D_BINDLESS_UAV_COUNTER = (1u << 4),
VKD3D_RAW_VA_UAV_COUNTER = (1u << 4),
VKD3D_BINDLESS_CBV_AS_SSBO = (1u << 5),
};