qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-29 23:52:22 +00:00
Code Issues Projects Releases Packages Wiki Activity
quakeforge/libs/video/renderer/vulkan/resource.c

335 lines
9.3 KiB
C
Raw Normal View History

[vulkan] Add a mini resource subsystem The resource subsystem creates buffers, images, buffer views and image views in a single batch operation, using a single memory object to back all the buffers and images. I had been doing this by hand for a while, but got tired of jumping through all those vulkan hoops. While it's still a little tedious to set up the arrays for QFV_CreateResource (and they need to be kept around for QFV_DestroyResource), it really eases calculation of memory object size and sub-resource offsets. And destroying all the objects is just one call to QFV_DestroyResource.
2022-05-04 04:59:38 +00:00
/*
resource.c
Vulkan resource functions
Copyright (C) 2022 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
#include "QF/va.h"
#include "QF/Vulkan/buffer.h"
#include "QF/Vulkan/debug.h"
#include "QF/Vulkan/device.h"
#include "QF/Vulkan/image.h"
#include "QF/Vulkan/instance.h"
#include "QF/Vulkan/resource.h"
[vulkan] Don't use QFV_CreateImage for resource images The resource functions assume the requested layers is correct (really, the lighting code assumes that the resource functions assume such), but QFV_CreateImage multiplies the layer count by 6 for cube maps (really, the issue is in QFV_CreateImage, but I want to move away from it anyway).
2022-10-27 04:26:00 +00:00
static void
create_image (qfv_device_t *device, qfv_resobj_t *image_obj)
{
qfv_devfuncs_t *dfunc = device->funcs;
__auto_type image = &image_obj->image;
VkImageCreateInfo createInfo = {
VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, 0,
image->cubemap ? VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT : 0,
image->type, image->format, image->extent, image->num_mipmaps,
image->num_layers,
image->samples,
VK_IMAGE_TILING_OPTIMAL,
image->usage,
VK_SHARING_MODE_EXCLUSIVE,
0, 0,
VK_IMAGE_LAYOUT_UNDEFINED,
};
dfunc->vkCreateImage (device->dev, &createInfo, 0, &image->image);
}
[vulkan] Support swizzles in resource image views Using swizzles in an image view allows the same shader to be used with different image "types" (eg, color vs coverage). Of course, this needed to abandon QFV_CreateImageView, but that is likely for the best.
2022-11-20 06:31:23 +00:00
static void
create_image_view (qfv_device_t *device, qfv_resobj_t *imgview_obj,
qfv_resobj_t *imgobj)
{
qfv_devfuncs_t *dfunc = device->funcs;
__auto_type view = &imgview_obj->image_view;
__auto_type image = &imgobj->image;
VkImageViewCreateInfo createInfo = {
VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO, 0,
//FIXME flags should be input for both image and image view
.flags = image->cubemap ? VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT : 0,
.image = image->image,
.viewType = view->type,
.format = view->format,
.components = view->components,
.subresourceRange = {
.aspectMask = view->aspect,
.baseMipLevel = 0,
.levelCount = VK_REMAINING_MIP_LEVELS,
.baseArrayLayer = 0,
.layerCount = VK_REMAINING_ARRAY_LAYERS,
},
};
dfunc->vkCreateImageView (device->dev, &createInfo, 0, &view->view);
}
[vulkan] Add a mini resource subsystem The resource subsystem creates buffers, images, buffer views and image views in a single batch operation, using a single memory object to back all the buffers and images. I had been doing this by hand for a while, but got tired of jumping through all those vulkan hoops. While it's still a little tedious to set up the arrays for QFV_CreateResource (and they need to be kept around for QFV_DestroyResource), it really eases calculation of memory object size and sub-resource offsets. And destroying all the objects is just one call to QFV_DestroyResource.
2022-05-04 04:59:38 +00:00
int
QFV_CreateResource (qfv_device_t *device, qfv_resource_t *resource)
{
qfv_devfuncs_t *dfunc = device->funcs;
qfv_physdev_t *physdev = device->physDev;
VkPhysicalDeviceMemoryProperties *memprops = &physdev->memory_properties;
VkMemoryRequirements req;
VkDeviceSize size = 0;
for (unsigned i = 0; i < resource->num_objects; i++) {
__auto_type obj = &resource->objects[i];
switch (obj->type) {
case qfv_res_buffer:
{
__auto_type buffer = &obj->buffer;
buffer->buffer = QFV_CreateBuffer (device,
buffer->size,
buffer->usage);
QFV_duSetObjectName (device, VK_OBJECT_TYPE_BUFFER,
[vulkan] Clean up QFV_duSetObjectName usage a little Moving the param calculations into QFV_duSetObjectName params prevents warnings when debug is disabled without having to use (void) hacks.
2022-10-02 06:07:04 +00:00
buffer->buffer,
va (resource->va_ctx, "buffer:%s:%s",
resource->name, obj->name));
[vulkan] Add a mini resource subsystem The resource subsystem creates buffers, images, buffer views and image views in a single batch operation, using a single memory object to back all the buffers and images. I had been doing this by hand for a while, but got tired of jumping through all those vulkan hoops. While it's still a little tedious to set up the arrays for QFV_CreateResource (and they need to be kept around for QFV_DestroyResource), it really eases calculation of memory object size and sub-resource offsets. And destroying all the objects is just one call to QFV_DestroyResource.
2022-05-04 04:59:38 +00:00
dfunc->vkGetBufferMemoryRequirements (device->dev,
buffer->buffer, &req);
}
break;
case qfv_res_buffer_view:
{
__auto_type buffview = &obj->buffer_view;
__auto_type buffobj = &resource->objects[buffview->buffer];
if (buffview->buffer >= resource->num_objects
|| buffobj->type != qfv_res_buffer) {
Sys_Error ("%s:%s invalid buffer for view",
resource->name, obj->name);
}
}
break;
case qfv_res_image:
{
[vulkan] Don't use QFV_CreateImage for resource images The resource functions assume the requested layers is correct (really, the lighting code assumes that the resource functions assume such), but QFV_CreateImage multiplies the layer count by 6 for cube maps (really, the issue is in QFV_CreateImage, but I want to move away from it anyway).
2022-10-27 04:26:00 +00:00
create_image (device, obj);
[vulkan] Add a mini resource subsystem The resource subsystem creates buffers, images, buffer views and image views in a single batch operation, using a single memory object to back all the buffers and images. I had been doing this by hand for a while, but got tired of jumping through all those vulkan hoops. While it's still a little tedious to set up the arrays for QFV_CreateResource (and they need to be kept around for QFV_DestroyResource), it really eases calculation of memory object size and sub-resource offsets. And destroying all the objects is just one call to QFV_DestroyResource.
2022-05-04 04:59:38 +00:00
__auto_type image = &obj->image;
QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE,
[vulkan] Clean up QFV_duSetObjectName usage a little Moving the param calculations into QFV_duSetObjectName params prevents warnings when debug is disabled without having to use (void) hacks.
2022-10-02 06:07:04 +00:00
image->image,
va (resource->va_ctx, "image:%s:%s",
resource->name, obj->name));
[vulkan] Add a mini resource subsystem The resource subsystem creates buffers, images, buffer views and image views in a single batch operation, using a single memory object to back all the buffers and images. I had been doing this by hand for a while, but got tired of jumping through all those vulkan hoops. While it's still a little tedious to set up the arrays for QFV_CreateResource (and they need to be kept around for QFV_DestroyResource), it really eases calculation of memory object size and sub-resource offsets. And destroying all the objects is just one call to QFV_DestroyResource.
2022-05-04 04:59:38 +00:00
dfunc->vkGetImageMemoryRequirements (device->dev,
image->image, &req);
}
break;
case qfv_res_image_view:
{
__auto_type imgview = &obj->image_view;
__auto_type imgobj = &resource->objects[imgview->image];
if (imgview->image >= resource->num_objects
|| imgobj->type != qfv_res_image) {
Sys_Error ("%s:%s invalid image for view",
resource->name, obj->name);
}
}
break;
default:
Sys_Error ("%s:%s invalid resource type %d",
resource->name, obj->name, obj->type);
}
size = QFV_NextOffset (size, &req);
[vulkan] Ensure memory size is aligned While the base of a memory object was aligned when calculating the memory block size, the top end was not, which could result in the memory block not getting enough bytes allocated to satisfy alignment requirements (eg, for flushing). While fixing that, I noticed the offsets of objects were not being aligned when binding, so that is fixed as well. Fixes Mr Fixit on my VersaPro.
2022-10-14 10:36:21 +00:00
size += QFV_NextOffset (req.size, &req);
[vulkan] Add a mini resource subsystem The resource subsystem creates buffers, images, buffer views and image views in a single batch operation, using a single memory object to back all the buffers and images. I had been doing this by hand for a while, but got tired of jumping through all those vulkan hoops. While it's still a little tedious to set up the arrays for QFV_CreateResource (and they need to be kept around for QFV_DestroyResource), it really eases calculation of memory object size and sub-resource offsets. And destroying all the objects is just one call to QFV_DestroyResource.
2022-05-04 04:59:38 +00:00
}
VkMemoryPropertyFlags properties = resource->memory_properties;
for (uint32_t type = 0; type < memprops->memoryTypeCount; type++) {
if ((req.memoryTypeBits & (1 << type))
&& ((memprops->memoryTypes[type].propertyFlags & properties)
== properties)) {
VkMemoryAllocateInfo allocate_info = {
.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO,
.allocationSize = size,
.memoryTypeIndex = type,
};
VkResult res = dfunc->vkAllocateMemory (device->dev, &allocate_info,
0, &resource->memory);
if (res == VK_SUCCESS) {
break;
}
}
}
[vulkan] Record resource memory size It's useful mainly for information reports, but might be useful elsewhere.
2022-10-27 02:32:00 +00:00
resource->size = size;
[vulkan] Add a mini resource subsystem The resource subsystem creates buffers, images, buffer views and image views in a single batch operation, using a single memory object to back all the buffers and images. I had been doing this by hand for a while, but got tired of jumping through all those vulkan hoops. While it's still a little tedious to set up the arrays for QFV_CreateResource (and they need to be kept around for QFV_DestroyResource), it really eases calculation of memory object size and sub-resource offsets. And destroying all the objects is just one call to QFV_DestroyResource.
2022-05-04 04:59:38 +00:00
QFV_duSetObjectName (device, VK_OBJECT_TYPE_DEVICE_MEMORY,
resource->memory, va (resource->va_ctx, "memory:%s",
resource->name));
VkDeviceSize offset = 0;
for (unsigned i = 0; i < resource->num_objects; i++) {
__auto_type obj = &resource->objects[i];
switch (obj->type) {
case qfv_res_buffer:
{
__auto_type buffer = &obj->buffer;
dfunc->vkGetBufferMemoryRequirements (device->dev,
buffer->buffer, &req);
}
break;
case qfv_res_image:
{
__auto_type image = &obj->image;
dfunc->vkGetImageMemoryRequirements (device->dev,
image->image, &req);
}
break;
case qfv_res_buffer_view:
case qfv_res_image_view:
break;
}
offset = QFV_NextOffset (offset, &req);
switch (obj->type) {
case qfv_res_buffer:
{
__auto_type buffer = &obj->buffer;
QFV_BindBufferMemory (device, buffer->buffer,
resource->memory, offset);
[vulkan] Add resource memory offset to qfv_resobj_s Its value on input is ignored. QFV_CreateResource writes the resource object's offset relative to the beginning of the shared memory block. Needed for the Draw overhaul.
2022-10-03 00:14:29 +00:00
buffer->offset = offset;
[vulkan] Add a mini resource subsystem The resource subsystem creates buffers, images, buffer views and image views in a single batch operation, using a single memory object to back all the buffers and images. I had been doing this by hand for a while, but got tired of jumping through all those vulkan hoops. While it's still a little tedious to set up the arrays for QFV_CreateResource (and they need to be kept around for QFV_DestroyResource), it really eases calculation of memory object size and sub-resource offsets. And destroying all the objects is just one call to QFV_DestroyResource.
2022-05-04 04:59:38 +00:00
}
break;
case qfv_res_image:
{
__auto_type image = &obj->image;
QFV_BindImageMemory (device, image->image,
resource->memory, offset);
[vulkan] Add resource memory offset to qfv_resobj_s Its value on input is ignored. QFV_CreateResource writes the resource object's offset relative to the beginning of the shared memory block. Needed for the Draw overhaul.
2022-10-03 00:14:29 +00:00
image->offset = offset;
[vulkan] Add a mini resource subsystem The resource subsystem creates buffers, images, buffer views and image views in a single batch operation, using a single memory object to back all the buffers and images. I had been doing this by hand for a while, but got tired of jumping through all those vulkan hoops. While it's still a little tedious to set up the arrays for QFV_CreateResource (and they need to be kept around for QFV_DestroyResource), it really eases calculation of memory object size and sub-resource offsets. And destroying all the objects is just one call to QFV_DestroyResource.
2022-05-04 04:59:38 +00:00
}
break;
case qfv_res_buffer_view:
case qfv_res_image_view:
break;
}
[vulkan] Ensure memory size is aligned While the base of a memory object was aligned when calculating the memory block size, the top end was not, which could result in the memory block not getting enough bytes allocated to satisfy alignment requirements (eg, for flushing). While fixing that, I noticed the offsets of objects were not being aligned when binding, so that is fixed as well. Fixes Mr Fixit on my VersaPro.
2022-10-14 10:36:21 +00:00
offset = QFV_NextOffset (offset, &req);
offset += QFV_NextOffset (req.size, &req);
[vulkan] Add a mini resource subsystem The resource subsystem creates buffers, images, buffer views and image views in a single batch operation, using a single memory object to back all the buffers and images. I had been doing this by hand for a while, but got tired of jumping through all those vulkan hoops. While it's still a little tedious to set up the arrays for QFV_CreateResource (and they need to be kept around for QFV_DestroyResource), it really eases calculation of memory object size and sub-resource offsets. And destroying all the objects is just one call to QFV_DestroyResource.
2022-05-04 04:59:38 +00:00
}
for (unsigned i = 0; i < resource->num_objects; i++) {
__auto_type obj = &resource->objects[i];
switch (obj->type) {
case qfv_res_buffer:
case qfv_res_image:
break;
case qfv_res_buffer_view:
{
__auto_type buffview = &obj->buffer_view;
__auto_type buffobj = &resource->objects[buffview->buffer];
__auto_type buffer = &buffobj->buffer;
buffview->view = QFV_CreateBufferView (device,
buffer->buffer,
buffview->format,
buffview->offset,
buffview->size);
QFV_duSetObjectName (device, VK_OBJECT_TYPE_BUFFER_VIEW,
[vulkan] Clean up QFV_duSetObjectName usage a little Moving the param calculations into QFV_duSetObjectName params prevents warnings when debug is disabled without having to use (void) hacks.
2022-10-02 06:07:04 +00:00
buffview->view,
va (resource->va_ctx, "bview:%s:%s",
resource->name, obj->name));
[vulkan] Add a mini resource subsystem The resource subsystem creates buffers, images, buffer views and image views in a single batch operation, using a single memory object to back all the buffers and images. I had been doing this by hand for a while, but got tired of jumping through all those vulkan hoops. While it's still a little tedious to set up the arrays for QFV_CreateResource (and they need to be kept around for QFV_DestroyResource), it really eases calculation of memory object size and sub-resource offsets. And destroying all the objects is just one call to QFV_DestroyResource.
2022-05-04 04:59:38 +00:00
}
break;
case qfv_res_image_view:
{
__auto_type imgview = &obj->image_view;
__auto_type imgobj = &resource->objects[imgview->image];
[vulkan] Support swizzles in resource image views Using swizzles in an image view allows the same shader to be used with different image "types" (eg, color vs coverage). Of course, this needed to abandon QFV_CreateImageView, but that is likely for the best.
2022-11-20 06:31:23 +00:00
create_image_view (device, obj, imgobj);
[vulkan] Add a mini resource subsystem The resource subsystem creates buffers, images, buffer views and image views in a single batch operation, using a single memory object to back all the buffers and images. I had been doing this by hand for a while, but got tired of jumping through all those vulkan hoops. While it's still a little tedious to set up the arrays for QFV_CreateResource (and they need to be kept around for QFV_DestroyResource), it really eases calculation of memory object size and sub-resource offsets. And destroying all the objects is just one call to QFV_DestroyResource.
2022-05-04 04:59:38 +00:00
QFV_duSetObjectName (device, VK_OBJECT_TYPE_IMAGE_VIEW,
[vulkan] Clean up QFV_duSetObjectName usage a little Moving the param calculations into QFV_duSetObjectName params prevents warnings when debug is disabled without having to use (void) hacks.
2022-10-02 06:07:04 +00:00
imgview->view,
va (resource->va_ctx, "iview:%s:%s",
resource->name, obj->name));
[vulkan] Add a mini resource subsystem The resource subsystem creates buffers, images, buffer views and image views in a single batch operation, using a single memory object to back all the buffers and images. I had been doing this by hand for a while, but got tired of jumping through all those vulkan hoops. While it's still a little tedious to set up the arrays for QFV_CreateResource (and they need to be kept around for QFV_DestroyResource), it really eases calculation of memory object size and sub-resource offsets. And destroying all the objects is just one call to QFV_DestroyResource.
2022-05-04 04:59:38 +00:00
}
break;
}
}
return 0;
}
void
QFV_DestroyResource (qfv_device_t *device, qfv_resource_t *resource)
{
qfv_devfuncs_t *dfunc = device->funcs;
for (unsigned i = 0; i < resource->num_objects; i++) {
__auto_type obj = &resource->objects[i];
switch (obj->type) {
case qfv_res_buffer:
case qfv_res_image:
break;
case qfv_res_buffer_view:
{
__auto_type buffview = &obj->buffer_view;
dfunc->vkDestroyBufferView (device->dev, buffview->view, 0);
}
break;
case qfv_res_image_view:
{
__auto_type imgview = &obj->image_view;
dfunc->vkDestroyImageView (device->dev, imgview->view, 0);
}
break;
}
}
for (unsigned i = 0; i < resource->num_objects; i++) {
__auto_type obj = &resource->objects[i];
switch (obj->type) {
case qfv_res_buffer:
{
__auto_type buffer = &obj->buffer;
dfunc->vkDestroyBuffer (device->dev, buffer->buffer, 0);
}
break;
case qfv_res_image:
{
__auto_type image = &obj->image;
dfunc->vkDestroyImage (device->dev, image->image, 0);
}
break;
case qfv_res_buffer_view:
case qfv_res_image_view:
break;
}
}
dfunc->vkFreeMemory (device->dev, resource->memory, 0);
}
[vulkan] Initialize resource image from tex_t This moves the qfv_resobj_t image initialization code from the IQM loader into the resource management code. This will allow me to reuse the code for setting up glyph data. As a bonus, it cleans up the IQM code nicely.
2022-10-02 06:24:38 +00:00
void
QFV_ResourceInitTexImage (qfv_resobj_t *image, const char *name,
int mips, const tex_t *tex)
{
*image = (qfv_resobj_t) {
.name = name,
.type = qfv_res_image,
.image = {
.type = VK_IMAGE_TYPE_2D,
.format = QFV_ImageFormat (tex->format, 0),
.extent = {
.width = tex->width,
.height = tex->height,
.depth = 1,
},
.num_mipmaps = mips ? QFV_MipLevels (tex->width, tex->height) : 1,
.num_layers = 1,
.samples = VK_SAMPLE_COUNT_1_BIT,
.usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT
| VK_IMAGE_USAGE_TRANSFER_SRC_BIT
| VK_IMAGE_USAGE_SAMPLED_BIT,
},
};
}
Reference in a new issue Copy permalink