X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Ftexture2d_backend.cpp;h=518f4c2ea54d552e0d50113f8c75a7f813d6e51c;hb=d2a23243b7f25e56ef098196b2962c103989143f;hp=a80e1f945e280ebcfbc422bd62eea127528aa2d3;hpb=99ca354f18119f82f1adeca100cd665a8f640317;p=libs%2Fgl.git

diff --git a/source/backends/vulkan/texture2d_backend.cpp b/source/backends/vulkan/texture2d_backend.cpp
index a80e1f94..518f4c2e 100644
--- a/source/backends/vulkan/texture2d_backend.cpp
+++ b/source/backends/vulkan/texture2d_backend.cpp
@@ -1,3 +1,5 @@
+#include "device.h"
+#include "texture2d.h"
 #include "texture2d_backend.h"
 #include "vulkan.h"
 
@@ -10,9 +12,63 @@ VulkanTexture2D::VulkanTexture2D():
 	Texture(VK_IMAGE_VIEW_TYPE_2D)
 { }
 
-void VulkanTexture2D::sub_image(unsigned, int, int, unsigned, unsigned, const void *)
+void VulkanTexture2D::fill_image_info(void *ii) const
 {
-	throw logic_error("Texture2D::sub_image is unimplemented");
+	const Texture2D &self = *static_cast<const Texture2D *>(this);
+
+	VkImageCreateInfo *image_info = static_cast<VkImageCreateInfo *>(ii);
+	image_info->imageType = VK_IMAGE_TYPE_2D;
+	image_info->extent.width = self.width;
+	image_info->extent.height = self.height;
+	image_info->mipLevels = self.levels;
+}
+
+void VulkanTexture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, const void *data)
+{
+	const Texture2D &self = *static_cast<const Texture2D *>(this);
+
+	auto level_size = self.get_level_size(level);
+	bool discard = (x==0 && y==0 && wd==level_size.x && ht==level_size.y);
+
+	size_t data_size = wd*ht*get_pixel_size(storage_fmt);
+	void *staging = device.get_transfer_queue().prepare_transfer(this, false, data_size,
+		[this, level, discard](){
+			unsigned n_levels = static_cast<const Texture2D *>(this)->levels;
+			change_layout(n_levels, level, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, discard);
+		},
+		[this, level, x, y, wd, ht](VkCommandBuffer cmd_buf, VkBuffer staging_buf, size_t src_off){
+			const VulkanFunctions &vk = device.get_functions();
+
+			VkBufferImageCopy region = { };
+			region.bufferOffset = src_off;
+			region.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+			region.imageSubresource.mipLevel = level;
+			region.imageSubresource.baseArrayLayer = 0;
+			region.imageSubresource.layerCount = 1;
+			region.imageOffset = { x, y, 0 };
+			region.imageExtent = { wd, ht, 1 };
+			vk.CmdCopyBufferToImage(cmd_buf, staging_buf, handle, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &region);
+		});
+
+	const char *src = static_cast<const char *>(data);
+	copy(src, src+data_size, static_cast<char *>(staging));
+}
+
+void VulkanTexture2D::generate_mipmap()
+{
+	generate_mipmap_levels(static_cast<const Texture2D *>(this)->levels);
+}
+
+void VulkanTexture2D::fill_mipmap_blit(unsigned level, void *b)
+{
+	const Texture2D &self = *static_cast<const Texture2D *>(this);
+	VkImageBlit &blit = *static_cast<VkImageBlit *>(b);
+
+	auto src_size = self.get_level_size(level);
+	auto dst_size = self.get_level_size(level+1);
+
+	blit.srcOffsets[1] = { static_cast<int>(src_size.x), static_cast<int>(src_size.y), 1 };
+	blit.dstOffsets[1] = { static_cast<int>(dst_size.x), static_cast<int>(dst_size.y), 1 };
 }
 
 Resource::AsyncLoader *VulkanTexture2D::load(IO::Seekable &, const Resources *)