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

vkd3d: Rework format compatibility lists. 

Signed-off-by: Philip Rebohle <philip.rebohle@tu-dortmund.de>
This commit is contained in:
Philip Rebohle 2021-11-23 17:59:25 +01:00 committed by Hans-Kristian Arntzen
parent 42b8fc3338
commit 9624102dcb
3 changed files with 31 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libs/vkd3d/resource.c
View File

@ -212,19 +212,12 @@ static unsigned int max_miplevel_count(const D3D12_RESOURCE_DESC1 *desc)
static const struct vkd3d_format_compatibility_list *vkd3d_get_format_compatibility_list(
const struct d3d12_device *device, DXGI_FORMAT dxgi_format)
{
DXGI_FORMAT typeless_format;
unsigned int i;
const struct vkd3d_format_compatibility_list *list = &device->format_compatibility_lists[dxgi_format];
if (!(typeless_format = vkd3d_get_typeless_format(device, dxgi_format)))
typeless_format = dxgi_format;
if (list->format_count < 2)
return NULL;
for (i = 0; i < device->format_compatibility_list_count; ++i)
{
if (device->format_compatibility_lists[i].typeless_format == typeless_format)
return &device->format_compatibility_lists[i];
}
return NULL;
return list;
}
static bool vkd3d_is_linear_tiling_supported(const struct d3d12_device *device, VkImageCreateInfo *image_info)

92
libs/vkd3d/utils.c
View File

