May 2020 - Wine-devel - list.winehq.org

[PATCH 6/6] wined3d: Implement Vulkan NULL cube image shader resource view descriptors.
by Henri Verbeet 14 May '20

14 May '20

From: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 4 ++++ dlls/wined3d/device.c | 39 +++++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index c53b9aa6c65..f3b0a42b8f1 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1352,6 +1352,10 @@ static bool wined3d_shader_resource_bindings_add_null_srv_binding(struct wined3d return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_3d, NULL); + case WINED3D_SHADER_RESOURCE_TEXTURE_CUBE: + return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_cube, NULL); + case WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY: return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_2d_array, NULL); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4ad475734b4..3716d3e0635 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -666,7 +666,7 @@ static void wined3d_null_image_vk_cleanup(struct wined3d_null_image_vk *image, } static bool wined3d_null_image_vk_init(struct wined3d_null_image_vk *image, struct wined3d_context_vk *context_vk, - VkCommandBuffer vk_command_buffer, VkImageType type, unsigned int sample_count) + VkCommandBuffer vk_command_buffer, VkImageType type, unsigned int layer_count, unsigned int sample_count) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info = context_vk->vk_info; @@ -674,23 +674,27 @@ static bool wined3d_null_image_vk_init(struct wined3d_null_image_vk *image, stru VkImageSubresourceRange range; VkImageCreateInfo image_desc; unsigned int memory_type_idx; + uint32_t flags = 0; VkResult vr; static const VkClearColorValue colour = {0}; - TRACE("image %p, context_vk %p, vk_command_buffer %p, type %#x, sample_count %u.\n", - image, context_vk, vk_command_buffer, type, sample_count); + TRACE("image %p, context_vk %p, vk_command_buffer %p, type %#x, layer_count %u, sample_count %u.\n", + image, context_vk, vk_command_buffer, type, layer_count, sample_count); + + if (type == VK_IMAGE_TYPE_2D && layer_count >= 6) + flags |= VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT; image_desc.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; image_desc.pNext = NULL; - image_desc.flags = 0; + image_desc.flags = flags; image_desc.imageType = type; image_desc.format = VK_FORMAT_R8G8B8A8_UNORM; image_desc.extent.width = 1; image_desc.extent.height = 1; image_desc.extent.depth = 1; image_desc.mipLevels = 1; - image_desc.arrayLayers = 1; + image_desc.arrayLayers = layer_count; image_desc.samples = sample_count; image_desc.tiling = VK_IMAGE_TILING_OPTIMAL; image_desc.usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT; @@ -748,7 +752,7 @@ static bool wined3d_null_image_vk_init(struct wined3d_null_image_vk *image, stru range.baseMipLevel = 0; range.levelCount = 1; range.baseArrayLayer = 0; - range.layerCount = 1; + range.layerCount = layer_count; VK_CALL(vkCmdClearColorImage(vk_command_buffer, image->vk_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, &colour, 1, &range)); @@ -793,25 +797,25 @@ bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk return false; VK_CALL(vkCmdFillBuffer(vk_command_buffer, r->bo.vk_buffer, r->bo.buffer_offset, r->bo.size, 0x00000000u)); - if (!wined3d_null_image_vk_init(&r->image_1d, context_vk, vk_command_buffer, VK_IMAGE_TYPE_1D, 1)) + if (!wined3d_null_image_vk_init(&r->image_1d, context_vk, vk_command_buffer, VK_IMAGE_TYPE_1D, 1, 1)) { ERR("Failed to create 1D image.\n"); goto fail; } - if (!wined3d_null_image_vk_init(&r->image_2d, context_vk, vk_command_buffer, VK_IMAGE_TYPE_2D, 1)) + if (!wined3d_null_image_vk_init(&r->image_2d, context_vk, vk_command_buffer, VK_IMAGE_TYPE_2D, 6, 1)) { ERR("Failed to create 2D image.\n"); goto fail; } - if (!wined3d_null_image_vk_init(&r->image_2dms, context_vk, vk_command_buffer, VK_IMAGE_TYPE_2D, sample_count)) + if (!wined3d_null_image_vk_init(&r->image_2dms, context_vk, vk_command_buffer, VK_IMAGE_TYPE_2D, 1, sample_count)) { ERR("Failed to create 2D MSAA image.\n"); goto fail; } - if (!wined3d_null_image_vk_init(&r->image_3d, context_vk, vk_command_buffer, VK_IMAGE_TYPE_3D, 1)) + if (!wined3d_null_image_vk_init(&r->image_3d, context_vk, vk_command_buffer, VK_IMAGE_TYPE_3D, 1, 1)) { ERR("Failed to create 3D image.\n"); goto fail; @@ -942,6 +946,18 @@ bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, st TRACE("Created 3D image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_3d.imageView)); view_desc.image = r->image_2d.vk_image; + view_desc.subresourceRange.layerCount = 6; + view_desc.viewType = VK_IMAGE_VIEW_TYPE_CUBE; + if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &view_desc, NULL, &v->vk_info_cube.imageView))) < 0) + { + ERR("Failed to create cube image view, vr %s.\n", wined3d_debug_vkresult(vr)); + goto fail; + } + v->vk_info_cube.sampler = VK_NULL_HANDLE; + v->vk_info_cube.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + TRACE("Created cube image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_cube.imageView)); + + view_desc.subresourceRange.layerCount = 1; view_desc.viewType = VK_IMAGE_VIEW_TYPE_2D_ARRAY; if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &view_desc, NULL, &v->vk_info_2d_array.imageView))) < 0) { @@ -968,6 +984,8 @@ bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, st fail: if (v->vk_info_2d_array.imageView) VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_2d_array.imageView, NULL)); + if (v->vk_info_cube.imageView) + VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_cube.imageView, NULL)); if (v->vk_info_3d.imageView) VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_3d.imageView, NULL)); if (v->vk_info_2dms.imageView) @@ -989,6 +1007,7 @@ void wined3d_device_vk_destroy_null_views(struct wined3d_device_vk *device_vk, s wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2dms_array.imageView, id); wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2d_array.imageView, id); + wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_cube.imageView, id); wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_3d.imageView, id); wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2dms.imageView, id); wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2d.imageView, id); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ebbe379f2d2..dda26aacd07 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3632,6 +3632,7 @@ struct wined3d_null_views_vk VkDescriptorImageInfo vk_info_2d; VkDescriptorImageInfo vk_info_2dms; VkDescriptorImageInfo vk_info_3d; + VkDescriptorImageInfo vk_info_cube; VkDescriptorImageInfo vk_info_2d_array; VkDescriptorImageInfo vk_info_2dms_array; }; -- 2.20.1

