X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Ftexture_backend.cpp;h=db420991ee1ebf17861c8b26c6aa4666f49b93fd;hb=295a0851bd3bcfba75c3e6a94b63cd8f5ee4ea53;hp=06c4a622341955b1064539afe11b369c0620b9e6;hpb=a16145549dc87c3b12671f797bd77b14bcc7786b;p=libs%2Fgl.git

diff --git a/source/backends/vulkan/texture_backend.cpp b/source/backends/vulkan/texture_backend.cpp
index 06c4a622..db420991 100644
--- a/source/backends/vulkan/texture_backend.cpp
+++ b/source/backends/vulkan/texture_backend.cpp
@@ -1,3 +1,4 @@
+#include <msp/strings/format.h>
 #include "device.h"
 #include "error.h"
 #include "synchronizer.h"
@@ -34,6 +35,11 @@ VulkanTexture::~VulkanTexture()
 
 	if(view_handle)
 		dq.destroy(view_handle);
+	if(mip_view_handles.size()>1)
+	{
+		for(VkImageView i: mip_view_handles)
+			dq.destroy(i);
+	}
 	if(handle)
 		dq.destroy(handle, memory_id);
 }
@@ -43,20 +49,25 @@ void VulkanTexture::allocate()
 	const Texture &self = *static_cast<const Texture *>(this);
 	const VulkanFunctions &vk = device.get_functions();
 
+	VkFormat vk_format = static_cast<VkFormat>(get_vulkan_pixelformat(self.storage_fmt));
+	VkFormatProperties props;
+	vk.GetPhysicalDeviceFormatProperties(vk_format, props);
+
 	VkImageCreateInfo image_info = { };
 	image_info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
-	image_info.format = static_cast<VkFormat>(get_vulkan_pixelformat(self.storage_fmt));
+	image_info.format = vk_format;
 	image_info.extent.width = 1;
 	image_info.extent.height = 1;
 	image_info.extent.depth = 1;
-	image_info.mipLevels = 1;
+	image_info.mipLevels = self.n_levels;
 	image_info.arrayLayers = 1;
 	image_info.samples = VK_SAMPLE_COUNT_1_BIT;
 	image_info.tiling = VK_IMAGE_TILING_OPTIMAL;
 	image_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
 	image_info.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
 
-	image_info.usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT;
+	image_info.usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT|VK_IMAGE_USAGE_TRANSFER_DST_BIT|VK_IMAGE_USAGE_SAMPLED_BIT;
+
 	PixelComponents comp = get_components(self.storage_fmt);
 	if(comp==DEPTH_COMPONENT || comp==STENCIL_INDEX)
 		image_info.usage |= VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
@@ -65,6 +76,9 @@ void VulkanTexture::allocate()
 
 	fill_image_info(&image_info);
 
+	if((props.optimalTilingFeatures&VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT) && image_info.samples==VK_SAMPLE_COUNT_1_BIT)
+		image_info.usage |= VK_IMAGE_USAGE_STORAGE_BIT;
+
 	/* SwapChainTexture may have already provided the image.  Create_info is
 	filled anyway because some of its fields are used for view_info. */
 	if(!handle)
@@ -73,14 +87,25 @@ void VulkanTexture::allocate()
 		memory_id = device.get_allocator().allocate(handle, DEVICE_MEMORY);
 
 		// Trigger a layout transition if the image is used before uploading data.
-		synchronize(-1, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, true);
+		change_layout(-1, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, true);
 	}
 
