Implement most of the stuff for command submission
This commit is contained in:
Bill Currie
parent
ae11a70147
commit
411b897f09
|
|
@ -0,0 +1,79 @@
|
|||
#ifndef __QF_Vulkan_command_h
|
||||
#define __QF_Vulkan_command_h
|
||||
|
||||
typedef struct qfv_cmdpool_s {
|
||||
VkDevice dev;
|
||||
struct qfv_devfuncs_s *funcs;
|
||||
VkCommandPool cmdpool;
|
||||
} qfv_cmdpool_t;
|
||||
|
||||
typedef struct qfv_cmdbuffer_s {
|
||||
VkDevice dev;
|
||||
struct qfv_devfuncs_s *funcs;
|
||||
VkCommandBuffer buffer;
|
||||
} qfv_cmdbuffer_t;
|
||||
|
||||
typedef struct qfv_cmdbufferset_s {
|
||||
VkDevice dev;
|
||||
struct qfv_devfuncs_s *funcs;
|
||||
VkCommandBuffer *buffers;
|
||||
int numBuffers;
|
||||
} qfv_cmdbufferset_t;
|
||||
|
||||
typedef struct qfv_semaphore_s {
|
||||
VkDevice dev;
|
||||
struct qfv_devfuncs_s *funcs;
|
||||
VkSemaphore semaphore;
|
||||
} qfv_semaphore_t;
|
||||
|
||||
typedef struct qfv_semaphoreset_s {
|
||||
VkDevice dev;
|
||||
struct qfv_devfuncs_s *funcs;
|
||||
VkSemaphore *semaphores;
|
||||
VkPipelineStageFlags *stages;
|
||||
int numSemaphores;
|
||||
} qfv_semaphoreset_t;
|
||||
|
||||
typedef struct qfv_fence_s {
|
||||
VkDevice dev;
|
||||
struct qfv_devfuncs_s *funcs;
|
||||
VkFence fence;
|
||||
} qfv_fence_t;
|
||||
|
||||
typedef struct qfv_fenceset_s {
|
||||
VkDevice dev;
|
||||
struct qfv_devfuncs_s *funcs;
|
||||
VkFence *fences;
|
||||
int numFences;
|
||||
} qfv_fenceset_t;
|
||||
|
||||
struct qfv_device_s;
|
||||
qfv_cmdpool_t *QFV_CreateCommandPool (struct qfv_device_s *device,
|
||||
uint32_t queueFamily,
|
||||
int transient, int reset);
|
||||
int QFV_ResetCommandPool (qfv_cmdpool_t *pool, int release);
|
||||
qfv_cmdbuffer_t *QFV_AllocateCommandBuffers (qfv_cmdpool_t *pool,
|
||||
int secondary, int count);
|
||||
qfv_cmdbufferset_t *QFV_CreateCommandBufferSet (qfv_cmdbuffer_t **buffers,
|
||||
int numBuffers);
|
||||
int QFV_BeginCommandBuffer (qfv_cmdbuffer_t *buffer, int oneTime,
|
||||
int rpContinue, int simultaneous,
|
||||
VkCommandBufferInheritanceInfo *inheritanceInfo);
|
||||
int QFV_EndCommandBuffer (qfv_cmdbuffer_t *buffer);
|
||||
int QFV_ResetCommandBuffer (qfv_cmdbuffer_t *buffer, int release);
|
||||
|
||||
qfv_semaphore_t *QFV_CreateSemaphore (struct qfv_device_s *device);
|
||||
qfv_semaphoreset_t *QFV_CreateSemaphoreSet (qfv_semaphore_t **semaphores,
|
||||
int numSemaphores);
|
||||
|
||||
qfv_fence_t *QFV_CreateFence (struct qfv_device_s *device, int signaled);
|
||||
qfv_fenceset_t *QFV_CreateFenceSet (qfv_fence_t **fences, int numFences);
|
||||
int QFV_WaitForFences (qfv_fenceset_t *fences, int all, uint64_t timeout);
|
||||
int QFV_ResetFences (qfv_fenceset_t *fences);
|
||||
int QFV_QueueSubmit (struct qfv_device_s *device,
|
||||
qfv_semaphoreset_t *waitSemaphores,
|
||||
qfv_cmdbufferset_t *buffers,
|
||||
qfv_semaphoreset_t *signalSemaphores, qfv_fence_t *fence);
|
||||
|
||||
|
||||
#endif//__QF_Vulkan_command_h
|
||||
|
|
@ -90,6 +90,17 @@ PRESENTATION_VULKAN_FUNCTION_FROM_EXTENSION
|
|||
|
||||
DEVICE_LEVEL_VULKAN_FUNCTION (vkDestroyDevice)
|
||||
DEVICE_LEVEL_VULKAN_FUNCTION (vkGetDeviceQueue)
|
||||
DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateCommandPool)
|
||||
DEVICE_LEVEL_VULKAN_FUNCTION (vkResetCommandPool)
|
||||
DEVICE_LEVEL_VULKAN_FUNCTION (vkAllocateCommandBuffers)
|
||||
DEVICE_LEVEL_VULKAN_FUNCTION (vkBeginCommandBuffer)
|
||||
DEVICE_LEVEL_VULKAN_FUNCTION (vkEndCommandBuffer)
|
||||
DEVICE_LEVEL_VULKAN_FUNCTION (vkResetCommandBuffer)
|
||||
DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateSemaphore)
|
||||
DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateFence)
|
||||
DEVICE_LEVEL_VULKAN_FUNCTION (vkWaitForFences)
|
||||
DEVICE_LEVEL_VULKAN_FUNCTION (vkResetFences)
|
||||
DEVICE_LEVEL_VULKAN_FUNCTION (vkQueueSubmit)
|
||||
|
||||
#undef DEVICE_LEVEL_VULKAN_FUNCTION
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ AM_CFLAGS= @PREFER_PIC@
|
|||
AM_CPPFLAGS= -I$(top_srcdir)/include -DVK_NO_PROTOTYPES
|
||||
|
||||
vulkan_src = \
|
||||
command.c \
|
||||
device.c \
|
||||
instance.c \
|
||||
swapchain.c \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,316 @@
|
|||
/*
|
||||
vid_common_vulkan.c
|
||||
|
||||
Common Vulkan video driver functions
|
||||
|
||||
Copyright (C) 1996-1997 Id Software, Inc.
|
||||
Copyright (C) 2019 Bill Currie <bill@taniwha.org>
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
as published by the Free Software Foundation; either version 2
|
||||
of the License, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
See the GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to:
|
||||
|
||||
Free Software Foundation, Inc.
|
||||
59 Temple Place - Suite 330
|
||||
Boston, MA 02111-1307, USA
|
||||
|
||||
*/
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_MATH_H
|
||||
# include <math.h>
|
||||
#endif
|
||||
#ifdef HAVE_STRING_H
|
||||
# include <string.h>
|
||||
#endif
|
||||
#ifdef HAVE_STRINGS_H
|
||||
# include <strings.h>
|
||||
#endif
|
||||
|
||||
#include "QF/cvar.h"
|
||||
#include "QF/dstring.h"
|
||||
#include "QF/input.h"
|
||||
#include "QF/mathlib.h"
|
||||
#include "QF/qargs.h"
|
||||
#include "QF/quakefs.h"
|
||||
#include "QF/sys.h"
|
||||
#include "QF/va.h"
|
||||
#include "QF/vid.h"
|
||||
#include "QF/Vulkan/qf_vid.h"
|
||||
#include "QF/Vulkan/command.h"
|
||||
#include "QF/Vulkan/device.h"
|
||||
#include "QF/Vulkan/instance.h"
|
||||
|
||||
#include "compat.h"
|
||||
#include "d_iface.h"
|
||||
#include "r_internal.h"
|
||||
#include "vid_vulkan.h"
|
||||
|
||||
#include "util.h"
|
||||
|
||||
qfv_cmdpool_t *
|
||||
QFV_CreateCommandPool (qfv_device_t *device, uint32_t queueFamily,
|
||||
int transient, int reset)
|
||||
{
|
||||
VkDevice dev = device->dev;
|
||||
qfv_devfuncs_t *dfunc = device->funcs;
|
||||
uint32_t flags = 0;
|
||||
if (transient) {
|
||||
flags |= VK_COMMAND_POOL_CREATE_TRANSIENT_BIT;
|
||||
}
|
||||
if (reset) {
|
||||
flags |= VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT;
|
||||
}
|
||||
VkCommandPoolCreateInfo createInfo = {
|
||||
VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, 0,
|
||||
flags,
|
||||
queueFamily
|
||||
};
|
||||
qfv_cmdpool_t *cmdpool = malloc (sizeof (*cmdpool));
|
||||
dfunc->vkCreateCommandPool (dev, &createInfo, 0, &cmdpool->cmdpool);
|
||||
cmdpool->dev = dev;
|
||||
cmdpool->funcs = dfunc;
|
||||
return cmdpool;
|
||||
}
|
||||
|
||||
int
|
||||
QFV_ResetCommandPool (qfv_cmdpool_t *pool, int release)
|
||||
{
|
||||
VkDevice dev = pool->dev;
|
||||
VkCommandPool cmdpool = pool->cmdpool;
|
||||
qfv_devfuncs_t *dfunc = pool->funcs;
|
||||
VkCommandPoolResetFlags release_flag = 0;
|
||||
|
||||
if (release) {
|
||||
release_flag = VK_COMMAND_POOL_RESET_RELEASE_RESOURCES_BIT;
|
||||
}
|
||||
|
||||
return dfunc->vkResetCommandPool (dev, cmdpool, release_flag) == VK_SUCCESS;
|
||||
}
|
||||
|
||||
qfv_cmdbuffer_t *
|
||||
QFV_AllocateCommandBuffers (qfv_cmdpool_t *pool, int secondary, int count)
|
||||
{
|
||||
VkDevice dev = pool->dev;
|
||||
qfv_devfuncs_t *dfunc = pool->funcs;
|
||||
uint32_t level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
|
||||
if (secondary) {
|
||||
level = VK_COMMAND_BUFFER_LEVEL_SECONDARY;
|
||||
}
|
||||
VkCommandBufferAllocateInfo allocInfo = {
|
||||
VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, 0,
|
||||
pool->cmdpool, level, count
|
||||
};
|
||||
qfv_cmdbuffer_t *cmdbuffers = malloc (count * sizeof (*cmdbuffers));
|
||||
VkCommandBuffer *buffers = alloca (count * sizeof (*buffers));
|
||||
dfunc->vkAllocateCommandBuffers (dev, &allocInfo, buffers);
|
||||
for (int i = 0; i < count; i++) {
|
||||
cmdbuffers[i].dev = dev;
|
||||
cmdbuffers[i].funcs = dfunc;
|
||||
cmdbuffers[i].buffer = buffers[i];
|
||||
}
|
||||
return cmdbuffers;
|
||||
}
|
||||
|
||||
qfv_cmdbufferset_t *
|
||||
QFV_CreateCommandBufferSet (qfv_cmdbuffer_t **buffers, int numBuffers)
|
||||
{
|
||||
VkDevice dev = buffers[0]->dev;
|
||||
qfv_devfuncs_t *dfunc = buffers[0]->funcs;
|
||||
qfv_cmdbufferset_t *bufferset = malloc (sizeof (*bufferset)
|
||||
+ sizeof (VkCommandBuffer)
|
||||
* numBuffers);
|
||||
|
||||
bufferset->dev = dev;
|
||||
bufferset->funcs = dfunc;
|
||||
bufferset->buffers = (VkCommandBuffer *) (bufferset + 1);
|
||||
bufferset->numBuffers = numBuffers;
|
||||
|
||||
for (int i = 0; i < numBuffers; i++) {
|
||||
bufferset->buffers[i] = buffers[i]->buffer;
|
||||
}
|
||||
return bufferset;
|
||||
}
|
||||
|
||||
int
|
||||
QFV_BeginCommandBuffer (qfv_cmdbuffer_t *buffer, int oneTime, int rpContinue,
|
||||
int simultaneous,
|
||||
VkCommandBufferInheritanceInfo *inheritanceInfo)
|
||||
{
|
||||
VkCommandBuffer buff = buffer->buffer;
|
||||
qfv_devfuncs_t *dfunc = buffer->funcs;
|
||||
VkCommandBufferUsageFlags usage = 0;
|
||||
|
||||
if (oneTime) {
|
||||
usage |= VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
|
||||
}
|
||||
if (rpContinue) {
|
||||
usage |= VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT;
|
||||
}
|
||||
if (simultaneous) {
|
||||
usage |= VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT;
|
||||
}
|
||||
|
||||
VkCommandBufferBeginInfo beginInfo = {
|
||||
VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, 0,
|
||||
usage,
|
||||
0
|
||||
};
|
||||
|
||||
return dfunc->vkBeginCommandBuffer (buff, &beginInfo) == VK_SUCCESS;
|
||||
}
|
||||
|
||||
int
|
||||
QFV_EndCommandBuffer (qfv_cmdbuffer_t *buffer)
|
||||
{
|
||||
VkCommandBuffer buff = buffer->buffer;
|
||||
qfv_devfuncs_t *dfunc = buffer->funcs;
|
||||
|
||||
return dfunc->vkEndCommandBuffer (buff) == VK_SUCCESS;
|
||||
}
|
||||
|
||||
int
|
||||
QFV_ResetCommandBuffer (qfv_cmdbuffer_t *buffer, int release)
|
||||
{
|
||||
VkCommandBuffer buff = buffer->buffer;
|
||||
qfv_devfuncs_t *dfunc = buffer->funcs;
|
||||
VkCommandBufferResetFlags release_flag = 0;
|
||||
|
||||
if (release) {
|
||||
release_flag = VK_COMMAND_BUFFER_RESET_RELEASE_RESOURCES_BIT;
|
||||
}
|
||||
|
||||
return dfunc->vkResetCommandBuffer (buff, release_flag) == VK_SUCCESS;
|
||||
}
|
||||
|
||||
qfv_semaphore_t *
|
||||
QFV_CreateSemaphore (qfv_device_t *device)
|
||||
{
|
||||
VkDevice dev = device->dev;
|
||||
qfv_devfuncs_t *dfunc = device->funcs;
|
||||
|
||||
VkSemaphoreCreateInfo createInfo = {
|
||||
VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO, 0,
|
||||
0
|
||||
};
|
||||
|
||||
qfv_semaphore_t *semaphore = malloc (sizeof (*semaphore));
|
||||
semaphore->dev = dev;
|
||||
semaphore->funcs = dfunc;
|
||||
|
||||
dfunc->vkCreateSemaphore (dev, &createInfo, 0, &semaphore->semaphore);
|
||||
return semaphore;
|
||||
}
|
||||
|
||||
qfv_semaphoreset_t *
|
||||
QFV_CreateSemaphoreSet (qfv_semaphore_t **semaphores, int numSemaphores)
|
||||
{
|
||||
VkDevice dev = semaphores[0]->dev;
|
||||
qfv_devfuncs_t *dfunc = semaphores[0]->funcs;
|
||||
qfv_semaphoreset_t *semaphoreset;
|
||||
semaphoreset = calloc (1, sizeof (*semaphoreset)
|
||||
+ sizeof (VkSemaphore) * numSemaphores
|
||||
+ sizeof (VkPipelineStageFlags) * numSemaphores);
|
||||
|
||||
semaphoreset->dev = dev;
|
||||
semaphoreset->funcs = dfunc;
|
||||
semaphoreset->semaphores = (VkSemaphore *) (semaphoreset + 1);
|
||||
semaphoreset->stages = (VkPipelineStageFlags *)
|
||||
&semaphoreset->semaphores[numSemaphores];
|
||||
semaphoreset->numSemaphores = numSemaphores;
|
||||
|
||||
for (int i = 0; i < numSemaphores; i++) {
|
||||
semaphoreset->semaphores[i] = semaphores[i]->semaphore;
|
||||
}
|
||||
return semaphoreset;
|
||||
}
|
||||
|
||||
qfv_fence_t *
|
||||
QFV_CreateFence (qfv_device_t *device, int signaled)
|
||||
{
|
||||
VkDevice dev = device->dev;
|
||||
qfv_devfuncs_t *dfunc = device->funcs;
|
||||
|
||||
VkFenceCreateInfo createInfo = {
|
||||
VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, 0,
|
||||
signaled ? VK_FENCE_CREATE_SIGNALED_BIT : 0,
|
||||
};
|
||||
|
||||
qfv_fence_t *fence = malloc (sizeof (*fence));
|
||||
fence->dev = dev;
|
||||
fence->funcs = dfunc;
|
||||
|
||||
dfunc->vkCreateFence (dev, &createInfo, 0, &fence->fence);
|
||||
return fence;
|
||||
}
|
||||
|
||||
qfv_fenceset_t *
|
||||
QFV_CreateFenceSet (qfv_fence_t **fences, int numFences)
|
||||
{
|
||||
VkDevice dev = fences[0]->dev;
|
||||
qfv_devfuncs_t *dfunc = fences[0]->funcs;
|
||||
qfv_fenceset_t *fenceset = malloc (sizeof (*fenceset)
|
||||
+ sizeof (VkFence) * numFences);
|
||||
|
||||
fenceset->dev = dev;
|
||||
fenceset->funcs = dfunc;
|
||||
fenceset->fences = (VkFence *) (fenceset + 1);
|
||||
fenceset->numFences = numFences;
|
||||
|
||||
for (int i = 0; i < numFences; i++) {
|
||||
fenceset->fences[i] = fences[i]->fence;
|
||||
}
|
||||
return fenceset;
|
||||
}
|
||||
|
||||
int
|
||||
QFV_WaitForFences (qfv_fenceset_t *fences, int all, uint64_t timeout)
|
||||
{
|
||||
VkDevice dev = fences->dev;
|
||||
qfv_devfuncs_t *dfunc = fences->funcs;
|
||||
|
||||
VkResult res = dfunc->vkWaitForFences (dev, fences->numFences,
|
||||
fences->fences, all, timeout);
|
||||
return res == VK_SUCCESS;
|
||||
}
|
||||
|
||||
int
|
||||
QFV_ResetFences (qfv_fenceset_t *fences)
|
||||
{
|
||||
VkDevice dev = fences->dev;
|
||||
qfv_devfuncs_t *dfunc = fences->funcs;
|
||||
|
||||
return dfunc->vkResetFences (dev, fences->numFences,
|
||||
fences->fences) == VK_SUCCESS;
|
||||
}
|
||||
|
||||
int
|
||||
QFV_QueueSubmit (qfv_device_t *device, qfv_semaphoreset_t *waitSemaphores,
|
||||
qfv_cmdbufferset_t *buffers,
|
||||
qfv_semaphoreset_t *signalSemaphores, qfv_fence_t *fence)
|
||||
{
|
||||
qfv_devfuncs_t *dfunc = device->funcs;
|
||||
VkSubmitInfo submitInfo = {
|
||||
VK_STRUCTURE_TYPE_SUBMIT_INFO, 0,
|
||||
waitSemaphores->numSemaphores,
|
||||
waitSemaphores->semaphores, waitSemaphores->stages,
|
||||
buffers->numBuffers, buffers->buffers,
|
||||
signalSemaphores->numSemaphores,
|
||||
signalSemaphores->semaphores
|
||||
};
|
||||
//FIXME multi-batch
|
||||
return dfunc->vkQueueSubmit (device->queue, 1, &submitInfo,
|
||||
fence->fence) == VK_SUCCESS;
|
||||
}
|
||||
Loading…
Reference in New Issue