1 0

[PATCH 5/6] wined3d: Implement Vulkan NULL 3D image shader resource view descriptors.
by Henri Verbeet 14 May '20

14 May '20

From: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 4 ++++ dlls/wined3d/device.c | 23 +++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 29 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 0bd4f2260ab..c53b9aa6c65 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1348,6 +1348,10 @@ static bool wined3d_shader_resource_bindings_add_null_srv_binding(struct wined3d return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_2dms, NULL); + case WINED3D_SHADER_RESOURCE_TEXTURE_3D: + return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_3d, NULL); + case WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY: return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_2d_array, NULL); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ed746c7efab..4ad475734b4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -811,10 +811,18 @@ bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk goto fail; } + if (!wined3d_null_image_vk_init(&r->image_3d, context_vk, vk_command_buffer, VK_IMAGE_TYPE_3D, 1)) + { + ERR("Failed to create 3D image.\n"); + goto fail; + } + return true; fail: id = context_vk->current_command_buffer.id; + if (r->image_2dms.vk_image) + wined3d_null_image_vk_cleanup(&r->image_2dms, context_vk, id); if (r->image_2d.vk_image) wined3d_null_image_vk_cleanup(&r->image_2d, context_vk, id); if (r->image_1d.vk_image) @@ -832,6 +840,7 @@ void wined3d_device_vk_destroy_null_resources(struct wined3d_device_vk *device_v /* We don't track command buffer references to NULL resources. We easily * could, but it doesn't seem worth it. */ + wined3d_null_image_vk_cleanup(&r->image_3d, context_vk, id); wined3d_null_image_vk_cleanup(&r->image_2dms, context_vk, id); wined3d_null_image_vk_cleanup(&r->image_2d, context_vk, id); wined3d_null_image_vk_cleanup(&r->image_1d, context_vk, id); @@ -921,6 +930,17 @@ bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, st v->vk_info_2dms.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; TRACE("Created 2D MSAA image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_2dms.imageView)); + view_desc.image = r->image_3d.vk_image; + view_desc.viewType = VK_IMAGE_VIEW_TYPE_3D; + if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &view_desc, NULL, &v->vk_info_3d.imageView))) < 0) + { + ERR("Failed to create 3D image view, vr %s.\n", wined3d_debug_vkresult(vr)); + goto fail; + } + v->vk_info_3d.sampler = VK_NULL_HANDLE; + v->vk_info_3d.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + TRACE("Created 3D image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_3d.imageView)); + view_desc.image = r->image_2d.vk_image; view_desc.viewType = VK_IMAGE_VIEW_TYPE_2D_ARRAY; if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &view_desc, NULL, &v->vk_info_2d_array.imageView))) < 0) @@ -948,6 +968,8 @@ bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, st fail: if (v->vk_info_2d_array.imageView) VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_2d_array.imageView, NULL)); + if (v->vk_info_3d.imageView) + VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_3d.imageView, NULL)); if (v->vk_info_2dms.imageView) VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_2dms.imageView, NULL)); if (v->vk_info_2d.imageView) @@ -967,6 +989,7 @@ void wined3d_device_vk_destroy_null_views(struct wined3d_device_vk *device_vk, s wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2dms_array.imageView, id); wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2d_array.imageView, id); + wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_3d.imageView, id); wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2dms.imageView, id); wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2d.imageView, id); wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_1d.imageView, id); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3e87c364ab5..ebbe379f2d2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3620,6 +3620,7 @@ struct wined3d_null_resources_vk struct wined3d_null_image_vk image_1d; struct wined3d_null_image_vk image_2d; struct wined3d_null_image_vk image_2dms; + struct wined3d_null_image_vk image_3d; }; struct wined3d_null_views_vk @@ -3630,6 +3631,7 @@ struct wined3d_null_views_vk VkDescriptorImageInfo vk_info_1d; VkDescriptorImageInfo vk_info_2d; VkDescriptorImageInfo vk_info_2dms; + VkDescriptorImageInfo vk_info_3d; VkDescriptorImageInfo vk_info_2d_array; VkDescriptorImageInfo vk_info_2dms_array; }; -- 2.20.1

1 0

[PATCH 4/6] wined3d: Implement Vulkan NULL 2D image shader resource view descriptors.
by Henri Verbeet 14 May '20

