diff --git a/src/common/2d/v_2ddrawer.h b/src/common/2d/v_2ddrawer.h
index 74d5935a63..f662de7acd 100644
--- a/src/common/2d/v_2ddrawer.h
+++ b/src/common/2d/v_2ddrawer.h
@@ -306,8 +306,8 @@ public:
 
 	void UploadData(F2DDrawer::TwoDVertex *vertices, int vertcount, int *indices, int indexcount)
 	{
-		mVertexBuffer->SetData(vertcount * sizeof(*vertices), vertices, false);
-		mIndexBuffer->SetData(indexcount * sizeof(unsigned int), indices, false);
+		mVertexBuffer->SetData(vertcount * sizeof(*vertices), vertices, BufferUsageType::Stream);
+		mIndexBuffer->SetData(indexcount * sizeof(unsigned int), indices, BufferUsageType::Stream);
 	}
 
 	std::pair<IVertexBuffer *, IIndexBuffer *> GetBufferObjects() const
diff --git a/src/common/rendering/gl/gl_buffers.cpp b/src/common/rendering/gl/gl_buffers.cpp
index 47970b4016..9338fee982 100644
--- a/src/common/rendering/gl/gl_buffers.cpp
+++ b/src/common/rendering/gl/gl_buffers.cpp
@@ -76,16 +76,20 @@ void GLBuffer::Bind()
 }
 
 
-void GLBuffer::SetData(size_t size, const void *data, bool staticdata)
+void GLBuffer::SetData(size_t size, const void *data, BufferUsageType usage)
 {
 	Bind();
-	if (data != nullptr)
+	if (usage == BufferUsageType::Static)
 	{
-		glBufferData(mUseType, size, data, staticdata? GL_STATIC_DRAW : GL_STREAM_DRAW);
+		glBufferData(mUseType, size, data, GL_STATIC_DRAW);
 	}
-	else
+	else if (usage == BufferUsageType::Stream)
 	{
-		mPersistent = screen->BuffersArePersistent() && !staticdata;
+		glBufferData(mUseType, size, data, GL_STREAM_DRAW);
+	}
+	else if (usage == BufferUsageType::Persistent)
+	{
+		mPersistent = screen->BuffersArePersistent();
 		if (mPersistent)
 		{
 			glBufferStorage(mUseType, size, nullptr, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT);
@@ -93,10 +97,15 @@ void GLBuffer::SetData(size_t size, const void *data, bool staticdata)
 		}
 		else
 		{
-			glBufferData(mUseType, size, nullptr, staticdata ? GL_STATIC_DRAW : GL_STREAM_DRAW);
+			glBufferData(mUseType, size, nullptr, GL_STREAM_DRAW);
 			map = nullptr;
 		}
-		if (!staticdata) nomap = false;
+		nomap = false;
+	}
+	else if (usage == BufferUsageType::Mappable)
+	{
+		glBufferData(mUseType, size, nullptr, GL_STATIC_DRAW);
+		map = nullptr;
 	}
 	buffersize = size;
 	InvalidateBufferState();
@@ -134,7 +143,7 @@ void GLBuffer::Unmap()
 void *GLBuffer::Lock(unsigned int size)
 {
 	// This initializes this buffer as a static object with no data.
-	SetData(size, nullptr, true);
+	SetData(size, nullptr, BufferUsageType::Mappable);
 	return glMapBufferRange(mUseType, 0, size, GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_BUFFER_BIT | GL_MAP_UNSYNCHRONIZED_BIT);
 }
 
@@ -158,7 +167,7 @@ void GLBuffer::Resize(size_t newsize)
 		glUnmapBuffer(mUseType);
 
 		glGenBuffers(1, &mBufferId);
-		SetData(newsize, nullptr, false);
+		SetData(newsize, nullptr, BufferUsageType::Persistent);
 		glBindBuffer(GL_COPY_READ_BUFFER, oldbuffer);
 
 		// copy contents and delete the old buffer.
diff --git a/src/common/rendering/gl/gl_buffers.h b/src/common/rendering/gl/gl_buffers.h
index 0141ece5f4..d0c2b62c81 100644
--- a/src/common/rendering/gl/gl_buffers.h
+++ b/src/common/rendering/gl/gl_buffers.h
@@ -24,7 +24,7 @@ protected:
 
 	GLBuffer(int usetype);
 	~GLBuffer();
-	void SetData(size_t size, const void *data, bool staticdata) override;
+	void SetData(size_t size, const void *data, BufferUsageType usage) override;
 	void SetSubData(size_t offset, size_t size, const void *data) override;
 	void Map() override;
 	void Unmap() override;
diff --git a/src/common/rendering/gl/gl_renderbuffers.cpp b/src/common/rendering/gl/gl_renderbuffers.cpp
index a1d8899bb1..134009fc46 100644
--- a/src/common/rendering/gl/gl_renderbuffers.cpp
+++ b/src/common/rendering/gl/gl_renderbuffers.cpp
@@ -952,7 +952,7 @@ void GLPPRenderState::Draw()
 	{
 		if (!shader->Uniforms)
 			shader->Uniforms.reset(screen->CreateDataBuffer(POSTPROCESS_BINDINGPOINT, false, false));
-		shader->Uniforms->SetData(Uniforms.Data.Size(), Uniforms.Data.Data());
+		shader->Uniforms->SetData(Uniforms.Data.Size(), Uniforms.Data.Data(), BufferUsageType::Static);
 		static_cast<GLDataBuffer*>(shader->Uniforms.get())->BindBase();
 	}
 
diff --git a/src/common/rendering/gles/gles_buffers.cpp b/src/common/rendering/gles/gles_buffers.cpp
index f3ffcfcc6b..de815ea34e 100644
--- a/src/common/rendering/gles/gles_buffers.cpp
+++ b/src/common/rendering/gles/gles_buffers.cpp
@@ -93,8 +93,9 @@ void GLBuffer::Bind()
 }
 
 
