wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

libs/vkd3d: Get rid of vk_format_from_dxgi_format().

Browse Source 
Use vkd3d_get_format() instead.
This commit is contained in:
Józef Kucia 2016-10-08 14:31:57 +02:00
parent ab883caaff
commit 99efb9abe3
3 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libs/vkd3d/resource.c
View File

@ -111,9 +111,16 @@ static HRESULT vkd3d_create_image(struct d3d12_resource *resource, struct d3d12_
const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state) const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state)
{ {
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
const struct vkd3d_format *format;
VkImageCreateInfo image_info; VkImageCreateInfo image_info;
VkResult vr; VkResult vr;
if (!(format = vkd3d_get_format(desc->Format)))
{
WARN("Invalid DXGI format %#x.\n", desc->Format);
return E_INVALIDARG;
}
image_info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; image_info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
image_info.pNext = NULL; image_info.pNext = NULL;
image_info.flags = VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; image_info.flags = VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT;
@ -121,7 +128,7 @@ static HRESULT vkd3d_create_image(struct d3d12_resource *resource, struct d3d12_
image_info.flags |= VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT; image_info.flags |= VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT;
image_info.imageType = vk_image_type_from_d3d12_resource_dimension(desc->Dimension); image_info.imageType = vk_image_type_from_d3d12_resource_dimension(desc->Dimension);
image_info.format = vk_format_from_dxgi_format(desc->Format); image_info.format = format->vk_format;
image_info.extent.width = desc->Width; image_info.extent.width = desc->Width;
image_info.extent.height = desc->Height; image_info.extent.height = desc->Height;
@ -696,7 +703,7 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev
{ {
const struct vkd3d_vk_device_procs *vk_procs; const struct vkd3d_vk_device_procs *vk_procs;
struct VkImageViewCreateInfo view_desc; struct VkImageViewCreateInfo view_desc;
DXGI_FORMAT format; const struct vkd3d_format *format;
VkResult vr; VkResult vr;
vk_procs = &device->vk_procs; vk_procs = &device->vk_procs;
@ -715,13 +722,24 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev
return; return;
} }
format = desc ? desc->Format : resource->desc.Format; if (!(format = vkd3d_get_format(desc ? desc->Format : resource->desc.Format)))
{
WARN("Invalid DXGI format.\n");
return;
}
if (format->vk_aspect_mask != VK_IMAGE_ASPECT_COLOR_BIT)
{
WARN("Trying to create RTV for depth/stencil format %#x.\n", format->dxgi_format);
return;
}
view_desc.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO; view_desc.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
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 = VK_IMAGE_VIEW_TYPE_2D;
view_desc.format = vk_format_from_dxgi_format(format); view_desc.format = format->vk_format;
view_desc.components.r = VK_COMPONENT_SWIZZLE_R; view_desc.components.r = VK_COMPONENT_SWIZZLE_R;
view_desc.components.g = VK_COMPONENT_SWIZZLE_G; view_desc.components.g = VK_COMPONENT_SWIZZLE_G;
view_desc.components.b = VK_COMPONENT_SWIZZLE_B; view_desc.components.b = VK_COMPONENT_SWIZZLE_B;

13
libs/vkd3d/utils.c
View File

@ -47,19 +47,6 @@ const struct vkd3d_format *vkd3d_get_format(DXGI_FORMAT dxgi_format)
return NULL; return NULL;
} }
VkFormat vk_format_from_dxgi_format(DXGI_FORMAT dxgi_format)
{
const struct vkd3d_format *format;
if (!(format = vkd3d_get_format(dxgi_format)))
{
FIXME("Unhandled format %#x.\n", dxgi_format);
return VK_FORMAT_UNDEFINED;
}
return format->vk_format;
}
bool vkd3d_array_reserve(void **elements, size_t *capacity, size_t element_count, size_t element_size) bool vkd3d_array_reserve(void **elements, size_t *capacity, size_t element_count, size_t element_size)
{ {
size_t new_capacity, max_capacity; size_t new_capacity, max_capacity;

2
libs/vkd3d/vkd3d_private.h
View File

@ -296,8 +296,6 @@ const char *debug_vk_memory_heap_flags(VkMemoryHeapFlags flags) DECLSPEC_HIDDEN;
const char *debug_vk_memory_property_flags(VkMemoryPropertyFlags flags) DECLSPEC_HIDDEN; const char *debug_vk_memory_property_flags(VkMemoryPropertyFlags flags) DECLSPEC_HIDDEN;
const char *debug_vk_queue_flags(VkQueueFlags flags) DECLSPEC_HIDDEN; const char *debug_vk_queue_flags(VkQueueFlags flags) DECLSPEC_HIDDEN;
VkFormat vk_format_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN;
bool vkd3d_array_reserve(void **elements, size_t *capacity, bool vkd3d_array_reserve(void **elements, size_t *capacity,
size_t element_count, size_t element_size) DECLSPEC_HIDDEN; size_t element_count, size_t element_size) DECLSPEC_HIDDEN;