14 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 16 +++++ dlls/wined3d/device.c | 104 ++++++++++++++++++++++++++++++--- dlls/wined3d/wined3d_private.h | 6 ++ 3 files changed, 117 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 648c53e48c6..0bd4f2260ab 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1340,6 +1340,22 @@ static bool wined3d_shader_resource_bindings_add_null_srv_binding(struct wined3d return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_1d, NULL); + case WINED3D_SHADER_RESOURCE_TEXTURE_2D: + return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_2d, NULL); + + case WINED3D_SHADER_RESOURCE_TEXTURE_2DMS: + return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_2dms, NULL); + + case WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY: + return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_2d_array, NULL); + + case WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY: + return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_2dms_array, NULL); + default: FIXME("Unhandled resource type %#x.\n", type); return false; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index aa031b986bd..ed746c7efab 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -665,8 +665,8 @@ static void wined3d_null_image_vk_cleanup(struct wined3d_null_image_vk *image, wined3d_context_vk_destroy_memory(context_vk, image->vk_memory, command_buffer_id); } -static bool wined3d_null_image_vk_init(struct wined3d_null_image_vk *image, - struct wined3d_context_vk *context_vk, VkCommandBuffer vk_command_buffer) +static bool wined3d_null_image_vk_init(struct wined3d_null_image_vk *image, struct wined3d_context_vk *context_vk, + VkCommandBuffer vk_command_buffer, VkImageType type, unsigned int sample_count) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info = context_vk->vk_info; @@ -678,19 +678,20 @@ static bool wined3d_null_image_vk_init(struct wined3d_null_image_vk *image, static const VkClearColorValue colour = {0}; - TRACE("image %p, context_vk %p, vk_command_buffer %p.\n", image, context_vk, vk_command_buffer); + TRACE("image %p, context_vk %p, vk_command_buffer %p, type %#x, sample_count %u.\n", + image, context_vk, vk_command_buffer, type, sample_count); image_desc.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; image_desc.pNext = NULL; image_desc.flags = 0; - image_desc.imageType = VK_IMAGE_TYPE_1D; + image_desc.imageType = type; image_desc.format = VK_FORMAT_R8G8B8A8_UNORM; image_desc.extent.width = 1; image_desc.extent.height = 1; image_desc.extent.depth = 1; image_desc.mipLevels = 1; image_desc.arrayLayers = 1; - image_desc.samples = VK_SAMPLE_COUNT_1_BIT; + image_desc.samples = sample_count; image_desc.tiling = VK_IMAGE_TILING_OPTIMAL; image_desc.usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT; image_desc.sharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -767,9 +768,16 @@ bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk { struct wined3d_null_resources_vk *r = &device_vk->null_resources_vk; const struct wined3d_vk_info *vk_info; + const struct wined3d_format *format; VkMemoryPropertyFlags memory_type; VkCommandBuffer vk_command_buffer; + unsigned int sample_count = 2; VkBufferUsageFlags usage; + uint64_t id; + + format = wined3d_get_format(device_vk->d.adapter, WINED3DFMT_R8G8B8A8_UNORM, WINED3D_BIND_SHADER_RESOURCE); + while (sample_count && !(sample_count & format->multisample_types)) + sample_count <<= 1; if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) { @@ -785,15 +793,35 @@ bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk return false; VK_CALL(vkCmdFillBuffer(vk_command_buffer, r->bo.vk_buffer, r->bo.buffer_offset, r->bo.size, 0x00000000u)); - if (!wined3d_null_image_vk_init(&r->image_1d, context_vk, vk_command_buffer)) + if (!wined3d_null_image_vk_init(&r->image_1d, context_vk, vk_command_buffer, VK_IMAGE_TYPE_1D, 1)) { ERR("Failed to create 1D image.\n"); - wined3d_context_vk_reference_bo(context_vk, &r->bo); - wined3d_context_vk_destroy_bo(context_vk, &r->bo); - return false; + goto fail; + } + + if (!wined3d_null_image_vk_init(&r->image_2d, context_vk, vk_command_buffer, VK_IMAGE_TYPE_2D, 1)) + { + ERR("Failed to create 2D image.\n"); + goto fail; + } + + if (!wined3d_null_image_vk_init(&r->image_2dms, context_vk, vk_command_buffer, VK_IMAGE_TYPE_2D, sample_count)) + { + ERR("Failed to create 2D MSAA image.\n"); + goto fail; } return true; + +fail: + id = context_vk->current_command_buffer.id; + if (r->image_2d.vk_image) + wined3d_null_image_vk_cleanup(&r->image_2d, context_vk, id); + if (r->image_1d.vk_image) + wined3d_null_image_vk_cleanup(&r->image_1d, context_vk, id); + wined3d_context_vk_reference_bo(context_vk, &r->bo); + wined3d_context_vk_destroy_bo(context_vk, &r->bo); + return false; } void wined3d_device_vk_destroy_null_resources(struct wined3d_device_vk *device_vk, @@ -804,6 +832,8 @@ void wined3d_device_vk_destroy_null_resources(struct wined3d_device_vk *device_v /* We don't track command buffer references to NULL resources. We easily * could, but it doesn't seem worth it. */ + wined3d_null_image_vk_cleanup(&r->image_2dms, context_vk, id); + wined3d_null_image_vk_cleanup(&r->image_2d, context_vk, id); wined3d_null_image_vk_cleanup(&r->image_1d, context_vk, id); wined3d_context_vk_reference_bo(context_vk, &r->bo); wined3d_context_vk_destroy_bo(context_vk, &r->bo); @@ -869,9 +899,61 @@ bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, st v->vk_info_1d.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; TRACE("Created 1D image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_1d.imageView)); + view_desc.image = r->image_2d.vk_image; + view_desc.viewType = VK_IMAGE_VIEW_TYPE_2D; + if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &view_desc, NULL, &v->vk_info_2d.imageView))) < 0) + { + ERR("Failed to create 2D image view, vr %s.\n", wined3d_debug_vkresult(vr)); + goto fail; + } + v->vk_info_2d.sampler = VK_NULL_HANDLE; + v->vk_info_2d.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + TRACE("Created 2D image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_2d.imageView)); + + view_desc.image = r->image_2dms.vk_image; + view_desc.viewType = VK_IMAGE_VIEW_TYPE_2D; + if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &view_desc, NULL, &v->vk_info_2dms.imageView))) < 0) + { + ERR("Failed to create 2D MSAA image view, vr %s.\n", wined3d_debug_vkresult(vr)); + goto fail; + } + v->vk_info_2dms.sampler = VK_NULL_HANDLE; + v->vk_info_2dms.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + TRACE("Created 2D MSAA image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_2dms.imageView)); + + view_desc.image = r->image_2d.vk_image; + view_desc.viewType = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &view_desc, NULL, &v->vk_info_2d_array.imageView))) < 0) + { + ERR("Failed to create 2D array image view, vr %s.\n", wined3d_debug_vkresult(vr)); + goto fail; + } + v->vk_info_2d_array.sampler = VK_NULL_HANDLE; + v->vk_info_2d_array.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + TRACE("Created 2D array image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_2d_array.imageView)); + + view_desc.image = r->image_2dms.vk_image; + view_desc.viewType = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &view_desc, NULL, &v->vk_info_2dms_array.imageView))) < 0) + { + ERR("Failed to create 2D MSAA array image view, vr %s.\n", wined3d_debug_vkresult(vr)); + goto fail; + } + v->vk_info_2dms_array.sampler = VK_NULL_HANDLE; + v->vk_info_2dms_array.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + TRACE("Created 2D MSAA array image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_2dms_array.imageView)); + return true; fail: + if (v->vk_info_2d_array.imageView) + VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_2d_array.imageView, NULL)); + if (v->vk_info_2dms.imageView) + VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_2dms.imageView, NULL)); + if (v->vk_info_2d.imageView) + VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_2d.imageView, NULL)); + if (v->vk_info_1d.imageView) + VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_1d.imageView, NULL)); if (v->vk_view_buffer_float) VK_CALL(vkDestroyBufferView(device_vk->vk_device, v->vk_view_buffer_float, NULL)); VK_CALL(vkDestroyBufferView(device_vk->vk_device, v->vk_view_buffer_uint, NULL)); @@ -883,6 +965,10 @@ void wined3d_device_vk_destroy_null_views(struct wined3d_device_vk *device_vk, s struct wined3d_null_views_vk *v = &device_vk->null_views_vk; uint64_t id = context_vk->current_command_buffer.id; + wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2dms_array.imageView, id); + wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2d_array.imageView, id); + wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2dms.imageView, id); + wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_2d.imageView, id); wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_1d.imageView, id); wined3d_context_vk_destroy_buffer_view(context_vk, v->vk_view_buffer_float, id); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6124eabe185..3e87c364ab5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3618,6 +3618,8 @@ struct wined3d_null_resources_vk { struct wined3d_bo_vk bo; struct wined3d_null_image_vk image_1d; + struct wined3d_null_image_vk image_2d; + struct wined3d_null_image_vk image_2dms; }; struct wined3d_null_views_vk @@ -3626,6 +3628,10 @@ struct wined3d_null_views_vk VkBufferView vk_view_buffer_float; VkDescriptorImageInfo vk_info_1d; + VkDescriptorImageInfo vk_info_2d; + VkDescriptorImageInfo vk_info_2dms; + VkDescriptorImageInfo vk_info_2d_array; + VkDescriptorImageInfo vk_info_2dms_array; }; #define WINED3D_ALLOCATOR_CHUNK_SIZE (64 * 1024 * 1024) -- 2.20.1

1 0

[PATCH 3/6] wined3d: Implement Vulkan NULL 1D image shader resource view descriptors.
by Henri Verbeet 14 May '20

14 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 4 + dlls/wined3d/device.c | 153 ++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 10 +++ 3 files changed, 165 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 0199b655dff..648c53e48c6 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1336,6 +1336,10 @@ static bool wined3d_shader_resource_bindings_add_null_srv_binding(struct wined3d return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding_idx, VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, NULL, NULL, &v->vk_view_buffer_uint); + case WINED3D_SHADER_RESOURCE_TEXTURE_1D: + return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_1d, NULL); + default: FIXME("Unhandled resource type %#x.\n", type); return false; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 081001e487e..aa031b986bd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -655,6 +655,113 @@ void wined3d_device_destroy_default_samplers(struct wined3d_device *device, stru device->null_sampler = NULL; } +static void wined3d_null_image_vk_cleanup(struct wined3d_null_image_vk *image, + struct wined3d_context_vk *context_vk, uint64_t command_buffer_id) +{ + wined3d_context_vk_destroy_image(context_vk, image->vk_image, command_buffer_id); + if (image->memory) + wined3d_context_vk_destroy_allocator_block(context_vk, image->memory, command_buffer_id); + else + wined3d_context_vk_destroy_memory(context_vk, image->vk_memory, command_buffer_id); +} + +static bool wined3d_null_image_vk_init(struct wined3d_null_image_vk *image, + struct wined3d_context_vk *context_vk, VkCommandBuffer vk_command_buffer) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + VkMemoryRequirements memory_requirements; + VkImageSubresourceRange range; + VkImageCreateInfo image_desc; + unsigned int memory_type_idx; + VkResult vr; + + static const VkClearColorValue colour = {0}; + + TRACE("image %p, context_vk %p, vk_command_buffer %p.\n", image, context_vk, vk_command_buffer); + + image_desc.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; + image_desc.pNext = NULL; + image_desc.flags = 0; + image_desc.imageType = VK_IMAGE_TYPE_1D; + image_desc.format = VK_FORMAT_R8G8B8A8_UNORM; + image_desc.extent.width = 1; + image_desc.extent.height = 1; + image_desc.extent.depth = 1; + image_desc.mipLevels = 1; + image_desc.arrayLayers = 1; + image_desc.samples = VK_SAMPLE_COUNT_1_BIT; + image_desc.tiling = VK_IMAGE_TILING_OPTIMAL; + image_desc.usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT; + image_desc.sharingMode = VK_SHARING_MODE_EXCLUSIVE; + image_desc.queueFamilyIndexCount = 0; + image_desc.pQueueFamilyIndices = NULL; + image_desc.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; + if ((vr = VK_CALL(vkCreateImage(device_vk->vk_device, &image_desc, NULL, &image->vk_image))) < 0) + { + ERR("Failed to create Vulkan image, vr %s.\n", wined3d_debug_vkresult(vr)); + return false; + } + + VK_CALL(vkGetImageMemoryRequirements(device_vk->vk_device, image->vk_image, &memory_requirements)); + + memory_type_idx = wined3d_adapter_vk_get_memory_type_index(wined3d_adapter_vk(device_vk->d.adapter), + memory_requirements.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT); + if (memory_type_idx == ~0u) + { + ERR("Failed to find suitable image memory type.\n"); + VK_CALL(vkDestroyImage(device_vk->vk_device, image->vk_image, NULL)); + image->vk_image = VK_NULL_HANDLE; + return false; + } + + image->memory = wined3d_context_vk_allocate_memory(context_vk, + memory_type_idx, memory_requirements.size, &image->vk_memory); + if (!image->vk_memory) + { + ERR("Failed to allocate image memory.\n"); + VK_CALL(vkDestroyImage(device_vk->vk_device, image->vk_image, NULL)); + image->vk_image = VK_NULL_HANDLE; + return false; + } + + if ((vr = VK_CALL(vkBindImageMemory(device_vk->vk_device, image->vk_image, + image->vk_memory, image->memory ? image->memory->offset : 0))) < 0) + { + ERR("Failed to bind image memory, vr %s.\n", wined3d_debug_vkresult(vr)); + if (image->memory) + wined3d_allocator_block_free(image->memory); + else + VK_CALL(vkFreeMemory(device_vk->vk_device, image->vk_memory, NULL)); + VK_CALL(vkDestroyImage(device_vk->vk_device, image->vk_image, NULL)); + image->vk_image = VK_NULL_HANDLE; + return false; + } + + wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, + VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, VK_ACCESS_TRANSFER_WRITE_BIT, + VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, + image->vk_image, VK_IMAGE_ASPECT_COLOR_BIT); + + range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + range.baseMipLevel = 0; + range.levelCount = 1; + range.baseArrayLayer = 0; + range.layerCount = 1; + VK_CALL(vkCmdClearColorImage(vk_command_buffer, image->vk_image, + VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, &colour, 1, &range)); + + wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, + VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_ACCESS_TRANSFER_WRITE_BIT, 0, + VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, + image->vk_image, VK_IMAGE_ASPECT_COLOR_BIT); + + TRACE("Created NULL image 0x%s, memory 0x%s.\n", + wine_dbgstr_longlong(image->vk_image), wine_dbgstr_longlong(image->vk_memory)); + + return true; +} + bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk, struct wined3d_context_vk *context_vk) { @@ -678,6 +785,14 @@ bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk return false; VK_CALL(vkCmdFillBuffer(vk_command_buffer, r->bo.vk_buffer, r->bo.buffer_offset, r->bo.size, 0x00000000u)); + if (!wined3d_null_image_vk_init(&r->image_1d, context_vk, vk_command_buffer)) + { + ERR("Failed to create 1D image.\n"); + wined3d_context_vk_reference_bo(context_vk, &r->bo); + wined3d_context_vk_destroy_bo(context_vk, &r->bo); + return false; + } + return true; } @@ -685,9 +800,11 @@ void wined3d_device_vk_destroy_null_resources(struct wined3d_device_vk *device_v struct wined3d_context_vk *context_vk) { struct wined3d_null_resources_vk *r = &device_vk->null_resources_vk; + uint64_t id = context_vk->current_command_buffer.id; /* We don't track command buffer references to NULL resources. We easily * could, but it doesn't seem worth it. */ + wined3d_null_image_vk_cleanup(&r->image_1d, context_vk, id); wined3d_context_vk_reference_bo(context_vk, &r->bo); wined3d_context_vk_destroy_bo(context_vk, &r->bo); } @@ -698,6 +815,7 @@ bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, st struct wined3d_null_views_vk *v = &device_vk->null_views_vk; VkBufferViewCreateInfo buffer_create_info; const struct wined3d_vk_info *vk_info; + VkImageViewCreateInfo view_desc; VkResult vr; vk_info = context_vk->vk_info; @@ -723,12 +841,41 @@ bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, st &buffer_create_info, NULL, &v->vk_view_buffer_float))) < 0) { ERR("Failed to create buffer view, vr %s.\n", wined3d_debug_vkresult(vr)); - VK_CALL(vkDestroyBufferView(device_vk->vk_device, v->vk_view_buffer_uint, NULL)); - return false; + goto fail; } TRACE("Created buffer view 0x%s.\n", wine_dbgstr_longlong(v->vk_view_buffer_float)); + view_desc.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO; + view_desc.pNext = NULL; + view_desc.flags = 0; + view_desc.image = r->image_1d.vk_image; + view_desc.viewType = VK_IMAGE_VIEW_TYPE_1D; + view_desc.format = VK_FORMAT_R8G8B8A8_UNORM; + view_desc.components.r = VK_COMPONENT_SWIZZLE_ZERO; + view_desc.components.g = VK_COMPONENT_SWIZZLE_ZERO; + view_desc.components.b = VK_COMPONENT_SWIZZLE_ZERO; + view_desc.components.a = VK_COMPONENT_SWIZZLE_ZERO; + view_desc.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + view_desc.subresourceRange.baseMipLevel = 0; + view_desc.subresourceRange.levelCount = 1; + view_desc.subresourceRange.baseArrayLayer = 0; + view_desc.subresourceRange.layerCount = 1; + if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &view_desc, NULL, &v->vk_info_1d.imageView))) < 0) + { + ERR("Failed to create 1D image view, vr %s.\n", wined3d_debug_vkresult(vr)); + goto fail; + } + v->vk_info_1d.sampler = VK_NULL_HANDLE; + v->vk_info_1d.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + TRACE("Created 1D image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_1d.imageView)); + return true; + +fail: + if (v->vk_view_buffer_float) + VK_CALL(vkDestroyBufferView(device_vk->vk_device, v->vk_view_buffer_float, NULL)); + VK_CALL(vkDestroyBufferView(device_vk->vk_device, v->vk_view_buffer_uint, NULL)); + return false; } void wined3d_device_vk_destroy_null_views(struct wined3d_device_vk *device_vk, struct wined3d_context_vk *context_vk) @@ -736,6 +883,8 @@ void wined3d_device_vk_destroy_null_views(struct wined3d_device_vk *device_vk, s struct wined3d_null_views_vk *v = &device_vk->null_views_vk; uint64_t id = context_vk->current_command_buffer.id; + wined3d_context_vk_destroy_image_view(context_vk, v->vk_info_1d.imageView, id); + wined3d_context_vk_destroy_buffer_view(context_vk, v->vk_view_buffer_float, id); wined3d_context_vk_destroy_buffer_view(context_vk, v->vk_view_buffer_uint, id); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3d2273b9f63..6124eabe185 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3607,15 +3607,25 @@ static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_gl, d); } +struct wined3d_null_image_vk +{ + VkImage vk_image; + struct wined3d_allocator_block *memory; + VkDeviceMemory vk_memory; +}; + struct wined3d_null_resources_vk { struct wined3d_bo_vk bo; + struct wined3d_null_image_vk image_1d; }; struct wined3d_null_views_vk { VkBufferView vk_view_buffer_uint; VkBufferView vk_view_buffer_float; + + VkDescriptorImageInfo vk_info_1d; }; #define WINED3D_ALLOCATOR_CHUNK_SIZE (64 * 1024 * 1024) -- 2.20.1

1 0

[PATCH 2/6] wined3d: Implement Vulkan NULL buffer shader resource view descriptors.
by Henri Verbeet 14 May '20

14 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 4 ++ dlls/wined3d/context_vk.c | 27 ++++++++++- dlls/wined3d/device.c | 85 ++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 23 +++++++++ 4 files changed, 137 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 4dbbb0b80ef..cf82d00e40b 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -678,6 +678,8 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) wined3d_vk_blitter_create(&device_vk->d.blitter); wined3d_device_create_default_samplers(device, &context_vk->c); + wined3d_device_vk_create_null_resources(device_vk, context_vk); + wined3d_device_vk_create_null_views(device_vk, context_vk); return WINED3D_OK; } @@ -701,6 +703,8 @@ static void adapter_vk_uninit_3d_cs(void *object) device->blitter->ops->blitter_destroy(device->blitter, NULL); device->shader_backend->shader_free_private(device, &context_vk->c); + wined3d_device_vk_destroy_null_views(device_vk, context_vk); + wined3d_device_vk_destroy_null_resources(device_vk, context_vk); wined3d_device_destroy_default_samplers(device, &context_vk->c); } diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 2f170b085ba..0199b655dff 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1321,6 +1321,27 @@ static bool wined3d_shader_descriptor_writes_vk_add_write(struct wined3d_shader_ return true; } +static bool wined3d_shader_resource_bindings_add_null_srv_binding(struct wined3d_shader_descriptor_writes_vk *writes, + VkDescriptorSet vk_descriptor_set, size_t binding_idx, enum wined3d_shader_resource_type type, + enum wined3d_data_type data_type, struct wined3d_context_vk *context_vk) +{ + const struct wined3d_null_views_vk *v = &wined3d_device_vk(context_vk->c.device)->null_views_vk; + + switch (type) + { + case WINED3D_SHADER_RESOURCE_BUFFER: + if (data_type == WINED3D_DATA_FLOAT) + return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding_idx, + VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, NULL, NULL, &v->vk_view_buffer_float); + return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding_idx, + VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, NULL, NULL, &v->vk_view_buffer_uint); + + default: + FIXME("Unhandled resource type %#x.\n", type); + return false; + } +} + static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *context_vk, VkCommandBuffer vk_command_buffer, const struct wined3d_state *state) { @@ -1374,8 +1395,10 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con case WINED3D_SHADER_DESCRIPTOR_TYPE_SRV: if (!(srv = state->shader_resource_view[binding->shader_type][binding->resource_idx])) { - FIXME("NULL shader resource views not implemented.\n"); - return false; + if (!wined3d_shader_resource_bindings_add_null_srv_binding(writes, vk_descriptor_set, + binding->binding_idx, binding->resource_type, binding->resource_data_type, context_vk)) + return false; + break; } resource = srv->resource; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cc13ab4863e..081001e487e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -655,6 +655,91 @@ void wined3d_device_destroy_default_samplers(struct wined3d_device *device, stru device->null_sampler = NULL; } +bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk, + struct wined3d_context_vk *context_vk) +{ + struct wined3d_null_resources_vk *r = &device_vk->null_resources_vk; + const struct wined3d_vk_info *vk_info; + VkMemoryPropertyFlags memory_type; + VkCommandBuffer vk_command_buffer; + VkBufferUsageFlags usage; + + if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) + { + ERR("Failed to get command buffer.\n"); + return false; + } + + vk_info = context_vk->vk_info; + + usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT; + memory_type = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + if (!wined3d_context_vk_create_bo(context_vk, 16, usage, memory_type, &r->bo)) + return false; + VK_CALL(vkCmdFillBuffer(vk_command_buffer, r->bo.vk_buffer, r->bo.buffer_offset, r->bo.size, 0x00000000u)); + + return true; +} + +void wined3d_device_vk_destroy_null_resources(struct wined3d_device_vk *device_vk, + struct wined3d_context_vk *context_vk) +{ + struct wined3d_null_resources_vk *r = &device_vk->null_resources_vk; + + /* We don't track command buffer references to NULL resources. We easily + * could, but it doesn't seem worth it. */ + wined3d_context_vk_reference_bo(context_vk, &r->bo); + wined3d_context_vk_destroy_bo(context_vk, &r->bo); +} + +bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, struct wined3d_context_vk *context_vk) +{ + struct wined3d_null_resources_vk *r = &device_vk->null_resources_vk; + struct wined3d_null_views_vk *v = &device_vk->null_views_vk; + VkBufferViewCreateInfo buffer_create_info; + const struct wined3d_vk_info *vk_info; + VkResult vr; + + vk_info = context_vk->vk_info; + + buffer_create_info.sType = VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO; + buffer_create_info.pNext = NULL; + buffer_create_info.flags = 0; + buffer_create_info.buffer = r->bo.vk_buffer; + buffer_create_info.format = VK_FORMAT_R32_UINT; + buffer_create_info.offset = r->bo.buffer_offset;; + buffer_create_info.range = r->bo.size; + + if ((vr = VK_CALL(vkCreateBufferView(device_vk->vk_device, + &buffer_create_info, NULL, &v->vk_view_buffer_uint))) < 0) + { + ERR("Failed to create buffer view, vr %s.\n", wined3d_debug_vkresult(vr)); + return false; + } + TRACE("Created buffer view 0x%s.\n", wine_dbgstr_longlong(v->vk_view_buffer_uint)); + + buffer_create_info.format = VK_FORMAT_R32G32B32A32_SFLOAT; + if ((vr = VK_CALL(vkCreateBufferView(device_vk->vk_device, + &buffer_create_info, NULL, &v->vk_view_buffer_float))) < 0) + { + ERR("Failed to create buffer view, vr %s.\n", wined3d_debug_vkresult(vr)); + VK_CALL(vkDestroyBufferView(device_vk->vk_device, v->vk_view_buffer_uint, NULL)); + return false; + } + TRACE("Created buffer view 0x%s.\n", wine_dbgstr_longlong(v->vk_view_buffer_float)); + + return true; +} + +void wined3d_device_vk_destroy_null_views(struct wined3d_device_vk *device_vk, struct wined3d_context_vk *context_vk) +{ + struct wined3d_null_views_vk *v = &device_vk->null_views_vk; + uint64_t id = context_vk->current_command_buffer.id; + + wined3d_context_vk_destroy_buffer_view(context_vk, v->vk_view_buffer_float, id); + wined3d_context_vk_destroy_buffer_view(context_vk, v->vk_view_buffer_uint, id); +} + HRESULT CDECL wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window) { unsigned int screensaver_active; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d9e8ffa816f..3d2273b9f63 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3607,6 +3607,17 @@ static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_gl, d); } +struct wined3d_null_resources_vk +{ + struct wined3d_bo_vk bo; +}; + +struct wined3d_null_views_vk +{ + VkBufferView vk_view_buffer_uint; + VkBufferView vk_view_buffer_float; +}; + #define WINED3D_ALLOCATOR_CHUNK_SIZE (64 * 1024 * 1024) #define WINED3D_ALLOCATOR_CHUNK_ORDER_COUNT 15 #define WINED3D_ALLOCATOR_MIN_BLOCK_SIZE (WINED3D_ALLOCATOR_CHUNK_SIZE >> (WINED3D_ALLOCATOR_CHUNK_ORDER_COUNT - 1)) @@ -3691,6 +3702,9 @@ struct wined3d_device_vk struct wined3d_vk_info vk_info; + struct wined3d_null_resources_vk null_resources_vk; + struct wined3d_null_views_vk null_views_vk; + struct wined3d_allocator allocator; }; @@ -3699,6 +3713,15 @@ static inline struct wined3d_device_vk *wined3d_device_vk(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_vk, d); } +bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +void wined3d_device_vk_destroy_null_resources(struct wined3d_device_vk *device_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +void wined3d_device_vk_destroy_null_views(struct wined3d_device_vk *device_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; + static inline float wined3d_alpha_ref(const struct wined3d_state *state) { return (state->render_states[WINED3D_RS_ALPHAREF] & 0xff) / 255.0f; -- 2.20.1