@ -153,13 +153,13 @@ static const struct vkd3d_format vkd3d_depth_stencil_formats[] =
#undef SINT
#undef UINT
static const struct vkd3d_format_compatibility_info_2
static const struct dxgi_format_compatibility_list
{
DXGI_FORMAT image_format;
DXGI_FORMAT view_formats[VKD3D_MAX_COMPATIBLE_FORMAT_COUNT];
DXGI_FORMAT uint_format; /* for ClearUAVUint */
}
vkd3d_format_compatibility_info_2[] =
dxgi_format_compatibility_list[] =
{
{DXGI_FORMAT_R32G32B32A32_TYPELESS,
{DXGI_FORMAT_R32G32B32A32_FLOAT, DXGI_FORMAT_R32G32B32A32_UINT, DXGI_FORMAT_R32G32B32A32_SINT},
@ -485,34 +485,25 @@ vkd3d_format_compatibility_info[] =
{DXGI_FORMAT_B8G8R8X8_UNORM, DXGI_FORMAT_B8G8R8X8_TYPELESS},
};
static bool dxgi_format_is_depth_stencil(DXGI_FORMAT dxgi_format)
void vkd3d_format_compatibility_list_add_format(struct vkd3d_format_compatibility_list *list, VkFormat vk_format)
{
unsigned int i;
bool found = false;
for (i = 0; i < ARRAY_SIZE(vkd3d_formats); ++i)
for (i = 0; i < list->format_count && !found; i++)
found = list->vk_formats[i] == vk_format;
if (!found)
{
const struct vkd3d_format *current = &vkd3d_formats[i];
if (current->dxgi_format == dxgi_format)
return current->vk_aspect_mask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT);
assert(list->format_count < ARRAY_SIZE(list->vk_formats));
list->vk_formats[list->format_count++] = vk_format;
}
for (i = 0; i < ARRAY_SIZE(vkd3d_depth_stencil_formats); ++i)
{
if (vkd3d_depth_stencil_formats[i].dxgi_format == dxgi_format)
return true;
}
return false;
}
/* FIXME: This table should be generated at compile-time. */
static HRESULT vkd3d_init_format_compatibility_lists(struct d3d12_device *device)
{
struct vkd3d_format_compatibility_list *lists, *current_list;
const struct vkd3d_format_compatibility_info *current;
DXGI_FORMAT dxgi_format;
VkFormat vk_format;
struct vkd3d_format_compatibility_list *lists, *dst;
const struct dxgi_format_compatibility_list *src;
unsigned int count;
unsigned int i, j;
@ -522,62 +513,25 @@ static HRESULT vkd3d_init_format_compatibility_lists(struct d3d12_device *device
if (!device->vk_info.KHR_image_format_list)
return S_OK;
count = 1;
dxgi_format = vkd3d_format_compatibility_info[0].typeless_format;
for (i = 0; i < ARRAY_SIZE(vkd3d_format_compatibility_info); ++i)
{
DXGI_FORMAT typeless_format = vkd3d_format_compatibility_info[i].typeless_format;
if (dxgi_format != typeless_format)
{
++count;
dxgi_format = typeless_format;
}
}
count = 0;
for (i = 0; i < ARRAY_SIZE(dxgi_format_compatibility_list); ++i)
count = max(count, dxgi_format_compatibility_list[i].image_format + 1);
if (!(lists = vkd3d_calloc(count, sizeof(*lists))))
return E_OUTOFMEMORY;
count = 0;
current_list = lists;
current_list->typeless_format = vkd3d_format_compatibility_info[0].typeless_format;
for (i = 0; i < ARRAY_SIZE(vkd3d_format_compatibility_info); ++i)
for (i = 0; i < ARRAY_SIZE(dxgi_format_compatibility_list); ++i)
{
current = &vkd3d_format_compatibility_info[i];
src = &dxgi_format_compatibility_list[i];
dst = &lists[src->image_format];
if (current_list->typeless_format != current->typeless_format)
{
/* Avoid empty format lists. */
if (current_list->format_count)
{
++current_list;
++count;
}
dst->uint_format = src->uint_format;
dst->vk_formats[dst->format_count++] = vkd3d_get_vk_format(src->image_format);
current_list->typeless_format = current->typeless_format;
}
/* In Vulkan, each depth-stencil format is only compatible with itself. */
if (dxgi_format_is_depth_stencil(current->format))
continue;
if (!(vk_format = vkd3d_get_vk_format(current->format)))
continue;
for (j = 0; j < current_list->format_count; ++j)
{
if (current_list->vk_formats[j] == vk_format)
break;
}
if (j >= current_list->format_count)
{
assert(current_list->format_count < VKD3D_MAX_COMPATIBLE_FORMAT_COUNT);
current_list->vk_formats[current_list->format_count++] = vk_format;
}
for (j = 0; j < ARRAY_SIZE(src->view_formats) && src->view_formats[j]; j++)
vkd3d_format_compatibility_list_add_format(dst, vkd3d_get_vk_format(src->view_formats[j]));
}
if (current_list->format_count)
++count;
device->format_compatibility_list_count = count;
device->format_compatibility_lists = lists;

6
libs/vkd3d/vkd3d_private.h
View File

@ -48,7 +48,7 @@
#define MAKE_MAGIC(a,b,c,d) (((uint32_t)a) | (((uint32_t)b) << 8) | (((uint32_t)c) << 16) | (((uint32_t)d) << 24))
#define VKD3D_MAX_COMPATIBLE_FORMAT_COUNT 6u
#define VKD3D_MAX_COMPATIBLE_FORMAT_COUNT 10u
#define VKD3D_MAX_SHADER_EXTENSIONS 6u
#define VKD3D_MAX_SHADER_STAGES 5u
#define VKD3D_MAX_VK_SYNC_OBJECTS 4u
@ -2348,11 +2348,13 @@ static inline VkDescriptorType vkd3d_bindless_state_get_cbv_descriptor_type(cons
struct vkd3d_format_compatibility_list
{
DXGI_FORMAT typeless_format;
unsigned int format_count;
VkFormat vk_formats[VKD3D_MAX_COMPATIBLE_FORMAT_COUNT];
DXGI_FORMAT uint_format;
};
void vkd3d_format_compatibility_list_add_format(struct vkd3d_format_compatibility_list *list, VkFormat vk_format);
struct vkd3d_memory_info_domain
{
uint32_t buffer_type_mask;