Henri Verbeet : wined3d: Implement NULL constant buffer views for the Vulkan backend.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 50a90dcb3230b65fefdbb8d9c5fff0d7968172e3
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=50a90dcb3230b65fefdbb8d9c...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Fri Jan 22 10:45:22 2021 +0100

wined3d: Implement NULL constant buffer views for the Vulkan backend.

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/wined3d/context_vk.c      | 7 +++++--
 dlls/wined3d/device.c          | 6 +++++-
 dlls/wined3d/wined3d_private.h | 2 ++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c
index b8414155dc0..841b3d742c6 100644
--- a/dlls/wined3d/context_vk.c
+++ b/dlls/wined3d/context_vk.c
@@ -2527,8 +2527,11 @@ static bool wined3d_context_vk_update_descriptors(struct wined3d_context_vk *con
             case WINED3D_SHADER_DESCRIPTOR_TYPE_CBV:
                 if (!(buffer = state->cb[binding->shader_type][binding->resource_idx]))
                 {
-                    FIXME("NULL constant buffer views not implemented.\n");
-                    return false;
+                    if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set,
+                            binding->binding_idx, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
+                            &device_vk->null_resources_vk.buffer_info, NULL, NULL))
+                        return false;
+                    break;
                 }
                 buffer_vk = wined3d_buffer_vk(buffer);
                 buffer_info = wined3d_buffer_vk_get_buffer_info(buffer_vk);
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index cc40125ac95..3c16a3c691e 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -717,11 +717,15 @@ bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk
 
     vk_info = context_vk->vk_info;
 
-    usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT;
+    usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT
+            | VK_BUFFER_USAGE_UNIFORM_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));
+    r->buffer_info.buffer = r->bo.vk_buffer;
+    r->buffer_info.offset = r->bo.buffer_offset;
+    r->buffer_info.range = r->bo.size;
 
     if (!wined3d_null_image_vk_init(&r->image_1d, context_vk, vk_command_buffer, VK_IMAGE_TYPE_1D, 1, 1))
     {
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 07ddb57333c..b3934f0d8e4 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3875,6 +3875,8 @@ struct wined3d_null_image_vk
 struct wined3d_null_resources_vk
 {
     struct wined3d_bo_vk bo;
+    VkDescriptorBufferInfo buffer_info;
+
     struct wined3d_null_image_vk image_1d;
     struct wined3d_null_image_vk image_2d;
     struct wined3d_null_image_vk image_2dms;