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

vkd3d: Rename VKD3D_DESCRIPTOR_FLAG_UAV_COUNTER to RAW_VA_BUFFER. 

We're going to place acceleration structures here.

Signed-off-by: Hans-Kristian Arntzen <post@arntzen-software.no>
This commit is contained in:
Hans-Kristian Arntzen 2021-03-03 10:56:16 +01:00
parent 3224688295
commit 9ff7b82235
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/vkd3d/resource.c
View File

@ -2699,7 +2699,7 @@ static void d3d12_desc_copy_single(struct d3d12_desc *dst, struct d3d12_desc *sr
* If flags differ, we also need to update. E.g. happens if UAV counter flag is turned off.
* We have no cookie for the UAV counter itself.
* Lastly, if we have plain VkBuffers, offset/range might differ. */
if ((metadata.flags & VKD3D_DESCRIPTOR_FLAG_UAV_COUNTER) != 0 ||
if ((metadata.flags & VKD3D_DESCRIPTOR_FLAG_RAW_VA_AUX_BUFFER) != 0 ||
(metadata.flags != dst->metadata.flags))
{
needs_update = true;
@ -2737,7 +2737,7 @@ static void d3d12_desc_copy_single(struct d3d12_desc *dst, struct d3d12_desc *sr
vk_copy->descriptorCount = 1;
}
if (metadata.flags & VKD3D_DESCRIPTOR_FLAG_UAV_COUNTER)
if (metadata.flags & VKD3D_DESCRIPTOR_FLAG_RAW_VA_AUX_BUFFER)
{
if (dst->heap->raw_va_aux_buffer.host_ptr)
{
@ -3857,7 +3857,7 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_
flags = vkd3d_view_flags_from_d3d12_buffer_uav_flags(desc->Buffer.Flags);
descriptor->metadata.set_info_mask = 0;
descriptor->metadata.flags = VKD3D_DESCRIPTOR_FLAG_UAV_COUNTER;
descriptor->metadata.flags = VKD3D_DESCRIPTOR_FLAG_RAW_VA_AUX_BUFFER;
if (d3d12_device_use_ssbo_raw_buffer(device))
{

8
libs/vkd3d/vkd3d_private.h
View File

@ -950,10 +950,10 @@ bool vkd3d_create_texture_view(struct d3d12_device *device,
enum vkd3d_descriptor_flag
{
VKD3D_DESCRIPTOR_FLAG_VIEW = (1 << 0),
VKD3D_DESCRIPTOR_FLAG_UAV_COUNTER = (1 << 1),
VKD3D_DESCRIPTOR_FLAG_BUFFER_OFFSET = (1 << 2),
VKD3D_DESCRIPTOR_FLAG_OFFSET_RANGE = (1 << 3),
VKD3D_DESCRIPTOR_FLAG_VIEW = (1 << 0),
VKD3D_DESCRIPTOR_FLAG_RAW_VA_AUX_BUFFER = (1 << 1),
VKD3D_DESCRIPTOR_FLAG_BUFFER_OFFSET = (1 << 2),
VKD3D_DESCRIPTOR_FLAG_OFFSET_RANGE = (1 << 3),
};
struct vkd3d_descriptor_binding