Henri Verbeet : wined3d: Implement Vulkan buffer unordered access view descriptors.
Alexandre Julliard
julliard at winehq.org
Wed May 13 16:29:55 CDT 2020
Module: wine
Branch: master
Commit: d9db5298d6f959130dd03e1c975a1162c1a93931
URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9db5298d6f959130dd03e1c975a1162c1a93931
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed May 13 19:34:52 2020 +0430
wined3d: Implement Vulkan buffer unordered access view descriptors.
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/adapter_vk.c | 1 +
dlls/wined3d/context_vk.c | 49 +++++++++++++++++++++++++++++++++++++++++-
dlls/wined3d/view.c | 28 ++++++++++++++++++++++--
dlls/wined3d/wined3d_private.h | 14 ++++++++++++
4 files changed, 89 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c
index 8758627cb1..4dbbb0b80e 100644
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -1438,6 +1438,7 @@ static void adapter_vk_destroy_unordered_access_view(struct wined3d_unordered_ac
vk_buffer_view = &view_vk->u.vk_buffer_view;
else
vk_image_view = &view_vk->u.vk_image_info.imageView;
+ list_remove(&view_vk->bo_user.entry);
wined3d_unordered_access_view_cleanup(&uav_vk->v);
wined3d_view_vk_destroy(device, vk_buffer_view, vk_image_view, &uav_vk->counter_bo,
&uav_vk->vk_counter_view, &view_vk->command_buffer_id, uav_vk);
diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c
index ba1f6bb926..e31527f8be 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 *uav;
const VkDescriptorBufferInfo *buffer_info;
struct wined3d_shader_resource_view *srv;
const VkDescriptorImageInfo *image_info;
@@ -1401,6 +1402,32 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con
return false;
break;
+ case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV:
+ if (!(uav = state->unordered_access_view[WINED3D_PIPELINE_COMPUTE][binding->resource_idx]))
+ {
+ FIXME("NULL unordered access views not implemented.\n");
+ return false;
+ }
+ resource = uav->resource;
+
+ view_vk = &wined3d_unordered_access_view_vk(uav)->view_vk;
+ if (resource->type == WINED3D_RTYPE_BUFFER)
+ {
+ image_info = NULL;
+ buffer_view = &view_vk->u.vk_buffer_view;
+ type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER;
+ }
+ else
+ {
+ FIXME("Image UAVs not implemented.\n");
+ return false;
+ }
+
+ if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set,
+ binding->binding_idx, type, NULL, image_info, buffer_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;
@@ -1512,7 +1539,9 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk *
const struct wined3d_shader_resource_bindings *bindings = &context_vk->compute.bindings;
struct wined3d_shader_descriptor_writes_vk *writes = &context_vk->descriptor_writes;
const struct wined3d_shader_resource_binding *binding;
+ struct wined3d_unordered_access_view_vk *uav_vk;
struct wined3d_shader_resource_view_vk *srv_vk;
+ struct wined3d_unordered_access_view *uav;
struct wined3d_shader_resource_view *srv;
struct wined3d_buffer_vk *buffer_vk;
struct wined3d_sampler *sampler;
@@ -1558,6 +1587,24 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk *
wined3d_context_vk_reference_shader_resource_view(context_vk, srv_vk);
break;
+ case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV:
+ if (!(uav = state->unordered_access_view[WINED3D_PIPELINE_COMPUTE][binding->resource_idx]))
+ break;
+
+ uav_vk = wined3d_unordered_access_view_vk(uav);
+ if (uav->resource->type == WINED3D_RTYPE_BUFFER)
+ {
+ if (!uav_vk->view_vk.bo_user.valid)
+ {
+ wined3d_unordered_access_view_vk_update(uav_vk, context_vk);
+ context_invalidate_compute_state(&context_vk->c, STATE_COMPUTE_UNORDERED_ACCESS_VIEW_BINDING);
+ }
+ wined3d_buffer_load(buffer_from_resource(uav->resource), &context_vk->c, state);
+ wined3d_unordered_access_view_invalidate_location(uav, ~WINED3D_LOCATION_BUFFER);
+ }
+ wined3d_context_vk_reference_unordered_access_view(context_vk, uav_vk);
+ break;
+
case WINED3D_SHADER_DESCRIPTOR_TYPE_UAV_COUNTER:
break;
@@ -1568,7 +1615,7 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk *
break;
default:
- FIXME("Unhandled descriptor type %#x.\n", binding->shader_descriptor_type);
+ ERR("Invalid descriptor type %#x.\n", binding->shader_descriptor_type);
break;
}
}
diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
index 4a75c69657..10fcd69513 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -1478,6 +1478,25 @@ HRESULT wined3d_unordered_access_view_gl_init(struct wined3d_unordered_access_vi
return hr;
}
+void wined3d_unordered_access_view_vk_update(struct wined3d_unordered_access_view_vk *uav_vk,
+ struct wined3d_context_vk *context_vk)
+{
+ const struct wined3d_format_vk *view_format_vk = wined3d_format_vk(uav_vk->v.format);
+ const struct wined3d_view_desc *desc = &uav_vk->v.desc;
+ struct wined3d_resource *resource = uav_vk->v.resource;
+ struct wined3d_view_vk *view_vk = &uav_vk->view_vk;
+ struct wined3d_buffer_vk *buffer_vk;
+ VkBufferView vk_buffer_view;
+
+ buffer_vk = wined3d_buffer_vk(buffer_from_resource(resource));
+ wined3d_context_vk_destroy_buffer_view(context_vk, view_vk->u.vk_buffer_view, view_vk->command_buffer_id);
+ if ((vk_buffer_view = wined3d_view_vk_create_buffer_view(context_vk, desc, buffer_vk, view_format_vk)))
+ {
+ view_vk->u.vk_buffer_view = vk_buffer_view;
+ view_vk->bo_user.valid = true;
+ }
+}
+
static void wined3d_unordered_access_view_vk_cs_init(void *object)
{
struct wined3d_unordered_access_view_vk *uav_vk = object;
@@ -1488,6 +1507,7 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object)
struct wined3d_texture_vk *texture_vk;
struct wined3d_context_vk *context_vk;
struct wined3d_device_vk *device_vk;
+ struct wined3d_buffer_vk *buffer_vk;
VkBufferViewCreateInfo create_info;
struct wined3d_resource *resource;
VkBufferView vk_buffer_view;
@@ -1501,15 +1521,18 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object)
if (resource->type == WINED3D_RTYPE_BUFFER)
{
+ buffer_vk = wined3d_buffer_vk(buffer_from_resource(resource));
+
context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0));
vk_info = context_vk->vk_info;
- if ((vk_buffer_view = wined3d_view_vk_create_buffer_view(context_vk,
- desc, wined3d_buffer_vk(buffer_from_resource(resource)), format_vk)))
+ if ((vk_buffer_view = wined3d_view_vk_create_buffer_view(context_vk, desc, buffer_vk, format_vk)))
{
TRACE("Created buffer view 0x%s.\n", wine_dbgstr_longlong(vk_buffer_view));
uav_vk->view_vk.u.vk_buffer_view = vk_buffer_view;
+ uav_vk->view_vk.bo_user.valid = true;
+ list_add_head(&buffer_vk->bo.users, &view_vk->bo_user.entry);
}
if (desc->flags & (WINED3D_VIEW_BUFFER_COUNTER | WINED3D_VIEW_BUFFER_APPEND))
@@ -1597,6 +1620,7 @@ HRESULT wined3d_unordered_access_view_vk_init(struct wined3d_unordered_access_vi
if (FAILED(hr = wined3d_unordered_access_view_init(&view_vk->v, desc, resource, parent, parent_ops)))
return hr;
+ list_init(&view_vk->view_vk.bo_user.entry);
wined3d_cs_init_object(resource->device->cs, wined3d_unordered_access_view_vk_cs_init, view_vk);
return hr;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 93852e0de7..d9e8ffa816 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -4784,6 +4784,8 @@ static inline struct wined3d_unordered_access_view_vk *wined3d_unordered_access_
HRESULT wined3d_unordered_access_view_vk_init(struct wined3d_unordered_access_view_vk *view_vk,
const struct wined3d_view_desc *desc, struct wined3d_resource *resource,
void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;
+void wined3d_unordered_access_view_vk_update(struct wined3d_unordered_access_view_vk *view_vk,
+ struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN;
struct wined3d_swapchain_state
{
@@ -5692,6 +5694,18 @@ static inline void wined3d_context_vk_reference_shader_resource_view(const struc
srv_vk->view_vk.command_buffer_id = context_vk->current_command_buffer.id;
}
+static inline void wined3d_context_vk_reference_unordered_access_view(const struct wined3d_context_vk *context_vk,
+ struct wined3d_unordered_access_view_vk *uav_vk)
+{
+ struct wined3d_resource *resource = uav_vk->v.resource;
+
+ if (resource->type == WINED3D_RTYPE_BUFFER)
+ wined3d_context_vk_reference_bo(context_vk, &wined3d_buffer_vk(buffer_from_resource(resource))->bo);
+ else
+ wined3d_context_vk_reference_texture(context_vk, wined3d_texture_vk(texture_from_resource(resource)));
+ uav_vk->view_vk.command_buffer_id = context_vk->current_command_buffer.id;
+}
+
static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_view *dsv,
const struct wined3d_format *srv_format)
{
More information about the wine-cvs
mailing list