-void GLBuffer::SetData(size_t size, const void* data, bool staticdata)
+void GLBuffer::SetData(size_t size, const void* data, BufferUsageType usage)
 {
+	bool staticdata = (usage == BufferUsageType::Static || usage == BufferUsageType::Mappable);
 	if (isData || !gles.useMappedBuffers)
 	{
 		if (memory)
@@ -175,7 +176,7 @@ void GLBuffer::Unmap()
 void *GLBuffer::Lock(unsigned int size)
 {
 	// This initializes this buffer as a static object with no data.
-	SetData(size, nullptr, true);
+	SetData(size, nullptr, BufferUsageType::Mappable);
 	if (!isData && gles.useMappedBuffers)
 	{
 		return glMapBufferRange(mUseType, 0, size, GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_BUFFER_BIT | GL_MAP_UNSYNCHRONIZED_BIT);
diff --git a/src/common/rendering/gles/gles_buffers.h b/src/common/rendering/gles/gles_buffers.h
index 0bd2053512..d9e01ece66 100644
--- a/src/common/rendering/gles/gles_buffers.h
+++ b/src/common/rendering/gles/gles_buffers.h
@@ -26,7 +26,7 @@ protected:
 
 	GLBuffer(int usetype);
 	~GLBuffer();
-	void SetData(size_t size, const void *data, bool staticdata) override;
+	void SetData(size_t size, const void *data, BufferUsageType usage) override;
 	void SetSubData(size_t offset, size_t size, const void *data) override;
 	void Map() override;
 	void Unmap() override;
diff --git a/src/common/rendering/gles/gles_shaderprogram.h b/src/common/rendering/gles/gles_shaderprogram.h
index a8dc97428b..e464180546 100644
--- a/src/common/rendering/gles/gles_shaderprogram.h
+++ b/src/common/rendering/gles/gles_shaderprogram.h
@@ -88,7 +88,7 @@ public:
 	void SetData()
 	{
 		if (mBuffer != nullptr)
-			mBuffer->SetData(sizeof(T), &Values);
+			mBuffer->SetData(sizeof(T), &Values, BufferUsageType::Static);
 	}
 
 	IDataBuffer* GetBuffer() const
diff --git a/src/common/rendering/hwrenderer/data/buffers.h b/src/common/rendering/hwrenderer/data/buffers.h
index 586e5caa02..980adde5e0 100644
--- a/src/common/rendering/hwrenderer/data/buffers.h
+++ b/src/common/rendering/hwrenderer/data/buffers.h
@@ -46,6 +46,14 @@ struct FVertexBufferAttribute
 	int offset;
 };
 
+enum class BufferUsageType
+{
+	Static,     // initial data is not null, staticdata is true
+	Stream,     // initial data is not null, staticdata is false
+	Persistent, // initial data is null, staticdata is false
+	Mappable    // initial data is null, staticdata is true
+};
+
 class IBuffer
 {
 protected:
@@ -57,7 +65,7 @@ public:
 	IBuffer &operator=(const IBuffer &) = delete;
 	virtual ~IBuffer() = default;
 
-	virtual void SetData(size_t size, const void *data, bool staticdata = true) = 0;
+	virtual void SetData(size_t size, const void *data, BufferUsageType type) = 0;
 	virtual void SetSubData(size_t offset, size_t size, const void *data) = 0;
 	virtual void *Lock(unsigned int size) = 0;
 	virtual void Unlock() = 0;
diff --git a/src/common/rendering/hwrenderer/data/flatvertices.cpp b/src/common/rendering/hwrenderer/data/flatvertices.cpp
index 9a34b45ff9..6fe258b269 100644
--- a/src/common/rendering/hwrenderer/data/flatvertices.cpp
+++ b/src/common/rendering/hwrenderer/data/flatvertices.cpp
@@ -81,7 +81,7 @@ FFlatVertexBuffer::FFlatVertexBuffer(int width, int height, int pipelineNbr):
 
 	mIndexBuffer = screen->CreateIndexBuffer();
 	int data[4] = {};
-	mIndexBuffer->SetData(4, data); // On Vulkan this may not be empty, so set some dummy defaults to avoid crashes.
+	mIndexBuffer->SetData(4, data, BufferUsageType::Static); // On Vulkan this may not be empty, so set some dummy defaults to avoid crashes.
 
 
 	for (int n = 0; n < mPipelineNbr; n++)
@@ -89,7 +89,7 @@ FFlatVertexBuffer::FFlatVertexBuffer(int width, int height, int pipelineNbr):
 		mVertexBufferPipeline[n] = screen->CreateVertexBuffer();
 
 		unsigned int bytesize = BUFFER_SIZE * sizeof(FFlatVertex);
-		mVertexBufferPipeline[n]->SetData(bytesize, nullptr, false);
+		mVertexBufferPipeline[n]->SetData(bytesize, nullptr, BufferUsageType::Persistent);
 
 		static const FVertexBufferAttribute format[] = {
 			{ 0, VATTR_VERTEX, VFmt_Float3, (int)myoffsetof(FFlatVertex, x) },
diff --git a/src/common/rendering/hwrenderer/data/hw_lightbuffer.cpp b/src/common/rendering/hwrenderer/data/hw_lightbuffer.cpp
index e0283d58e6..9f7bb66c21 100644
--- a/src/common/rendering/hwrenderer/data/hw_lightbuffer.cpp
+++ b/src/common/rendering/hwrenderer/data/hw_lightbuffer.cpp
@@ -64,7 +64,7 @@ FLightBuffer::FLightBuffer(int pipelineNbr):
 	for (int n = 0; n < mPipelineNbr; n++)
 	{
 		mBufferPipeline[n] = screen->CreateDataBuffer(LIGHTBUF_BINDINGPOINT, mBufferType, false);
-		mBufferPipeline[n]->SetData(mByteSize, nullptr, false);
+		mBufferPipeline[n]->SetData(mByteSize, nullptr, BufferUsageType::Persistent);
 	}
 
 	Clear();
diff --git a/src/common/rendering/hwrenderer/data/hw_shadowmap.cpp b/src/common/rendering/hwrenderer/data/hw_shadowmap.cpp
index c5e5fb09bb..26eaa2d2c3 100644
--- a/src/common/rendering/hwrenderer/data/hw_shadowmap.cpp
+++ b/src/common/rendering/hwrenderer/data/hw_shadowmap.cpp
@@ -117,7 +117,7 @@ void IShadowMap::UploadLights()
 	if (mLightList == nullptr)
 		mLightList = screen->CreateDataBuffer(LIGHTLIST_BINDINGPOINT, true, false);
 
-	mLightList->SetData(sizeof(float) * mLights.Size(), &mLights[0]);
+	mLightList->SetData(sizeof(float) * mLights.Size(), &mLights[0], BufferUsageType::Stream);
 }
 
 
@@ -129,11 +129,11 @@ void IShadowMap::UploadAABBTree()
 
 		if (!mNodesBuffer)
 			mNodesBuffer = screen->CreateDataBuffer(LIGHTNODES_BINDINGPOINT, true, false);
-		mNodesBuffer->SetData(mAABBTree->NodesSize(), mAABBTree->Nodes());
+		mNodesBuffer->SetData(mAABBTree->NodesSize(), mAABBTree->Nodes(), BufferUsageType::Static);
 
 		if (!mLinesBuffer)
 			mLinesBuffer = screen->CreateDataBuffer(LIGHTLINES_BINDINGPOINT, true, false);
-		mLinesBuffer->SetData(mAABBTree->LinesSize(), mAABBTree->Lines());
+		mLinesBuffer->SetData(mAABBTree->LinesSize(), mAABBTree->Lines(), BufferUsageType::Static);
 	}
 	else if (mAABBTree->Update())
 	{
diff --git a/src/common/rendering/hwrenderer/data/hw_skydome.cpp b/src/common/rendering/hwrenderer/data/hw_skydome.cpp
index 5d5ee8000d..e9e1bc364f 100644
--- a/src/common/rendering/hwrenderer/data/hw_skydome.cpp
+++ b/src/common/rendering/hwrenderer/data/hw_skydome.cpp
@@ -130,7 +130,7 @@ FSkyVertexBuffer::FSkyVertexBuffer()
 		{ 0, VATTR_COLOR, VFmt_Byte4, (int)myoffsetof(FSkyVertex, color) }
 	};
 	mVertexBuffer->SetFormat(1, 3, sizeof(FSkyVertex), format);
-	mVertexBuffer->SetData(mVertices.Size() * sizeof(FSkyVertex), &mVertices[0], true);
+	mVertexBuffer->SetData(mVertices.Size() * sizeof(FSkyVertex), &mVertices[0], BufferUsageType::Static);
 }
 
 FSkyVertexBuffer::~FSkyVertexBuffer()
diff --git a/src/common/rendering/hwrenderer/data/hw_viewpointbuffer.cpp b/src/common/rendering/hwrenderer/data/hw_viewpointbuffer.cpp
index c37306b8a9..89a5a8436f 100644
--- a/src/common/rendering/hwrenderer/data/hw_viewpointbuffer.cpp
+++ b/src/common/rendering/hwrenderer/data/hw_viewpointbuffer.cpp
@@ -43,7 +43,7 @@ HWViewpointBuffer::HWViewpointBuffer(int pipelineNbr):
 	for (int n = 0; n < mPipelineNbr; n++)
 	{
 		mBufferPipeline[n] = screen->CreateDataBuffer(VIEWPOINT_BINDINGPOINT, false, true);
-		mBufferPipeline[n]->SetData(mByteSize, nullptr, false);
+		mBufferPipeline[n]->SetData(mByteSize, nullptr, BufferUsageType::Persistent);
 	}
 
 	Clear();
diff --git a/src/common/rendering/hwrenderer/data/shaderuniforms.h b/src/common/rendering/hwrenderer/data/shaderuniforms.h
index 2543b52b1f..92995fcaa7 100644
--- a/src/common/rendering/hwrenderer/data/shaderuniforms.h
+++ b/src/common/rendering/hwrenderer/data/shaderuniforms.h
@@ -129,7 +129,7 @@ public:
 	void SetData()
 	{
 		if (mBuffer != nullptr)
-			mBuffer->SetData(sizeof(T), &Values);
+			mBuffer->SetData(sizeof(T), &Values, BufferUsageType::Static);
 	}
 
 	IDataBuffer* GetBuffer() const
diff --git a/src/common/rendering/polyrenderer/backend/poly_buffers.cpp b/src/common/rendering/polyrenderer/backend/poly_buffers.cpp
index 82c336e2ab..10ebef0d06 100644
--- a/src/common/rendering/polyrenderer/backend/poly_buffers.cpp
+++ b/src/common/rendering/polyrenderer/backend/poly_buffers.cpp
@@ -56,7 +56,7 @@ void PolyBuffer::Reset()
 {
 }
 
-void PolyBuffer::SetData(size_t size, const void *data, bool staticdata)
+void PolyBuffer::SetData(size_t size, const void *data, BufferUsageType usage)
 {
 	mData.resize(size);
 	map = mData.data();
diff --git a/src/common/rendering/polyrenderer/backend/poly_buffers.h b/src/common/rendering/polyrenderer/backend/poly_buffers.h
index 2f3d2cc747..c364586fad 100644
--- a/src/common/rendering/polyrenderer/backend/poly_buffers.h
+++ b/src/common/rendering/polyrenderer/backend/poly_buffers.h
@@ -20,7 +20,7 @@ public:
 	static void ResetAll();
 	void Reset();
 
-	void SetData(size_t size, const void *data, bool staticdata) override;
+	void SetData(size_t size, const void *data, BufferUsageType usage) override;
 	void SetSubData(size_t offset, size_t size, const void *data) override;
 	void Resize(size_t newsize) override;
 
diff --git a/src/common/rendering/polyrenderer/backend/poly_framebuffer.cpp b/src/common/rendering/polyrenderer/backend/poly_framebuffer.cpp
index a71523a468..6f8ead0c5d 100644
--- a/src/common/rendering/polyrenderer/backend/poly_framebuffer.cpp
+++ b/src/common/rendering/polyrenderer/backend/poly_framebuffer.cpp
@@ -111,7 +111,7 @@ void PolyFrameBuffer::InitializeState()
 	mScreenQuad.VertexBuffer->SetFormat(1, 3, sizeof(ScreenQuadVertex), format);
 
 	mScreenQuad.IndexBuffer = screen->CreateIndexBuffer();
-	mScreenQuad.IndexBuffer->SetData(6 * sizeof(uint32_t), indices, false);
+	mScreenQuad.IndexBuffer->SetData(6 * sizeof(uint32_t), indices, BufferUsageType::Stream);
 
 	CheckCanvas();
 }
@@ -254,7 +254,7 @@ void PolyFrameBuffer::PostProcessScene(bool swscene, int fixedcm, float flash, c
 			{ 0.0f, (float)mScreenViewport.height, 0.0f, 1.0f },
 			{ (float)mScreenViewport.width, (float)mScreenViewport.height, 1.0f, 1.0f }
 		};
-		mScreenQuad.VertexBuffer->SetData(4 * sizeof(ScreenQuadVertex), vertices, false);
+		mScreenQuad.VertexBuffer->SetData(4 * sizeof(ScreenQuadVertex), vertices, BufferUsageType::Stream);
 
 		mRenderState->SetVertexBuffer(mScreenQuad.VertexBuffer, 0, 0);
 		mRenderState->SetIndexBuffer(mScreenQuad.IndexBuffer);
diff --git a/src/common/rendering/vulkan/renderer/vk_streambuffer.cpp b/src/common/rendering/vulkan/renderer/vk_streambuffer.cpp
index b393867c39..5a40be3715 100644
--- a/src/common/rendering/vulkan/renderer/vk_streambuffer.cpp
+++ b/src/common/rendering/vulkan/renderer/vk_streambuffer.cpp
@@ -30,7 +30,7 @@ VkStreamBuffer::VkStreamBuffer(size_t structSize, size_t count)
 	mBlockSize = static_cast<uint32_t>((structSize + screen->uniformblockalignment - 1) / screen->uniformblockalignment * screen->uniformblockalignment);
 
 	UniformBuffer = (VKDataBuffer*)GetVulkanFrameBuffer()->CreateDataBuffer(-1, false, false);
-	UniformBuffer->SetData(mBlockSize * count, nullptr, false);
+	UniformBuffer->SetData(mBlockSize * count, nullptr, BufferUsageType::Persistent);
 }
 
 VkStreamBuffer::~VkStreamBuffer()
diff --git a/src/common/rendering/vulkan/system/vk_buffers.cpp b/src/common/rendering/vulkan/system/vk_buffers.cpp
index 420be91f11..96835419ff 100644
--- a/src/common/rendering/vulkan/system/vk_buffers.cpp
+++ b/src/common/rendering/vulkan/system/vk_buffers.cpp
@@ -64,61 +64,73 @@ void VKBuffer::Reset()
 	mStaging.reset();
 }
 
