From d84e6b8f221088921f455adfb1f4e6843b46be49 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 22 Sep 2021 14:44:32 -0500 Subject: [PATCH] vulkan: Add a common vk_framebuffer struct Reviewed-by: Ivan Briano Part-of: --- src/vulkan/runtime/meson.build | 2 + src/vulkan/runtime/vk_framebuffer.c | 82 +++++++++++++++++++++++++++++ src/vulkan/runtime/vk_framebuffer.h | 51 ++++++++++++++++++ 3 files changed, 135 insertions(+) create mode 100644 src/vulkan/runtime/vk_framebuffer.c create mode 100644 src/vulkan/runtime/vk_framebuffer.h diff --git a/src/vulkan/runtime/meson.build b/src/vulkan/runtime/meson.build index ddd41e39ba8..0e6f0a563fd 100644 --- a/src/vulkan/runtime/meson.build +++ b/src/vulkan/runtime/meson.build @@ -42,6 +42,8 @@ vulkan_runtime_files = files( 'vk_device.h', 'vk_fence.c', 'vk_fence.h', + 'vk_framebuffer.c', + 'vk_framebuffer.h', 'vk_image.c', 'vk_image.h', 'vk_instance.c', diff --git a/src/vulkan/runtime/vk_framebuffer.c b/src/vulkan/runtime/vk_framebuffer.c new file mode 100644 index 00000000000..834a0f48480 --- /dev/null +++ b/src/vulkan/runtime/vk_framebuffer.c @@ -0,0 +1,82 @@ +/* + * Copyright © 2021 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include "vk_framebuffer.h" + +#include "vk_common_entrypoints.h" +#include "vk_device.h" + +VKAPI_ATTR VkResult VKAPI_CALL +vk_common_CreateFramebuffer(VkDevice _device, + const VkFramebufferCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkFramebuffer *pFramebuffer) +{ + VK_FROM_HANDLE(vk_device, device, _device); + struct vk_framebuffer *framebuffer; + + assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO); + + size_t size = sizeof(*framebuffer); + + /* VK_KHR_imageless_framebuffer extension says: + * + * If flags includes VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT_KHR, + * parameter pAttachments is ignored. + */ + if (!(pCreateInfo->flags & VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT_KHR)) + size += sizeof(VkImageView) * pCreateInfo->attachmentCount; + + framebuffer = vk_object_alloc(device, pAllocator, size, + VK_OBJECT_TYPE_FRAMEBUFFER); + if (framebuffer == NULL) + return VK_ERROR_OUT_OF_HOST_MEMORY; + + framebuffer->width = pCreateInfo->width; + framebuffer->height = pCreateInfo->height; + framebuffer->layers = pCreateInfo->layers; + + if (!(pCreateInfo->flags & VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT_KHR)) { + for (uint32_t i = 0; i < pCreateInfo->attachmentCount; i++) + framebuffer->attachments[i] = pCreateInfo->pAttachments[i]; + framebuffer->attachment_count = pCreateInfo->attachmentCount; + } + + *pFramebuffer = vk_framebuffer_to_handle(framebuffer); + + return VK_SUCCESS; +} + +VKAPI_ATTR void VKAPI_CALL +vk_common_DestroyFramebuffer(VkDevice _device, + VkFramebuffer _framebuffer, + const VkAllocationCallbacks *pAllocator) +{ + VK_FROM_HANDLE(vk_device, device, _device); + VK_FROM_HANDLE(vk_framebuffer, framebuffer, _framebuffer); + + if (!framebuffer) + return; + + vk_object_free(device, pAllocator, framebuffer); +} diff --git a/src/vulkan/runtime/vk_framebuffer.h b/src/vulkan/runtime/vk_framebuffer.h new file mode 100644 index 00000000000..bd4b34dea0c --- /dev/null +++ b/src/vulkan/runtime/vk_framebuffer.h @@ -0,0 +1,51 @@ +/* + * Copyright © 2021 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ +#ifndef VK_FRAMEBUFFER_H +#define VK_FRAMEBUFFER_H + +#include "vk_object.h" + +#ifdef __cplusplus +extern "C" { +#endif + +struct vk_framebuffer { + struct vk_object_base base; + + uint32_t width; + uint32_t height; + uint32_t layers; + + uint32_t attachment_count; + VkImageView attachments[]; +}; + +VK_DEFINE_NONDISP_HANDLE_CASTS(vk_framebuffer, base, VkFramebuffer, + VK_OBJECT_TYPE_FRAMEBUFFER) + +#ifdef __cplusplus +} +#endif + +#endif /* VK_RENDER_PASS_H */ +