1 0

[PATCH 1/6] wined3d: Implement Vulkan unordered access view counter descriptors.
by Henri Verbeet 14 May '20

14 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index e37cbc787fc..2f170b085ba 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1329,6 +1329,7 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con const struct wined3d_vk_info *vk_info = context_vk->vk_info; const struct wined3d_shader_resource_binding *binding; struct wined3d_shader_resource_bindings *bindings; + struct wined3d_unordered_access_view_vk *uav_vk; struct wined3d_unordered_access_view *uav; const VkDescriptorBufferInfo *buffer_info; struct wined3d_shader_resource_view *srv; @@ -1434,6 +1435,20 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con return false; break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV_COUNTER: + if (!(uav = state->unordered_access_view[WINED3D_PIPELINE_COMPUTE][binding->resource_idx])) + { + FIXME("NULL unordered access view counters not implemented.\n"); + return false; + } + + uav_vk = wined3d_unordered_access_view_vk(uav); + if (!uav_vk->vk_counter_view || !wined3d_shader_descriptor_writes_vk_add_write(writes, + vk_descriptor_set, binding->binding_idx, VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, + NULL, NULL, &uav_vk->vk_counter_view)) + return false; + break; + case WINED3D_SHADER_DESCRIPTOR_TYPE_SAMPLER: if (!(sampler = state->sampler[binding->shader_type][binding->resource_idx])) sampler = context_vk->c.device->null_sampler; @@ -1443,7 +1458,7 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con break; default: - FIXME("Unhandled descriptor type %#x.\n", binding->shader_descriptor_type); + ERR("Invalid descriptor type %#x.\n", binding->shader_descriptor_type); return false; } } -- 2.20.1

