wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

libs/vkd3d: Implement UAVs for 2D array textures.

Browse Source
This commit is contained in:
Józef Kucia
2017-08-28 19:10:23 +02:00
parent 495fe2a96a
commit d107538df8
1 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
libs/vkd3d/resource.c
View File

@@ -839,7 +839,7 @@ static bool vkd3d_create_buffer_view(struct d3d12_device *device,
} }
static VkResult vkd3d_create_texture_view(struct d3d12_device *device, static VkResult vkd3d_create_texture_view(struct d3d12_device *device,
struct d3d12_resource *resource, const struct vkd3d_format *format, struct d3d12_resource *resource, const struct vkd3d_format *format, VkImageViewType view_type,
uint32_t miplevel_idx, uint32_t miplevel_count, uint32_t layer_idx, uint32_t layer_count, uint32_t miplevel_idx, uint32_t miplevel_count, uint32_t layer_idx, uint32_t layer_count,
VkImageView *vk_view) VkImageView *vk_view)
{ {
@@ -853,7 +853,7 @@ static VkResult vkd3d_create_texture_view(struct d3d12_device *device,
view_desc.pNext = NULL; view_desc.pNext = NULL;
view_desc.flags = 0; view_desc.flags = 0;
view_desc.image = resource->u.vk_image; view_desc.image = resource->u.vk_image;
view_desc.viewType = VK_IMAGE_VIEW_TYPE_2D; view_desc.viewType = view_type;
view_desc.format = format->vk_format; view_desc.format = format->vk_format;
if (format->vk_aspect_mask == VK_IMAGE_ASPECT_STENCIL_BIT) if (format->vk_aspect_mask == VK_IMAGE_ASPECT_STENCIL_BIT)
{ {
@@ -980,7 +980,7 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor,
return; return;
} }
if (vkd3d_create_texture_view(device, resource, format, if (vkd3d_create_texture_view(device, resource, format, VK_IMAGE_VIEW_TYPE_2D,
0, VK_REMAINING_MIP_LEVELS, 0, VK_REMAINING_ARRAY_LAYERS, &descriptor->u.vk_image_view) < 0) 0, VK_REMAINING_MIP_LEVELS, 0, VK_REMAINING_ARRAY_LAYERS, &descriptor->u.vk_image_view) < 0)
return; return;
@@ -1031,8 +1031,9 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor,
struct d3d12_device *device, struct d3d12_resource *resource, struct d3d12_device *device, struct d3d12_resource *resource,
const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc) const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc)
{ {
uint32_t miplevel_idx, layer_idx, layer_count;
const struct vkd3d_format *format; const struct vkd3d_format *format;
uint32_t miplevel_idx; VkImageViewType vk_view_type;
if (resource->desc.Dimension != D3D12_RESOURCE_DIMENSION_TEXTURE2D) if (resource->desc.Dimension != D3D12_RESOURCE_DIMENSION_TEXTURE2D)
{ {
@@ -1052,26 +1053,39 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor,
return; return;
} }
vk_view_type = resource->desc.DepthOrArraySize > 1
? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D;
miplevel_idx = 0;
layer_idx = 0;
layer_count = VK_REMAINING_ARRAY_LAYERS;
if (desc) if (desc)
{ {
if (desc->ViewDimension != D3D12_UAV_DIMENSION_TEXTURE2D) if (desc->ViewDimension == D3D12_UAV_DIMENSION_TEXTURE2D)
{
if (desc->u.Texture2D.PlaneSlice)
FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice);
miplevel_idx = desc->u.Texture2D.MipSlice;
}
else if (desc->ViewDimension == D3D12_UAV_DIMENSION_TEXTURE2DARRAY)
{
if (desc->u.Texture2DArray.PlaneSlice)
FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice);
vk_view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY;
miplevel_idx = desc->u.Texture2DArray.MipSlice;
layer_idx = desc->u.Texture2DArray.FirstArraySlice;
layer_count = desc->u.Texture2DArray.ArraySize;
}
else
{ {
WARN("Unexpected view dimension %#x.\n", desc->ViewDimension); WARN("Unexpected view dimension %#x.\n", desc->ViewDimension);
return; return;
} }
if (desc->u.Texture2D.PlaneSlice)
FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice);
miplevel_idx = desc->u.Texture2D.MipSlice;
}
else
{
miplevel_idx = 0;
} }
if (vkd3d_create_texture_view(device, resource, format, miplevel_idx, 1, 0, 1, if (vkd3d_create_texture_view(device, resource, format, vk_view_type,
&descriptor->u.vk_image_view) < 0) miplevel_idx, 1, layer_idx, layer_count, &descriptor->u.vk_image_view) < 0)
return; return;
descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV;
@@ -1281,7 +1295,7 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev
return; return;
} }
if (vkd3d_create_texture_view(device, resource, format, if (vkd3d_create_texture_view(device, resource, format, VK_IMAGE_VIEW_TYPE_2D,
desc ? desc->u.Texture2D.MipSlice : 0, 1, desc ? desc->u.Texture2D.PlaneSlice : 0, 1, desc ? desc->u.Texture2D.MipSlice : 0, 1, desc ? desc->u.Texture2D.PlaneSlice : 0, 1,
&rtv_desc->vk_view) < 0) &rtv_desc->vk_view) < 0)
return; return;
@@ -1339,7 +1353,7 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev
if (desc && desc->Flags) if (desc && desc->Flags)
FIXME("Ignoring flags %#x.\n", desc->Flags); FIXME("Ignoring flags %#x.\n", desc->Flags);
if (vkd3d_create_texture_view(device, resource, format, if (vkd3d_create_texture_view(device, resource, format, VK_IMAGE_VIEW_TYPE_2D,
desc ? desc->u.Texture2D.MipSlice : 0, 1, 0, 1, &dsv_desc->vk_view) < 0) desc ? desc->u.Texture2D.MipSlice : 0, 1, 0, 1, &dsv_desc->vk_view) < 0)
return; return;