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

vkd3d: Return bool from vkd3d_create_texture_view(). 

For consistency with vkd3d_create_buffer_view().

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2018-08-30 14:12:55 +02:00 committed by Alexandre Julliard
parent d58c65aeeb
commit 1c7df3f50a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/vkd3d/resource.c
View File

@ -1341,7 +1341,7 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc,
return true; return true;
} }
static HRESULT vkd3d_create_texture_view(struct d3d12_device *device, static bool vkd3d_create_texture_view(struct d3d12_device *device,
struct d3d12_resource *resource, const struct vkd3d_texture_view_desc *desc, struct d3d12_resource *resource, const struct vkd3d_texture_view_desc *desc,
struct vkd3d_view **view) struct vkd3d_view **view)
{ {
@ -1369,18 +1369,18 @@ static HRESULT vkd3d_create_texture_view(struct d3d12_device *device,
if ((vr = VK_CALL(vkCreateImageView(device->vk_device, &view_desc, NULL, &vk_view))) < 0) if ((vr = VK_CALL(vkCreateImageView(device->vk_device, &view_desc, NULL, &vk_view))) < 0)
{ {
WARN("Failed to create Vulkan image view, vr %d.\n", vr); WARN("Failed to create Vulkan image view, vr %d.\n", vr);
return hresult_from_vk_result(vr); return false;
} }
if (!(object = vkd3d_view_create())) if (!(object = vkd3d_view_create()))
{ {
VK_CALL(vkDestroyImageView(device->vk_device, vk_view, NULL)); VK_CALL(vkDestroyImageView(device->vk_device, vk_view, NULL));
return E_OUTOFMEMORY; return false;
} }
object->u.vk_image_view = vk_view; object->u.vk_image_view = vk_view;
*view = object; *view = object;
return S_OK; return true;
} }
void d3d12_desc_create_cbv(struct d3d12_desc *descriptor, void d3d12_desc_create_cbv(struct d3d12_desc *descriptor,
@ -1541,7 +1541,7 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor,
} }
} }
if (FAILED(vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view))) if (!vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view))
return; return;
descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV;
@ -1663,7 +1663,7 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor,
} }
} }
if (FAILED(vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view))) if (!vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view))
return; return;
descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV;
@ -1913,7 +1913,7 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev
vkd3d_desc.layer_count = resource->desc.DepthOrArraySize; vkd3d_desc.layer_count = resource->desc.DepthOrArraySize;
} }
if (FAILED(vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view))) if (!vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view))
return; return;
rtv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_RTV; rtv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_RTV;
@ -1985,7 +1985,7 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev
} }
} }
if (FAILED(vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view))) if (!vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view))
return; return;
dsv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_DSV; dsv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_DSV;