1 0

[PATCH 1/2] mf/sar: Use MF_AUDIO_RENDERER_ATTRIBUTE_FLAGS attribute to configure audio client.
by Nikolay Sivov 13 May '20

13 May '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/sar.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 0ea46dcb891..aa0e4eb853c 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -95,6 +95,10 @@ struct audio_renderer IAudioRenderClient *audio_render_client; IAudioStreamVolume *stream_volume; ISimpleAudioVolume *audio_volume; + struct + { + unsigned int flags; + } stream_config; HANDLE buffer_ready_event; MFWORKITEM_KEY buffer_ready_key; unsigned int frame_size; @@ -1170,6 +1174,10 @@ static HRESULT sar_create_mmdevice(IMFAttributes *attributes, struct audio_rende else hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, eRender, role, &renderer->device); + /* Configuration attributes to be used later for audio client initialization. */ + if (attributes) + IMFAttributes_GetUINT32(attributes, &MF_AUDIO_RENDERER_ATTRIBUTE_FLAGS, &renderer->stream_config.flags); + if (FAILED(hr)) hr = MF_E_NO_AUDIO_PLAYBACK_DEVICE; @@ -1503,6 +1511,7 @@ static HRESULT WINAPI audio_renderer_stream_type_handler_GetMediaTypeByIndex(IMF static HRESULT audio_renderer_create_audio_client(struct audio_renderer *renderer) { IMFAsyncResult *result; + unsigned int flags; WAVEFORMATEX *wfx; HRESULT hr; @@ -1516,8 +1525,6 @@ static HRESULT audio_renderer_create_audio_client(struct audio_renderer *rendere return hr; } - /* FIXME: use SAR configuration for flags and session id. */ - /* FIXME: for now always use default format. */ if (FAILED(hr = IAudioClient_GetMixFormat(renderer->audio_client, &wfx))) { @@ -1527,8 +1534,12 @@ static HRESULT audio_renderer_create_audio_client(struct audio_renderer *rendere renderer->frame_size = wfx->wBitsPerSample * wfx->nChannels / 8; - hr = IAudioClient_Initialize(renderer->audio_client, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK, - 1000000, 0, wfx, NULL); + flags = AUDCLNT_STREAMFLAGS_EVENTCALLBACK; + if (renderer->stream_config.flags & MF_AUDIO_RENDERER_ATTRIBUTE_FLAGS_CROSSPROCESS) + flags |= AUDCLNT_STREAMFLAGS_CROSSPROCESS; + if (renderer->stream_config.flags & MF_AUDIO_RENDERER_ATTRIBUTE_FLAGS_NOPERSIST) + flags |= AUDCLNT_STREAMFLAGS_NOPERSIST; + hr = IAudioClient_Initialize(renderer->audio_client, AUDCLNT_SHAREMODE_SHARED, flags, 1000000, 0, wfx, NULL); CoTaskMemFree(wfx); if (FAILED(hr)) { -- 2.26.2

