August 2018 - Wine-devel - list.winehq.org

[PATCH vkd3d v2 4/9] vkd3d: Add support for 3D texture views.
by Józef Kucia 29 Aug '18

29 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 71 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 47 insertions(+), 24 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index b7c657bee6be..b71313487d97 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -309,8 +309,7 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device, static unsigned int max_miplevel_count(const D3D12_RESOURCE_DESC *desc) { unsigned int size = max(desc->Width, desc->Height); - if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) - size = max(size, desc->DepthOrArraySize); + size = max(size, d3d12_resource_desc_get_depth(desc, 0)); return vkd3d_log2i(size) + 1; } @@ -339,6 +338,8 @@ static HRESULT vkd3d_create_image(struct d3d12_resource *resource, struct d3d12_ if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D && desc->Width == desc->Height && desc->DepthOrArraySize >= 6) image_info.flags |= VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT; + if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + image_info.flags |= VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR; image_info.imageType = vk_image_type_from_d3d12_resource_dimension(desc->Dimension); image_info.format = format->vk_format; @@ -1298,7 +1299,7 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, desc->miplevel_idx = 0; desc->miplevel_count = 1; desc->layer_idx = 0; - desc->layer_count = VK_REMAINING_ARRAY_LAYERS; + desc->layer_count = d3d12_resource_desc_get_layer_count(&resource->desc); switch (resource->desc.Dimension) { @@ -1478,6 +1479,13 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, if (desc->u.Texture2D.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2D.ResourceMinLODClamp); break; + case D3D12_SRV_DIMENSION_TEXTURE3D: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; + vkd3d_desc.miplevel_idx = desc->u.Texture3D.MostDetailedMip; + vkd3d_desc.miplevel_count = desc->u.Texture3D.MipLevels; + if (desc->u.Texture3D.ResourceMinLODClamp) + FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2D.ResourceMinLODClamp); + break; case D3D12_SRV_DIMENSION_TEXTURECUBE: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_CUBE; vkd3d_desc.miplevel_idx = desc->u.TextureCube.MostDetailedMip; @@ -1602,27 +1610,30 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, if (desc) { - if (desc->ViewDimension == D3D12_UAV_DIMENSION_TEXTURE2D) - { - if (desc->u.Texture2D.PlaneSlice) - FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); - - vkd3d_desc.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); - - vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; - vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MipSlice; - vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; - vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; - } - else + switch (desc->ViewDimension) { - WARN("Unexpected view dimension %#x.\n", desc->ViewDimension); - return; + case D3D12_UAV_DIMENSION_TEXTURE2D: + vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; + if (desc->u.Texture2D.PlaneSlice) + FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); + break; + case D3D12_UAV_DIMENSION_TEXTURE2DARRAY: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MipSlice; + vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; + if (desc->u.Texture2DArray.PlaneSlice) + FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); + break; + case D3D12_UAV_DIMENSION_TEXTURE3D: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; + vkd3d_desc.miplevel_idx = desc->u.Texture3D.MipSlice; + if (desc->u.Texture3D.FirstWSlice || desc->u.Texture3D.WSize != resource->desc.DepthOrArraySize) + FIXME("Unhandled depth view %u-%u.\n", + desc->u.Texture3D.FirstWSlice, desc->u.Texture3D.WSize); + break; + default: + FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); } } @@ -1857,10 +1868,22 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev if (desc->u.Texture2D.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); break; + case D3D12_RTV_DIMENSION_TEXTURE3D: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.Texture3D.MipSlice; + vkd3d_desc.layer_idx = desc->u.Texture3D.FirstWSlice; + vkd3d_desc.layer_count = desc->u.Texture3D.WSize; + break; default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); } } + else if (resource->desc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + { + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.layer_idx = 0; + vkd3d_desc.layer_count = resource->desc.DepthOrArraySize; + } if (!(view = vkd3d_view_create())) return; @@ -1875,7 +1898,7 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev rtv_desc->format = vkd3d_desc.format->vk_format; rtv_desc->width = d3d12_resource_desc_get_width(&resource->desc, vkd3d_desc.miplevel_idx); rtv_desc->height = d3d12_resource_desc_get_height(&resource->desc, vkd3d_desc.miplevel_idx); - rtv_desc->layer_count = resource->desc.DepthOrArraySize; + rtv_desc->layer_count = vkd3d_desc.layer_count; rtv_desc->view = view; rtv_desc->resource = resource; } -- 2.16.4