+	view_handle = create_view(-1);
+
+	if(!debug_name.empty())
+		set_vulkan_object_names();
+}
+
+VkImageView VulkanTexture::create_view(int level) const
+{
+	const Texture &self = *static_cast<const Texture *>(this);
+	const VulkanFunctions &vk = device.get_functions();
+
 	VkImageViewCreateInfo view_info = { };
 	view_info.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
 	view_info.image = handle_cast<::VkImage>(handle);
 	view_info.viewType = static_cast<VkImageViewType>(view_type);
-	view_info.format = image_info.format;
+	view_info.format = static_cast<VkFormat>(get_vulkan_pixelformat(self.storage_fmt));
 
 	const unsigned *swizzle_order = get_vulkan_swizzle(self.swizzle);
 	view_info.components.r = static_cast<VkComponentSwizzle>(swizzle_order[0]);
@@ -89,26 +114,73 @@ void VulkanTexture::allocate()
 	view_info.components.a = static_cast<VkComponentSwizzle>(swizzle_order[3]);
 
 	view_info.subresourceRange.aspectMask = get_vulkan_aspect(get_components(self.storage_fmt));
-	view_info.subresourceRange.baseMipLevel = 0;
-	view_info.subresourceRange.levelCount = image_info.mipLevels;
+	view_info.subresourceRange.baseMipLevel = max(level, 0);
+	view_info.subresourceRange.levelCount = (level<0 ? VK_REMAINING_MIP_LEVELS : 1);
 	view_info.subresourceRange.baseArrayLayer = 0;
-	view_info.subresourceRange.layerCount = image_info.arrayLayers;
+	view_info.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
 
-	vk.CreateImageView(view_info, view_handle);
+	VkImageView view;
+	vk.CreateImageView(view_info, view);
 
-	if(!debug_name.empty())
-		set_vulkan_object_names();
+	return view;
+}
+
+void VulkanTexture::create_mip_views() const
+{
+	const Texture &self = *static_cast<const Texture *>(this);
+
+	if(!mip_view_handles.empty())
+		return;
+		
+	mip_view_handles.resize(self.n_levels);
+	if(self.n_levels==1)
+		mip_view_handles[0] = view_handle;
+	else
+	{
+		for(unsigned i=0; i<self.n_levels; ++i)
+			mip_view_handles[i] = create_view(i);
+	}
 }
 
 void VulkanTexture::generate_mipmap()
 {
-	throw logic_error("VulkanTexture::generate_mipmap is unimplemented");
+	unsigned n_levels = static_cast<const Texture *>(this)->n_levels;
+
+	TransferQueue &tq = device.get_transfer_queue();
+	for(unsigned i=0; i+1<n_levels; ++i)
+	{
+		tq.prepare_transfer(this, true,
+			[this, i](){
+				change_layout(i, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, false);
+				change_layout(i+1, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, true);
+			},
+			[this, i](const VulkanCommandRecorder &vkCmd, VkBuffer, size_t){
+				const Texture &self = *static_cast<const Texture *>(this);
+
+				VkImageBlit region = { };
+				region.srcSubresource.aspectMask = get_vulkan_aspect(get_components(self.storage_fmt));
+				region.srcSubresource.mipLevel = i;
+				region.srcSubresource.baseArrayLayer = 0;
+				region.srcSubresource.layerCount = 1;
+				region.dstSubresource = region.srcSubresource;
+				++region.dstSubresource.mipLevel;
+
+				fill_mipmap_blit(i, &region);
+
+				vkCmd.BlitImage(handle, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, handle, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+					1, &region, VK_FILTER_LINEAR);
+			});
+	}
 }
 
-void VulkanTexture::synchronize(int layer, unsigned layout, bool discard) const
+void VulkanTexture::change_layout(int level, unsigned layout, bool discard) const
 {
-	unsigned aspect = get_vulkan_aspect(get_components(static_cast<const Texture *>(this)->storage_fmt));
-	device.get_synchronizer().access(handle, aspect, layer, layout, discard);
+	const Texture &self = *static_cast<const Texture *>(this);
+
+	unsigned aspect = get_vulkan_aspect(get_components(self.storage_fmt));
+	if(level>=0)
+		device.get_synchronizer().split_image_mipmap(handle, aspect, self.n_levels);
+	device.get_synchronizer().change_image_layout(handle, aspect, level, layout, discard);
 }
 
 void VulkanTexture::set_debug_name(const string &name)
@@ -139,6 +211,17 @@ void VulkanTexture::set_vulkan_object_names() const
 	name_info.objectHandle = reinterpret_cast<uint64_t>(view_handle);
 	name_info.pObjectName = view_name.c_str();
 	vk.SetDebugUtilsObjectName(name_info);
+
+	if(mip_view_handles.size()>1)
+	{
+		for(unsigned i=0; i<mip_view_handles.size(); ++i)
+		{
+			view_name = format("%s/mip%d.view", debug_name, i);
+			name_info.objectHandle = reinterpret_cast<uint64_t>(mip_view_handles[i]);
+			name_info.pObjectName = view_name.c_str();
+			vk.SetDebugUtilsObjectName(name_info);
+		}
+	}
 #endif
 }