1 1

[v2 PATCH] include/dwrite.idl: Fix typo in DWRITE_INFORMATIONAL_STRING_WWS_FAMILY_NAME member name.
by Nikolay Sivov 13 May '20

13 May '20

From: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/dwrite.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dwrite.idl b/include/dwrite.idl index a8c523edda1..d5ce849386f 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -138,7 +138,7 @@ typedef enum DWRITE_INFORMATIONAL_STRING_ID DWRITE_INFORMATIONAL_STRING_SUPPORTED_SCRIPT_LANGUAGE_TAG, DWRITE_INFORMATIONAL_STRING_PREFERRED_FAMILY_NAMES = DWRITE_INFORMATIONAL_STRING_TYPOGRAPHIC_FAMILY_NAMES, DWRITE_INFORMATIONAL_STRING_PREFERRED_SUBFAMILY_NAMES = DWRITE_INFORMATIONAL_STRING_TYPOGRAPHIC_SUBFAMILY_NAMES, - DWRITE_INFORMATIONAL_STRING_WWS_FAMILY_NAMES = DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME, + DWRITE_INFORMATIONAL_STRING_WWS_FAMILY_NAME = DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME, } DWRITE_INFORMATIONAL_STRING_ID; typedef enum DWRITE_FONT_SIMULATIONS -- 2.26.2

