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

diff --git a/source/backends/vulkan/texture_backend.cpp b/source/backends/vulkan/texture_backend.cpp
index 237b9845..db420991 100644
--- a/source/backends/vulkan/texture_backend.cpp
+++ b/source/backends/vulkan/texture_backend.cpp
@@ -49,9 +49,13 @@ 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;
@@ -63,6 +67,7 @@ void VulkanTexture::allocate()
 	image_info.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
 
 	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;
@@ -71,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)
@@ -134,43 +142,6 @@ void VulkanTexture::create_mip_views() const
 	}
 }
 
-void VulkanTexture::stage_pixels(void *staging, const void *data, size_t count)
-{
-	const Texture &self = *static_cast<const Texture *>(this);
-
-	if(self.swizzle==RGBA_TO_RGB)
-	{
-		const uint32_t *src = static_cast<const uint32_t *>(data);
-		uint32_t *dst = static_cast<uint32_t *>(staging);
-		size_t i = 0;
-		for(; i+3<count; i+=4)
-		{
-			dst[0] = src[0]|0xFF000000;
-			dst[1] = (src[0]>>24)|(src[1]<<8)|0xFF000000;
-			dst[2] = (src[1]>>16)|(src[2]<<16)|0xFF000000;
-			dst[3] = (src[2]>>8)|0xFF000000;
-			src += 3;
-			dst += 4;
-		}
-
-		if(i<count)
-		{
-			const uint8_t *src_bytes = reinterpret_cast<const uint8_t *>(src);
-			for(; i<count; ++i)
-			{
-				*dst++ = src_bytes[0]|(src_bytes[1]<<8)|(src_bytes[2]<<16)|0xFF000000;
-				src_bytes += 3;
-			}
-		}
-	}
-	else
-	{
-		const char *src = static_cast<const char *>(data);
-		size_t data_size = count*get_pixel_size(self.storage_fmt);
-		copy(src, src+data_size, static_cast<char *>(staging));
-	}
-}
-
 void VulkanTexture::generate_mipmap()
 {
 	unsigned n_levels = static_cast<const Texture *>(this)->n_levels;
@@ -178,16 +149,16 @@ void VulkanTexture::generate_mipmap()
 	TransferQueue &tq = device.get_transfer_queue();
 	for(unsigned i=0; i+1<n_levels; ++i)
 	{
-		tq.prepare_transfer(this, true, 0,
+		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](VkCommandBuffer cmd_buf, VkBuffer, size_t){
-				const VulkanFunctions &vk = device.get_functions();
+			[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(static_cast<const Texture *>(this)->storage_fmt));
+				region.srcSubresource.aspectMask = get_vulkan_aspect(get_components(self.storage_fmt));
 				region.srcSubresource.mipLevel = i;
 				region.srcSubresource.baseArrayLayer = 0;
 				region.srcSubresource.layerCount = 1;
@@ -196,7 +167,7 @@ void VulkanTexture::generate_mipmap()
 
 				fill_mipmap_blit(i, &region);
 
-				vk.CmdBlitImage(cmd_buf, handle, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, handle, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+				vkCmd.BlitImage(handle, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, handle, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
 					1, &region, VK_FILTER_LINEAR);
 			});
 	}