2 1

[PATCH vkd3d v2 3/9] vkd3d: Add support for default 3D texture views.
by Józef Kucia 29 Aug '18

29 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index e40ccbc5525e..b7c657bee6be 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1312,6 +1312,11 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D; break; + case D3D12_RESOURCE_DIMENSION_TEXTURE3D: + desc->view_type = VK_IMAGE_VIEW_TYPE_3D; + desc->layer_count = 1; + break; + default: FIXME("Resource dimension %#x not implemented.\n", resource->desc.Dimension); return false; @@ -1899,6 +1904,12 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev return; } + if (resource->desc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + { + WARN("Cannot create DSV for 3D texture.\n"); + return; + } + if (!init_default_texture_view_desc(&vkd3d_desc, resource, desc ? desc->Format : 0)) return; -- 2.16.4

2 1

[PATCH vkd3d v2 2/9] vkd3d: Add support for default 1D texture views.
by Józef Kucia 29 Aug '18

29 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 ed2d11a41cde..e40ccbc5525e 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; -- 2.16.4

2 1

[PATCH vkd3d v2 1/9] vkd3d: Introduce vkd3d_texture_view_desc structure.
by Józef Kucia 29 Aug '18

29 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: Get rid of vkd3d_view_kind. --- libs/vkd3d/resource.c | 225 ++++++++++++++++++++++++++------------------------ 1 file changed, 115 insertions(+), 110 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f6dffbfda31e..ed2d11a41cde 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1274,12 +1274,53 @@ static void vkd3d_set_view_swizzle_for_format(VkComponentMapping *components, } } +struct vkd3d_texture_view_desc +{ + VkImageViewType view_type; + const struct vkd3d_format *format; + unsigned int miplevel_idx; + unsigned int miplevel_count; + unsigned int layer_idx; + unsigned int layer_count; + bool allowed_swizzle; +}; + +static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, + struct d3d12_resource *resource, DXGI_FORMAT view_format) +{ + if (!(desc->format = vkd3d_format_from_d3d12_resource_desc(&resource->desc, view_format))) + { + FIXME("Failed to find format (resource format %#x, view format %#x).\n", + resource->desc.Format, view_format); + return false; + } + + switch (resource->desc.Dimension) + { + 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: + FIXME("Resource dimension %#x not implemented.\n", resource->desc.Dimension); + return false; + } + + desc->allowed_swizzle = false; + return true; +} + static VkResult vkd3d_create_texture_view(struct d3d12_device *device, - 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, - bool allowed_swizzle, VkImageView *vk_view) + struct d3d12_resource *resource, const struct vkd3d_texture_view_desc *desc, + VkImageView *vk_view) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + const struct vkd3d_format *format = desc->format; struct VkImageViewCreateInfo view_desc; VkResult vr; @@ -1289,14 +1330,14 @@ static VkResult vkd3d_create_texture_view(struct d3d12_device *device, view_desc.pNext = NULL; view_desc.flags = 0; view_desc.image = resource->u.vk_image; - view_desc.viewType = view_type; + view_desc.viewType = desc->view_type; view_desc.format = format->vk_format; - vkd3d_set_view_swizzle_for_format(&view_desc.components, format, allowed_swizzle); + vkd3d_set_view_swizzle_for_format(&view_desc.components, format, desc->allowed_swizzle); view_desc.subresourceRange.aspectMask = format->vk_aspect_mask; - view_desc.subresourceRange.baseMipLevel = miplevel_idx; - view_desc.subresourceRange.levelCount = miplevel_count; - view_desc.subresourceRange.baseArrayLayer = layer_idx; - view_desc.subresourceRange.layerCount = layer_count; + view_desc.subresourceRange.baseMipLevel = desc->miplevel_idx; + view_desc.subresourceRange.levelCount = desc->miplevel_count; + view_desc.subresourceRange.baseArrayLayer = desc->layer_idx; + view_desc.subresourceRange.layerCount = desc->layer_count; 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); return vr; @@ -1387,9 +1428,7 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, struct d3d12_device *device, struct d3d12_resource *resource, const D3D12_SHADER_RESOURCE_VIEW_DESC *desc) { - uint32_t miplevel_idx, miplevel_count, layer_idx, layer_count; - const struct vkd3d_format *format; - VkImageViewType vk_view_type; + struct vkd3d_texture_view_desc vkd3d_desc; struct vkd3d_view *view; d3d12_desc_destroy(descriptor, device); @@ -1406,24 +1445,12 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, return; } - if (resource->desc.Dimension != D3D12_RESOURCE_DIMENSION_TEXTURE2D) - { - FIXME("Resource dimension %#x not implemented.\n", resource->desc.Dimension); + if (!init_default_texture_view_desc(&vkd3d_desc, resource, desc ? desc->Format : 0)) return; - } - if (!(format = vkd3d_format_from_d3d12_resource_desc(&resource->desc, desc ? desc->Format : 0))) - { - FIXME("Failed to find format for %#x.\n", resource->desc.Format); - return; - } + vkd3d_desc.miplevel_count = VK_REMAINING_MIP_LEVELS; + vkd3d_desc.allowed_swizzle = true; - vk_view_type = resource->desc.DepthOrArraySize > 1 - ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D; - miplevel_idx = 0; - miplevel_count = VK_REMAINING_MIP_LEVELS; - layer_idx = 0; - layer_count = VK_REMAINING_ARRAY_LAYERS; if (desc) { if (desc->Shader4ComponentMapping != D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING) @@ -1432,28 +1459,28 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, switch (desc->ViewDimension) { case D3D12_SRV_DIMENSION_TEXTURE2D: - vk_view_type = VK_IMAGE_VIEW_TYPE_2D; - miplevel_idx = desc->u.Texture2D.MostDetailedMip; - miplevel_count = desc->u.Texture2D.MipLevels; + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; + vkd3d_desc.miplevel_idx = desc->u.Texture2D.MostDetailedMip; + vkd3d_desc.miplevel_count = desc->u.Texture2D.MipLevels; if (desc->u.Texture2D.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); if (desc->u.Texture2D.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2D.ResourceMinLODClamp); break; case D3D12_SRV_DIMENSION_TEXTURECUBE: - vk_view_type = VK_IMAGE_VIEW_TYPE_CUBE; - miplevel_idx = desc->u.TextureCube.MostDetailedMip; - miplevel_count = desc->u.TextureCube.MipLevels; - layer_count = 6; + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_CUBE; + vkd3d_desc.miplevel_idx = desc->u.TextureCube.MostDetailedMip; + vkd3d_desc.miplevel_count = desc->u.TextureCube.MipLevels; + vkd3d_desc.layer_count = 6; if (desc->u.TextureCube.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.TextureCube.ResourceMinLODClamp); break; case D3D12_SRV_DIMENSION_TEXTURECUBEARRAY: - vk_view_type = VK_IMAGE_VIEW_TYPE_CUBE_ARRAY; - miplevel_idx = desc->u.TextureCubeArray.MostDetailedMip; - miplevel_count = desc->u.TextureCubeArray.MipLevels; - layer_idx = desc->u.TextureCubeArray.First2DArrayFace; - layer_count = 6 * desc->u.TextureCubeArray.NumCubes; + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_CUBE_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.TextureCubeArray.MostDetailedMip; + vkd3d_desc.miplevel_count = desc->u.TextureCubeArray.MipLevels; + vkd3d_desc.layer_idx = desc->u.TextureCubeArray.First2DArrayFace; + vkd3d_desc.layer_count = 6 * desc->u.TextureCubeArray.NumCubes; if (desc->u.TextureCubeArray.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.TextureCubeArray.ResourceMinLODClamp); break; @@ -1465,8 +1492,7 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, if (!(view = vkd3d_view_create())) return; - if (vkd3d_create_texture_view(device, resource, format, vk_view_type, - miplevel_idx, miplevel_count, layer_idx, layer_count, true, &view->u.vk_image_view) < 0) + if (vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view->u.vk_image_view) < 0) { vkd3d_free(view); return; @@ -1551,34 +1577,18 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, struct d3d12_device *device, struct d3d12_resource *resource, const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc) { - uint32_t miplevel_idx, layer_idx, layer_count; - const struct vkd3d_format *format; - VkImageViewType vk_view_type; + struct vkd3d_texture_view_desc vkd3d_desc; struct vkd3d_view *view; - if (resource->desc.Dimension != D3D12_RESOURCE_DIMENSION_TEXTURE2D) - { - FIXME("Resource dimension %#x not implemented.\n", resource->desc.Dimension); + if (!init_default_texture_view_desc(&vkd3d_desc, resource, desc ? desc->Format : 0)) return; - } - if (!(format = vkd3d_format_from_d3d12_resource_desc(&resource->desc, desc ? desc->Format : 0))) - { - ERR("Failed to find format for %#x.\n", resource->desc.Format); - return; - } - - if (vkd3d_format_is_compressed(format)) + if (vkd3d_format_is_compressed(vkd3d_desc.format)) { WARN("UAVs cannot be created for compressed formats.\n"); 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->ViewDimension == D3D12_UAV_DIMENSION_TEXTURE2D) @@ -1586,17 +1596,17 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, if (desc->u.Texture2D.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); - miplevel_idx = desc->u.Texture2D.MipSlice; + vkd3d_desc.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; + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MipSlice; + vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; } else { @@ -1608,8 +1618,7 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, if (!(view = vkd3d_view_create())) return; - if (vkd3d_create_texture_view(device, resource, format, vk_view_type, - miplevel_idx, 1, layer_idx, layer_count, false, &view->u.vk_image_view) < 0) + if (vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view->u.vk_image_view) < 0) { vkd3d_free(view); return; @@ -1808,10 +1817,8 @@ static void d3d12_rtv_desc_destroy(struct d3d12_rtv_desc *rtv, struct d3d12_devi void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_device *device, struct d3d12_resource *resource, const D3D12_RENDER_TARGET_VIEW_DESC *desc) { - const struct vkd3d_format *format; - VkImageViewType vk_view_type; + struct vkd3d_texture_view_desc vkd3d_desc; struct vkd3d_view *view; - uint32_t miplevel_idx; d3d12_rtv_desc_destroy(rtv_desc, device); @@ -1821,44 +1828,42 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev return; } - if (resource->desc.Dimension != D3D12_RESOURCE_DIMENSION_TEXTURE2D) - { - FIXME("Resource dimension %#x not implemented.\n", resource->desc.Dimension); + if (!init_default_texture_view_desc(&vkd3d_desc, resource, desc ? desc->Format : 0)) return; - } - if (!(format = vkd3d_format_from_d3d12_resource_desc(&resource->desc, desc ? desc->Format : 0))) + if (vkd3d_desc.format->vk_aspect_mask != VK_IMAGE_ASPECT_COLOR_BIT) { - WARN("Invalid DXGI format.\n"); + WARN("Trying to create RTV for depth/stencil format %#x.\n", vkd3d_desc.format->dxgi_format); return; } - if (format->vk_aspect_mask != VK_IMAGE_ASPECT_COLOR_BIT) + if (desc) { - WARN("Trying to create RTV for depth/stencil format %#x.\n", format->dxgi_format); - return; + switch (desc->ViewDimension) + { + case D3D12_RTV_DIMENSION_TEXTURE2D: + vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; + if (desc->u.Texture2D.PlaneSlice) + FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); + break; + default: + FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); + } } - if (desc && desc->u.Texture2D.PlaneSlice) - FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); - if (!(view = vkd3d_view_create())) return; - miplevel_idx = desc ? desc->u.Texture2D.MipSlice : 0; - vk_view_type = resource->desc.DepthOrArraySize > 1 - ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D; - if (vkd3d_create_texture_view(device, resource, format, vk_view_type, - miplevel_idx, 1, 0, VK_REMAINING_ARRAY_LAYERS, false, &view->u.vk_image_view) < 0) + if (vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view->u.vk_image_view) < 0) { vkd3d_free(view); return; } rtv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_RTV; - rtv_desc->format = format->vk_format; - rtv_desc->width = d3d12_resource_desc_get_width(&resource->desc, miplevel_idx); - rtv_desc->height = d3d12_resource_desc_get_height(&resource->desc, miplevel_idx); + rtv_desc->format = vkd3d_desc.format->vk_format; + rtv_desc->width = d3d12_resource_desc_get_width(&resource->desc, vkd3d_desc.miplevel_idx); + rtv_desc->height = d3d12_resource_desc_get_height(&resource->desc, vkd3d_desc.miplevel_idx); rtv_desc->layer_count = resource->desc.DepthOrArraySize; rtv_desc->view = view; rtv_desc->resource = resource; @@ -1877,9 +1882,8 @@ static void d3d12_dsv_desc_destroy(struct d3d12_dsv_desc *dsv, struct d3d12_devi void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_device *device, struct d3d12_resource *resource, const D3D12_DEPTH_STENCIL_VIEW_DESC *desc) { - const struct vkd3d_format *format; + struct vkd3d_texture_view_desc vkd3d_desc; struct vkd3d_view *view; - uint32_t miplevel_idx; d3d12_dsv_desc_destroy(dsv_desc, device); @@ -1889,39 +1893,40 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev return; } - if (resource->desc.Dimension != D3D12_RESOURCE_DIMENSION_TEXTURE2D) - { - FIXME("Resource dimension %#x not implemented.\n", resource->desc.Dimension); + if (!init_default_texture_view_desc(&vkd3d_desc, resource, desc ? desc->Format : 0)) return; - } - if (!(format = vkd3d_format_from_d3d12_resource_desc(&resource->desc, desc ? desc->Format : 0))) + if (!(vkd3d_desc.format->vk_aspect_mask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT))) { - WARN("Invalid DXGI format.\n"); + WARN("Trying to create DSV for format %#x.\n", vkd3d_desc.format->dxgi_format); return; } - if (!(format->vk_aspect_mask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT))) + if (desc) { - WARN("Trying to create DSV for format %#x.\n", format->dxgi_format); - return; - } + if (desc->Flags) + FIXME("Ignoring flags %#x.\n", desc->Flags); - if (desc && desc->Flags) - FIXME("Ignoring flags %#x.\n", desc->Flags); + switch (desc->ViewDimension) + { + case D3D12_DSV_DIMENSION_TEXTURE2D: + vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; + break; + default: + FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); + } + } if (!(view = vkd3d_view_create())) return; - miplevel_idx = desc ? desc->u.Texture2D.MipSlice : 0; - if (vkd3d_create_texture_view(device, resource, format, VK_IMAGE_VIEW_TYPE_2D, - miplevel_idx, 1, 0, 1, false, &view->u.vk_image_view) < 0) + if (vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view->u.vk_image_view) < 0) return; dsv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_DSV; - dsv_desc->format = format->vk_format; - dsv_desc->width = d3d12_resource_desc_get_width(&resource->desc, miplevel_idx); - dsv_desc->height = d3d12_resource_desc_get_height(&resource->desc, miplevel_idx); + dsv_desc->format = vkd3d_desc.format->vk_format; + dsv_desc->width = d3d12_resource_desc_get_width(&resource->desc, vkd3d_desc.miplevel_idx); + dsv_desc->height = d3d12_resource_desc_get_height(&resource->desc, vkd3d_desc.miplevel_idx); dsv_desc->view = view; dsv_desc->resource = resource; } -- 2.16.4

