mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-01-18 15:01:41 +00:00
Implement image stuff up to view creation
This commit is contained in:
Bill Currie
parent
f4c0d0ebcf
commit
9fdc15c439
5 changed files with 286 additions and 1 deletions
|
|
@ -113,6 +113,11 @@ DEVICE_LEVEL_VULKAN_FUNCTION (vkAllocateMemory)
|
|||
DEVICE_LEVEL_VULKAN_FUNCTION (vkBindBufferMemory)
|
||||
DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateBufferView)
|
||||
|
||||
DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateImage)
|
||||
DEVICE_LEVEL_VULKAN_FUNCTION (vkGetImageMemoryRequirements)
|
||||
DEVICE_LEVEL_VULKAN_FUNCTION (vkBindImageMemory)
|
||||
DEVICE_LEVEL_VULKAN_FUNCTION (vkCreateImageView)
|
||||
|
||||
DEVICE_LEVEL_VULKAN_FUNCTION (vkCmdPipelineBarrier)
|
||||
|
||||
#undef DEVICE_LEVEL_VULKAN_FUNCTION
|
||||
|
|
|
|||
60
include/QF/Vulkan/image.h
Normal file
60
include/QF/Vulkan/image.h
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
#ifndef __QF_Vulkan_image_h
|
||||
#define __QF_Vulkan_image_h
|
||||
|
||||
typedef struct qfv_image_s {
|
||||
struct qfv_device_s *device;
|
||||
VkImage image;
|
||||
} qfv_image_t;
|
||||
|
||||
typedef struct qfv_imagetransition_s {
|
||||
qfv_image_t *image;
|
||||
VkAccessFlags srcAccess;
|
||||
VkAccessFlags dstAccess;
|
||||
VkImageLayout oldLayout;
|
||||
VkImageLayout newLayout;
|
||||
uint32_t srcQueueFamily;
|
||||
uint32_t dstQueueFamily;
|
||||
VkImageAspectFlags aspect;
|
||||
} qfv_imagetransition_t;
|
||||
|
||||
typedef struct qfv_imagebarrierset_s {
|
||||
struct qfv_device_s *device;
|
||||
uint32_t numBarriers;
|
||||
VkImageMemoryBarrier *barriers;
|
||||
} qfv_imagebarrierset_t;
|
||||
|
||||
typedef struct qfv_imageview_s {
|
||||
struct qfv_device_s *device;
|
||||
VkImageView view;
|
||||
qfv_image_t *image;
|
||||
VkImageViewType type;
|
||||
VkFormat format;
|
||||
VkImageAspectFlags aspect;
|
||||
} qfv_imageview_t;
|
||||
|
||||
struct qfv_device_s;
|
||||
qfv_image_t *QFV_CreateImage (struct qfv_device_s *device, int cubemap,
|
||||
VkImageType type,
|
||||
VkFormat format,
|
||||
VkExtent3D size,
|
||||
uint32_t num_mipmaps,
|
||||
uint32_t num_layers,
|
||||
VkSampleCountFlagBits samples,
|
||||
VkImageUsageFlags usage_scenarios);
|
||||
|
||||
struct qfv_memory_s *QFV_AllocImageMemory (qfv_image_t *image,
|
||||
VkMemoryPropertyFlags properties,
|
||||
VkDeviceSize size, VkDeviceSize offset);
|
||||
|
||||
int QFV_BindImageMemory (qfv_image_t *image, struct qfv_memory_s *memory,
|
||||
VkDeviceSize offset);
|
||||
|
||||
qfv_imagebarrierset_t *
|
||||
QFV_CreateImageTransitionSet (qfv_imagetransition_t **transitions,
|
||||
int numTransitions);
|
||||
|
||||
qfv_imageview_t *QFV_CreateImageView (qfv_image_t *image, VkImageViewType type,
|
||||
VkFormat format,
|
||||
VkImageAspectFlags aspect);
|
||||
|
||||
#endif//__QF_Vulkan_image_h
|
||||
|
|
@ -7,6 +7,7 @@ vulkan_src = \
|
|||
buffer.c \
|
||||
command.c \
|
||||
device.c \
|
||||
image.c \
|
||||
instance.c \
|
||||
swapchain.c \
|
||||
util.c \
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@
|
|||
#include "QF/vid.h"
|
||||
#include "QF/Vulkan/qf_vid.h"
|
||||
#include "QF/Vulkan/buffer.h"//FIXME should QFV_CmdPipelineBarrier be here?
|
||||
#include "QF/Vulkan/image.h"//FIXME should QFV_CmdPipelineBarrier be here?
|
||||
#include "QF/Vulkan/command.h"
|
||||
#include "QF/Vulkan/device.h"
|
||||
#include "QF/Vulkan/instance.h"
|
||||
|
|
@ -396,7 +397,7 @@ QFV_CmdPipelineBarrier (qfv_cmdbuffer_t *cmdBuffer,
|
|||
VkDependencyFlags dependencyFlags,
|
||||
struct qfv_memorybarrierset_s *memBarrierSet,
|
||||
qfv_bufferbarrierset_t *buffBarrierSet,
|
||||
struct qfv_imagebarrierset_s *imgBarrierSet)
|
||||
qfv_imagebarrierset_t *imgBarrierSet)
|
||||
{
|
||||
qfv_device_t *device = cmdBuffer->device;
|
||||
qfv_devfuncs_t *dfunc = device->funcs;
|
||||
|
|
@ -411,6 +412,10 @@ QFV_CmdPipelineBarrier (qfv_cmdbuffer_t *cmdBuffer,
|
|||
numBuffBarriers = buffBarrierSet->numBarriers;
|
||||
buffBarriers = buffBarrierSet->barriers;
|
||||
}
|
||||
if (imgBarrierSet) {
|
||||
numImgBarriers = imgBarrierSet->numBarriers;
|
||||
imgBarriers = imgBarrierSet->barriers;
|
||||
}
|
||||
dfunc->vkCmdPipelineBarrier (cmdBuffer->buffer,
|
||||
srcStageMask, dstStageMask, dependencyFlags,
|
||||
numMemBarriers, memBarriers,
|
||||
|
|
|
|||
214
libs/video/renderer/vulkan/image.c
Normal file
214
libs/video/renderer/vulkan/image.c
Normal file
|
|
@ -0,0 +1,214 @@
|
|||
/*
|
||||
image.c
|
||||
|
||||
Vulkan image functions
|
||||
|
||||
Copyright (C) 1996-1997 Id Software, Inc.
|
||||
Copyright (C) 2020 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/buffer.h"//FIXME qfv_memory_t
|
||||
#include "QF/Vulkan/device.h"
|
||||
#include "QF/Vulkan/image.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_image_t *
|
||||
QFV_CreateImage (qfv_device_t *device, int cubemap,
|
||||
VkImageType type,
|
||||
VkFormat format,
|
||||
VkExtent3D size,
|
||||
uint32_t num_mipmaps,
|
||||
uint32_t num_layers,
|
||||
VkSampleCountFlagBits samples,
|
||||
VkImageUsageFlags usage_scenarios)
|
||||
{
|
||||
VkDevice dev = device->dev;
|
||||
qfv_devfuncs_t *dfunc = device->funcs;
|
||||
VkImageCreateInfo createInfo = {
|
||||
VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, 0,
|
||||
cubemap ? VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT : 0,
|
||||
type, format, size, num_mipmaps,
|
||||
cubemap ? 6 * num_layers : num_layers,
|
||||
samples,
|
||||
VK_IMAGE_TILING_OPTIMAL,
|
||||
usage_scenarios,
|
||||
VK_SHARING_MODE_EXCLUSIVE,
|
||||
0, 0,
|
||||
VK_IMAGE_LAYOUT_UNDEFINED,
|
||||
};
|
||||
qfv_image_t *image = malloc (sizeof (*image));
|
||||
dfunc->vkCreateImage (dev, &createInfo, 0, &image->image);
|
||||
image->device = device;
|
||||
return image;
|
||||
}
|
||||
|
||||
qfv_memory_t *
|
||||
QFV_AllocImageMemory (qfv_image_t *image, VkMemoryPropertyFlags properties,
|
||||
VkDeviceSize size, VkDeviceSize offset)
|
||||
{
|
||||
qfv_device_t *device = image->device;
|
||||
VkDevice dev = device->dev;
|
||||
qfv_physdev_t *physdev = device->physDev;
|
||||
VkPhysicalDeviceMemoryProperties *memprops = &physdev->memory_properties;
|
||||
qfv_devfuncs_t *dfunc = device->funcs;
|
||||
|
||||
VkMemoryRequirements requirements;
|
||||
dfunc->vkGetImageMemoryRequirements (dev, image->image, &requirements);
|
||||
|
||||
size = max (size, offset + requirements.size);
|
||||
VkDeviceMemory object = 0;
|
||||
|
||||
for (uint32_t type = 0; type < memprops->memoryTypeCount; type++) {
|
||||
if ((requirements.memoryTypeBits & (1 << type))
|
||||
&& ((memprops->memoryTypes[type].propertyFlags & properties)
|
||||
== properties)) {
|
||||
VkMemoryAllocateInfo allocate_info = {
|
||||
VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, 0,
|
||||
size, type
|
||||
};
|
||||
|
||||
VkResult res = dfunc->vkAllocateMemory (dev, &allocate_info,
|
||||
0, &object);
|
||||
if (res == VK_SUCCESS) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
qfv_memory_t *memory = 0;
|
||||
|
||||
if (object) {
|
||||
memory = malloc (sizeof (*memory));
|
||||
memory->device = device;
|
||||
memory->object = object;
|
||||
}
|
||||
return memory;
|
||||
}
|
||||
|
||||
int
|
||||
QFV_BindImageMemory (qfv_image_t *image, qfv_memory_t *memory,
|
||||
VkDeviceSize offset)
|
||||
{
|
||||
qfv_device_t *device = image->device;
|
||||
VkDevice dev = device->dev;
|
||||
qfv_devfuncs_t *dfunc = device->funcs;
|
||||
VkResult res = dfunc->vkBindImageMemory (dev, image->image,
|
||||
memory->object, offset);
|
||||
return res == VK_SUCCESS;
|
||||
}
|
||||
|
||||
qfv_imagebarrierset_t *
|
||||
QFV_CreateImageTransitionSet (qfv_imagetransition_t **transitions,
|
||||
int numTransitions)
|
||||
{
|
||||
qfv_device_t *device = transitions[0]->image->device;
|
||||
qfv_imagebarrierset_t *barrierset = malloc (sizeof (*barrierset)
|
||||
+ sizeof (VkImageMemoryBarrier) * numTransitions);
|
||||
|
||||
barrierset->device = device;
|
||||
barrierset->numBarriers = numTransitions;
|
||||
barrierset->barriers = (VkImageMemoryBarrier *) (barrierset + 1);
|
||||
|
||||
for (int i = 0; i < numTransitions; i++) {
|
||||
VkImageMemoryBarrier *barrier = &barrierset->barriers[i];
|
||||
barrier->sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
|
||||
barrier->pNext = 0;
|
||||
barrier->srcAccessMask = transitions[i]->srcAccess;
|
||||
barrier->dstAccessMask = transitions[i]->dstAccess;
|
||||
barrier->oldLayout = transitions[i]->oldLayout;
|
||||
barrier->newLayout = transitions[i]->newLayout;
|
||||
barrier->srcQueueFamilyIndex = transitions[i]->srcQueueFamily;
|
||||
barrier->dstQueueFamilyIndex = transitions[i]->dstQueueFamily;
|
||||
barrier->image = transitions[i]->image->image;
|
||||
barrier->subresourceRange.aspectMask = transitions[i]->aspect;
|
||||
barrier->subresourceRange.baseMipLevel = 0;
|
||||
barrier->subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
|
||||
barrier->subresourceRange.baseArrayLayer = 0;
|
||||
barrier->subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
|
||||
}
|
||||
return barrierset;
|
||||
}
|
||||
|
||||
qfv_imageview_t *
|
||||
QFV_CreateImageView (qfv_image_t *image, VkImageViewType type, VkFormat format,
|
||||
VkImageAspectFlags aspect)
|
||||
{
|
||||
qfv_device_t *device = image->device;
|
||||
VkDevice dev = device->dev;
|
||||
qfv_devfuncs_t *dfunc = device->funcs;
|
||||
|
||||
VkImageViewCreateInfo createInfo = {
|
||||
VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO, 0,
|
||||
0,
|
||||
image->image, type, format,
|
||||
{
|
||||
VK_COMPONENT_SWIZZLE_IDENTITY,
|
||||
VK_COMPONENT_SWIZZLE_IDENTITY,
|
||||
VK_COMPONENT_SWIZZLE_IDENTITY,
|
||||
VK_COMPONENT_SWIZZLE_IDENTITY,
|
||||
},
|
||||
{
|
||||
aspect,
|
||||
0, VK_REMAINING_MIP_LEVELS,
|
||||
0, VK_REMAINING_ARRAY_LAYERS,
|
||||
}
|
||||
};
|
||||
|
||||
qfv_imageview_t *view = malloc (sizeof (*view));
|
||||
view->device = device;
|
||||
view->image = image;
|
||||
view->type = type;
|
||||
view->format = format;
|
||||
view->aspect = aspect;
|
||||
dfunc->vkCreateImageView (dev, &createInfo, 0, &view->view);
|
||||
return view;
|
||||
}
|
||||
Loading…
Reference in a new issue