1 0

[v2 PATCH] include/dwrite_1.idl: Fix typo in DWRITE_PANOSE_STROKE_VARIATION symbol name.
by Nikolay Sivov 13 May '20

13 May '20

From: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: with more descriptive subject include/dwrite_1.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dwrite_1.idl b/include/dwrite_1.idl index c00e922076f..902af41a85e 100644 --- a/include/dwrite_1.idl +++ b/include/dwrite_1.idl @@ -114,7 +114,7 @@ typedef enum DWRITE_PANOSE_STROKE_VARIATION DWRITE_PANOSE_STROKE_VARIATION_RAPID_HORIZONTAL, DWRITE_PANOSE_STROKE_VARIATION_INSTANT_VERTICAL, DWRITE_PANOSE_STROKE_VARIATION_INSTANT_HORIZONTAL -} DWRITE_PANOSE_STROKE_VARIANTION; +} DWRITE_PANOSE_STROKE_VARIATION; typedef enum DWRITE_PANOSE_ARM_STYLE { -- 2.26.2

1 0

[PATCH] quartz/tests: Fix a crash in test_allocate_surface_helper().
by Zebediah Figura 13 May '20

13 May '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index e3efe56e44..57e92ad714 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2622,18 +2622,22 @@ static void test_allocate_surface_helper(void) HRESULT hr; ULONG ref; + AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); + window = CreateWindowA("static", "quartz_test", WS_OVERLAPPEDWINDOW, 0, 0, + rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, NULL); + if (!(device = create_device(window))) + { + IBaseFilter_Release(filter); + DestroyWindow(window); + return; + } + IBaseFilter_QueryInterface(filter, &IID_IVMRSurfaceAllocatorNotify9, (void **)&notify); count = 2; hr = IVMRSurfaceAllocatorNotify9_AllocateSurfaceHelper(notify, &info, &count, surfaces); todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr); - AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); - window = CreateWindowA("static", "quartz_test", WS_OVERLAPPEDWINDOW, 0, 0, - rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, NULL); - if (!(device = create_device(window))) - goto out; - hr = IVMRSurfaceAllocatorNotify9_SetD3DDevice(notify, device, MonitorFromWindow(window, MONITOR_DEFAULTTOPRIMARY)); if (hr == E_NOINTERFACE) { -- 2.26.2

1 0