diff --git a/base/vulkantools.cpp b/base/vulkantools.cpp index c0f1433c..225213cb 100644 --- a/base/vulkantools.cpp +++ b/base/vulkantools.cpp @@ -364,44 +364,6 @@ namespace vkTools return shaderModule; } - - VkImageMemoryBarrier prePresentBarrier(VkImage presentImage) - { - VkImageMemoryBarrier imageMemoryBarrier = vkTools::initializers::imageMemoryBarrier(); - imageMemoryBarrier.srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; - imageMemoryBarrier.dstAccessMask = 0; - imageMemoryBarrier.oldLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - imageMemoryBarrier.newLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR; - imageMemoryBarrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - imageMemoryBarrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - imageMemoryBarrier.subresourceRange = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 }; - imageMemoryBarrier.image = presentImage; - return imageMemoryBarrier; - } - - VkImageMemoryBarrier postPresentBarrier(VkImage presentImage) - { - VkImageMemoryBarrier imageMemoryBarrier = vkTools::initializers::imageMemoryBarrier(); - imageMemoryBarrier.srcAccessMask = 0; - imageMemoryBarrier.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; - imageMemoryBarrier.oldLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR; - imageMemoryBarrier.newLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - imageMemoryBarrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - imageMemoryBarrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - imageMemoryBarrier.subresourceRange = { VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1 }; - imageMemoryBarrier.image = presentImage; - return imageMemoryBarrier; - } - - void destroyUniformData(VkDevice device, vkTools::UniformData *uniformData) - { - if (uniformData->mapped != nullptr) - { - vkUnmapMemory(device, uniformData->memory); - } - vkDestroyBuffer(device, uniformData->buffer, nullptr); - vkFreeMemory(device, uniformData->memory, nullptr); - } } VkMemoryAllocateInfo vkTools::initializers::memoryAllocateInfo() diff --git a/base/vulkantools.h b/base/vulkantools.h index 1a800e19..96fd98aa 100644 --- a/base/vulkantools.h +++ b/base/vulkantools.h @@ -81,7 +81,7 @@ namespace vkTools // Display error message and exit on fatal error void exitFatal(std::string message, std::string caption); - // @brief Load a SPIR-V shader (binary) + // Load a SPIR-V shader (binary) #if defined(__ANDROID__) VkShaderModule loadShader(AAssetManager* assetManager, const char *fileName, VkDevice device, VkShaderStageFlagBits stage); #else @@ -92,28 +92,6 @@ namespace vkTools // Note: GLSL support requires vendor-specific extensions to be enabled and is not a core-feature of Vulkan VkShaderModule loadShaderGLSL(const char *fileName, VkDevice device, VkShaderStageFlagBits stage); - // Returns a pre-present image memory barrier - // Transforms the image's layout from color attachment to present khr - VkImageMemoryBarrier prePresentBarrier(VkImage presentImage); - - // Returns a post-present image memory barrier - // Transforms the image's layout back from present khr to color attachment - VkImageMemoryBarrier postPresentBarrier(VkImage presentImage); - - // Contains all vulkan objects - // required for a uniform data object - struct UniformData - { - VkBuffer buffer; - VkDeviceMemory memory; - VkDescriptorBufferInfo descriptor; - uint32_t allocSize; - void* mapped = nullptr; - }; - - // Destroy (and free) Vulkan resources used by a uniform data structure - void destroyUniformData(VkDevice device, vkTools::UniformData *uniformData); - // Contains often used vulkan object initializers // Save lot of VK_STRUCTURE_TYPE assignments // Some initializers are parameterized for convenience