-void VKBuffer::SetData(size_t size, const void *data, bool staticdata)
+void VKBuffer::SetData(size_t size, const void *data, BufferUsageType usage)
 {
 	auto fb = GetVulkanFrameBuffer();
 
-	size = std::max(size, (size_t)16); // For supporting zero byte buffers
+	size_t bufsize = std::max(size, (size_t)16); // For supporting zero byte buffers
 
-	if (staticdata)
+	if (usage == BufferUsageType::Static || usage == BufferUsageType::Stream)
 	{
+		// Note: we could recycle buffers here for the stream usage type to improve performance
+
 		mPersistent = false;
 
-		{
-			BufferBuilder builder;
-			builder.setUsage(VK_BUFFER_USAGE_TRANSFER_DST_BIT | mBufferType, VMA_MEMORY_USAGE_GPU_ONLY);
-			builder.setSize(size);
-			mBuffer = builder.create(fb->device);
-		}
+		BufferBuilder builder;
+		builder.setUsage(VK_BUFFER_USAGE_TRANSFER_DST_BIT | mBufferType, VMA_MEMORY_USAGE_GPU_ONLY);
+		builder.setSize(bufsize);
+		mBuffer = builder.create(fb->device);
 
-		{
-			BufferBuilder builder;
-			builder.setUsage(VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VMA_MEMORY_USAGE_CPU_ONLY);
-			builder.setSize(size);
-			mStaging = builder.create(fb->device);
-		}
+		BufferBuilder builder2;
+		builder2.setUsage(VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VMA_MEMORY_USAGE_CPU_ONLY);
+		builder2.setSize(bufsize);
+		mStaging = builder2.create(fb->device);
 
-		void *dst = mStaging->Map(0, size);
-		memcpy(dst, data, size);
-		mStaging->Unmap();
+		if (data)
+		{
+			void* dst = mStaging->Map(0, bufsize);
+			memcpy(dst, data, size);
+			mStaging->Unmap();
+		}
 
 		fb->GetTransferCommands()->copyBuffer(mStaging.get(), mBuffer.get());
 	}
-	else
+	else if (usage == BufferUsageType::Persistent)
 	{
-		mPersistent = screen->BuffersArePersistent();
+		mPersistent = true;
 
 		BufferBuilder builder;
-		builder.setUsage(mBufferType, VMA_MEMORY_USAGE_UNKNOWN, mPersistent ? VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT | VMA_ALLOCATION_CREATE_MAPPED_BIT : 0);
+		builder.setUsage(mBufferType, VMA_MEMORY_USAGE_UNKNOWN, VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT | VMA_ALLOCATION_CREATE_MAPPED_BIT);
 		builder.setMemoryType(
 			VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
 			VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT | VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
-		builder.setSize(size);
+		builder.setSize(bufsize);
 		mBuffer = builder.create(fb->device);
 
-		if (mPersistent)
+		map = mBuffer->Map(0, bufsize);
+		if (data)
+			memcpy(map, data, size);
+	}
+	else if (usage == BufferUsageType::Mappable)
+	{
+		mPersistent = false;
+
+		BufferBuilder builder;
+		builder.setUsage(mBufferType, VMA_MEMORY_USAGE_UNKNOWN, 0);
+		builder.setMemoryType(
+			VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
+			VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT | VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
+		builder.setSize(bufsize);
+		mBuffer = builder.create(fb->device);
+
+		if (data)
 		{
-			map = mBuffer->Map(0, size);
-			if (data)
-				memcpy(map, data, size);
-		}
-		else if (data)
-		{
-			void *dst = mBuffer->Map(0, size);
+			void* dst = mBuffer->Map(0, bufsize);
 			memcpy(dst, data, size);
 			mBuffer->Unmap();
 		}
 	}
+
 	buffersize = size;
 }
 
@@ -214,7 +226,7 @@ void VKBuffer::Unlock()
 	if (!mBuffer)
 	{
 		map = nullptr;
-		SetData(mStaticUpload.Size(), mStaticUpload.Data(), true);
+		SetData(mStaticUpload.Size(), mStaticUpload.Data(), BufferUsageType::Static);
 		mStaticUpload.Clear();
 	}
 	else if (!mPersistent)
diff --git a/src/common/rendering/vulkan/system/vk_buffers.h b/src/common/rendering/vulkan/system/vk_buffers.h
index d85391b3c3..78f8501480 100644
--- a/src/common/rendering/vulkan/system/vk_buffers.h
+++ b/src/common/rendering/vulkan/system/vk_buffers.h
@@ -19,7 +19,7 @@ public:
 	static void ResetAll();
 	void Reset();
 
-	void SetData(size_t size, const void *data, bool staticdata) override;
+	void SetData(size_t size, const void *data, BufferUsageType usage) override;
 	void SetSubData(size_t offset, size_t size, const void *data) override;
 	void Resize(size_t newsize) override;
 
diff --git a/src/common/rendering/vulkan/system/vk_framebuffer.cpp b/src/common/rendering/vulkan/system/vk_framebuffer.cpp
index 4d08212ecd..131a3e6fb1 100644
--- a/src/common/rendering/vulkan/system/vk_framebuffer.cpp
+++ b/src/common/rendering/vulkan/system/vk_framebuffer.cpp
@@ -721,7 +721,7 @@ void VulkanFrameBuffer::CreateFanToTrisIndexBuffer()
 	}
 
 	FanToTrisIndexBuffer.reset(CreateIndexBuffer());
-	FanToTrisIndexBuffer->SetData(sizeof(uint32_t) * data.Size(), data.Data());
+	FanToTrisIndexBuffer->SetData(sizeof(uint32_t) * data.Size(), data.Data(), BufferUsageType::Static);
 }
 
 void VulkanFrameBuffer::UpdateShadowMap()
diff --git a/src/rendering/hwrenderer/hw_vertexbuilder.cpp b/src/rendering/hwrenderer/hw_vertexbuilder.cpp
index bf5dd8bd0a..c4b980d656 100644
--- a/src/rendering/hwrenderer/hw_vertexbuilder.cpp
+++ b/src/rendering/hwrenderer/hw_vertexbuilder.cpp
@@ -400,5 +400,5 @@ void CreateVBO(FFlatVertexBuffer* fvb, TArray<sector_t>& sectors)
 	CreateVertices(fvb, sectors);
 	fvb->mCurIndex = fvb->mIndex = fvb->vbo_shadowdata.Size();
 	fvb->Copy(0, fvb->mIndex);
-	fvb->mIndexBuffer->SetData(fvb->ibo_data.Size() * sizeof(uint32_t), &fvb->ibo_data[0]);
+	fvb->mIndexBuffer->SetData(fvb->ibo_data.Size() * sizeof(uint32_t), &fvb->ibo_data[0], BufferUsageType::Static);
 }