[PATCH vkd3d 5/7] vkd3d: Initialize NULL CBV buffer.
Józef Kucia
joseph.kucia at gmail.com
Thu Mar 28 11:07:26 CDT 2019
From: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
libs/vkd3d/command.c | 6 +--
libs/vkd3d/resource.c | 107 ++++++++++++++++++++++++++++++++++++-
libs/vkd3d/vkd3d_private.h | 4 ++
3 files changed, 113 insertions(+), 4 deletions(-)
diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c
index 3b479a2fe222..d39458f9c6d9 100644
--- a/libs/vkd3d/command.c
+++ b/libs/vkd3d/command.c
@@ -55,7 +55,7 @@ void vkd3d_queue_destroy(struct vkd3d_queue *queue)
vkd3d_free(queue);
}
-static VkQueue vkd3d_queue_acquire(struct vkd3d_queue *queue)
+VkQueue vkd3d_queue_acquire(struct vkd3d_queue *queue)
{
int rc;
@@ -71,7 +71,7 @@ static VkQueue vkd3d_queue_acquire(struct vkd3d_queue *queue)
return queue->vk_queue;
}
-static void vkd3d_queue_release(struct vkd3d_queue *queue)
+void vkd3d_queue_release(struct vkd3d_queue *queue)
{
TRACE("queue %p.\n", queue);
@@ -1164,7 +1164,7 @@ static struct d3d12_command_allocator *unsafe_impl_from_ID3D12CommandAllocator(I
return impl_from_ID3D12CommandAllocator(iface);
}
-static struct vkd3d_queue *d3d12_device_get_vkd3d_queue(struct d3d12_device *device,
+struct vkd3d_queue *d3d12_device_get_vkd3d_queue(struct d3d12_device *device,
D3D12_COMMAND_LIST_TYPE type)
{
switch (type)
diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c
index 8e16a854c65b..294150858800 100644
--- a/libs/vkd3d/resource.c
+++ b/libs/vkd3d/resource.c
@@ -3078,6 +3078,109 @@ HRESULT d3d12_query_heap_create(struct d3d12_device *device, const D3D12_QUERY_H
return S_OK;
}
+static HRESULT vkd3d_init_null_resources_data(struct vkd3d_null_resources *null_resource,
+ struct d3d12_device *device)
+{
+ const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
+ VkCommandBufferAllocateInfo command_buffer_info;
+ VkCommandPool vk_command_pool = VK_NULL_HANDLE;
+ VkCommandPoolCreateInfo command_pool_info;
+ VkDevice vk_device = device->vk_device;
+ VkCommandBufferBeginInfo begin_info;
+ VkCommandBuffer vk_command_buffer;
+ VkFence vk_fence = VK_NULL_HANDLE;
+ VkFenceCreateInfo fence_info;
+ struct vkd3d_queue *queue;
+ VkSubmitInfo submit_info;
+ VkQueue vk_queue;
+ VkResult vr;
+
+ queue = d3d12_device_get_vkd3d_queue(device, D3D12_COMMAND_LIST_TYPE_DIRECT);
+
+ command_pool_info.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO;
+ command_pool_info.pNext = NULL;
+ command_pool_info.flags = 0;
+ command_pool_info.queueFamilyIndex = queue->vk_family_index;
+
+ if ((vr = VK_CALL(vkCreateCommandPool(vk_device, &command_pool_info, NULL, &vk_command_pool))) < 0)
+ {
+ WARN("Failed to create Vulkan command pool, vr %d.\n", vr);
+ goto done;
+ }
+
+ command_buffer_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
+ command_buffer_info.pNext = NULL;
+ command_buffer_info.commandPool = vk_command_pool;
+ command_buffer_info.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
+ command_buffer_info.commandBufferCount = 1;
+
+ if ((vr = VK_CALL(vkAllocateCommandBuffers(vk_device, &command_buffer_info, &vk_command_buffer))) < 0)
+ {
+ WARN("Failed to allocate Vulkan command buffer, vr %d.\n", vr);
+ goto done;
+ }
+
+ begin_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
+ begin_info.pNext = NULL;
+ begin_info.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
+ begin_info.pInheritanceInfo = NULL;
+
+ if ((vr = VK_CALL(vkBeginCommandBuffer(vk_command_buffer, &begin_info))) < 0)
+ {
+ WARN("Failed to begin command buffer, vr %d.\n", vr);
+ goto done;
+ }
+
+ VK_CALL(vkCmdFillBuffer(vk_command_buffer, null_resource->vk_uniform_buffer, 0, VK_WHOLE_SIZE, 0x00000000));
+
+ if ((vr = VK_CALL(vkEndCommandBuffer(vk_command_buffer))) < 0)
+ {
+ WARN("Failed to end command buffer, vr %d.\n", vr);
+ goto done;
+ }
+
+ fence_info.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO;
+ fence_info.pNext = NULL;
+ fence_info.flags = 0;
+
+ if ((vr = VK_CALL(vkCreateFence(device->vk_device, &fence_info, NULL, &vk_fence))) < 0)
+ {
+ WARN("Failed to create Vulkan fence, vr %d.\n", vr);
+ goto done;
+ }
+
+ submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
+ submit_info.pNext = NULL;
+ submit_info.waitSemaphoreCount = 0;
+ submit_info.pWaitSemaphores = NULL;
+ submit_info.pWaitDstStageMask = NULL;
+ submit_info.commandBufferCount = 1;
+ submit_info.pCommandBuffers = &vk_command_buffer;
+ submit_info.signalSemaphoreCount = 0;
+ submit_info.pSignalSemaphores = NULL;
+
+ if (!(vk_queue = vkd3d_queue_acquire(queue)))
+ {
+ WARN("Failed to acquire queue %p.\n", queue);
+ goto done;
+ }
+
+ if ((vr = VK_CALL(vkQueueSubmit(vk_queue, 1, &submit_info, vk_fence))) < 0)
+ ERR("Failed to submit, vr %d.\n", vr);
+
+ vkd3d_queue_release(queue);
+
+ vr = VK_CALL(vkWaitForFences(device->vk_device, 1, &vk_fence, VK_FALSE, ~(uint64_t)0));
+ if (vr != VK_SUCCESS)
+ WARN("Failed to wait fo fence, vr %d.\n", vr);
+
+done:
+ VK_CALL(vkDestroyCommandPool(vk_device, vk_command_pool, NULL));
+ VK_CALL(vkDestroyFence(vk_device, vk_fence, NULL));
+
+ return hresult_from_vk_result(vr);
+}
+
HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources,
struct d3d12_device *device)
{
@@ -3086,6 +3189,8 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources,
VkResult vr;
HRESULT hr;
+ TRACE("Creating resources for NULL views.\n");
+
memset(null_resources, 0, sizeof(*null_resources));
memset(&heap_properties, 0, sizeof(heap_properties));
@@ -3119,7 +3224,7 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources,
VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, "NULL CBV memory")) < 0)
WARN("Failed to set object name, vr %d.\n", vr);
- return S_OK;
+ return vkd3d_init_null_resources_data(null_resources, device);
fail:
ERR("Failed to initialize NULL resources, hr %#x.\n", hr);
diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index babe5db23363..e791d780e80b 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -835,10 +835,12 @@ struct vkd3d_queue
uint32_t timestamp_bits;
};
+VkQueue vkd3d_queue_acquire(struct vkd3d_queue *queue) DECLSPEC_HIDDEN;
HRESULT vkd3d_queue_create(struct d3d12_device *device,
uint32_t family_index, const VkQueueFamilyProperties *properties,
struct vkd3d_queue **queue) DECLSPEC_HIDDEN;
void vkd3d_queue_destroy(struct vkd3d_queue *queue) DECLSPEC_HIDDEN;
+void vkd3d_queue_release(struct vkd3d_queue *queue) DECLSPEC_HIDDEN;
/* ID3D12CommandQueue */
struct d3d12_command_queue
@@ -935,6 +937,8 @@ struct d3d12_device
HRESULT d3d12_device_create(struct vkd3d_instance *instance,
const struct vkd3d_device_create_info *create_info, struct d3d12_device **device) DECLSPEC_HIDDEN;
+struct vkd3d_queue *d3d12_device_get_vkd3d_queue(struct d3d12_device *device,
+ D3D12_COMMAND_LIST_TYPE type) DECLSPEC_HIDDEN;
void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason,
const char *message, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN;
struct d3d12_device *unsafe_impl_from_ID3D12Device(ID3D12Device *iface) DECLSPEC_HIDDEN;
--
2.19.2
More information about the wine-devel
mailing list