KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

turnip: Use a common vk_queue structure 

Switch to using common structure.

Signed-off-by: Yevhenii Kolesnikov <yevhenii.kolesnikov@globallogic.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Danylo Piliaiev <dpiliaiev@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13000>
This commit is contained in:
Yevhenii Kolesnikov 2021-04-06 15:28:28 +03:00 committed by Marge Bot
parent e2b59e3408
commit 37d32dcce3
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/freedreno/vulkan/tu_device.c
View File

@ -1427,7 +1427,9 @@ tu_queue_init(struct tu_device *device,
int idx,
VkDeviceQueueCreateFlags flags)
{
vk_object_base_init(&device->vk, &queue->base, VK_OBJECT_TYPE_QUEUE);
VkResult result = vk_queue_init(&queue->vk, &device->vk);
if (result != VK_SUCCESS)
return result;
queue->device = device;
queue->queue_family_index = queue_family_index;
@ -1449,7 +1451,7 @@ tu_queue_init(struct tu_device *device,
static void
tu_queue_finish(struct tu_queue *queue)
{
vk_object_base_finish(&queue->base);
vk_queue_finish(&queue->vk);
if (queue->fence >= 0)
close(queue->fence);
tu_drm_submitqueue_close(queue->device, queue->msm_queue_id);

5
src/freedreno/vulkan/tu_private.h
View File

@ -93,6 +93,7 @@ typedef uint32_t xcb_window_t;
#include "vk_format.h"
#include "vk_command_buffer.h"
#include "vk_queue.h"
#define MAX_VBS 32
#define MAX_VERTEX_ATTRIBS 32
@ -298,7 +299,7 @@ struct tu_u_trace_syncobj;
struct tu_queue
{
struct vk_object_base base;
struct vk_queue vk;
struct tu_device *device;
uint32_t queue_family_index;
@ -1772,7 +1773,7 @@ VK_DEFINE_HANDLE_CASTS(tu_instance, vk.base, VkInstance,
VK_OBJECT_TYPE_INSTANCE)
VK_DEFINE_HANDLE_CASTS(tu_physical_device, vk.base, VkPhysicalDevice,
VK_OBJECT_TYPE_PHYSICAL_DEVICE)
VK_DEFINE_HANDLE_CASTS(tu_queue, base, VkQueue, VK_OBJECT_TYPE_QUEUE)
VK_DEFINE_HANDLE_CASTS(tu_queue, vk.base, VkQueue, VK_OBJECT_TYPE_QUEUE)
VK_DEFINE_NONDISP_HANDLE_CASTS(tu_cmd_pool, base, VkCommandPool,
VK_OBJECT_TYPE_COMMAND_POOL)