=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: vkd3d: Add support for default 1D texture views.
Alexandre Julliard
julliard at winehq.org
Wed Aug 29 15:37:40 CDT 2018
Module: vkd3d
Branch: master
Commit: c5e129cf67a4a670e57eba1cce31972aa1b22b07
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c5e129cf67a4a670e57eba1cce31972aa1b22b07
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Tue Aug 28 12:19:48 2018 +0200
vkd3d: Add support for default 1D texture views.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
libs/vkd3d/resource.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c
index ed2d11a..e40ccbc 100644
--- a/libs/vkd3d/resource.c
+++ b/libs/vkd3d/resource.c
@@ -1295,15 +1295,21 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc,
return false;
}
+ desc->miplevel_idx = 0;
+ desc->miplevel_count = 1;
+ desc->layer_idx = 0;
+ desc->layer_count = VK_REMAINING_ARRAY_LAYERS;
+
switch (resource->desc.Dimension)
{
+ case D3D12_RESOURCE_DIMENSION_TEXTURE1D:
+ desc->view_type = resource->desc.DepthOrArraySize > 1
+ ? VK_IMAGE_VIEW_TYPE_1D_ARRAY : VK_IMAGE_VIEW_TYPE_1D;
+ break;
+
case D3D12_RESOURCE_DIMENSION_TEXTURE2D:
desc->view_type = resource->desc.DepthOrArraySize > 1
? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D;
- desc->miplevel_idx = 0;
- desc->miplevel_count = 1;
- desc->layer_idx = 0;
- desc->layer_count = VK_REMAINING_ARRAY_LAYERS;
break;
default:
@@ -1324,7 +1330,7 @@ static VkResult vkd3d_create_texture_view(struct d3d12_device *device,
struct VkImageViewCreateInfo view_desc;
VkResult vr;
- assert(resource->desc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D);
+ assert(d3d12_resource_is_texture(resource));
view_desc.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
view_desc.pNext = NULL;
More information about the wine-cvs
mailing list