2 1

[PATCH] mshtml.idl: Add IHTMLCSSStyleDeclaration2 declaration.
by Jacek Caban 29 Aug '18

29 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtmdid.h | 116 +++++++++ include/mshtml.idl | 696 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 812 insertions(+)

1 0

[PATCH 7/7] mshtml: Skip fixups in get_nsstyle_property_var in IE9+ mode.
by Jacek Caban 29 Aug '18

29 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlcurstyle.c | 2 +- dlls/mshtml/htmlstyle.c | 11 +++++------ dlls/mshtml/htmlstyle.h | 2 +- dlls/mshtml/tests/style.c | 2 -- 4 files changed, 7 insertions(+), 10 deletions(-)

1 0

[PATCH 6/7] mshtml: Skip fixups in get_nsstyle_property in IE9+ mode.
by Jacek Caban 29 Aug '18

29 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlcurstyle.c | 2 +- dlls/mshtml/htmlstyle.c | 8 ++++---- dlls/mshtml/htmlstyle.h | 2 +- dlls/mshtml/tests/style.c | 2 -- 4 files changed, 6 insertions(+), 8 deletions(-)

1 0

[PATCH 5/7] mshtml: Introduce get_current_style_property_var helper.
by Jacek Caban 29 Aug '18

29 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlcurstyle.c | 69 +++++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 32 deletions(-)

1 0

[PATCH 4/7] mshtml: Introduce get_current_style_property helper.
by Jacek Caban 29 Aug '18

29 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlcurstyle.c | 59 +++++++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 27 deletions(-)

1 0

[PATCH 3/7] mshtml: Skip var_to_nsstyle fixups in IE9+ mode.
by Jacek Caban 29 Aug '18

29 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 10 +++++----- dlls/mshtml/tests/style.c | 40 +++------------------------------------- 2 files changed, 8 insertions(+), 42 deletions(-)

1 0