Merged from origin/main

1 files changed, 24 insertions, 2 deletions

diff --git a/zencore/sharedbuffer.cpp b/zencore/sharedbuffer.cpp
index bbbaa0b24..9c788d29f 100644
--- a/zencore/sharedbuffer.cpp
+++ b/zencore/sharedbuffer.cpp
@@ -35,17 +35,31 @@ UniqueBuffer::UniqueBuffer(IoBufferCore* Owner) : m_Buffer(Owner)
 {
 }
 
+SharedBuffer
+UniqueBuffer::MoveToShared()
+{
+	return SharedBuffer(std::move(m_Buffer));
+}
+
+void
+UniqueBuffer::Reset()
+{
+	m_Buffer = nullptr;
+}
+
 //////////////////////////////////////////////////////////////////////////
 
 SharedBuffer::SharedBuffer(UniqueBuffer&& InBuffer) : m_Buffer(std::move(InBuffer.m_Buffer))
 {
 }
 
-void
+SharedBuffer&
 SharedBuffer::MakeOwned()
 {
 	if (IsOwned() || !m_Buffer)
-		return;
+	{
+		return *this;
+	}
 
 	const uint64_t Size		= m_Buffer->DataBytes();
 	void*		   Buffer	= Memory::Alloc(Size, 16);
@@ -55,6 +69,8 @@ SharedBuffer::MakeOwned()
 	memcpy(Buffer, m_Buffer->DataPointer(), Size);
 
 	m_Buffer = NewOwner;
+
+	return *this;
 }
 
 SharedBuffer
@@ -65,6 +81,12 @@ SharedBuffer::MakeView(MemoryView View, SharedBuffer OuterBuffer)
 		ZEN_ASSERT(OuterBuffer.GetView().Contains(View));
 	}
 
+	if (View == OuterBuffer.GetView())
+	{
+		// Reference to the full buffer contents, so just return the "outer"
+		return OuterBuffer;
+	}
+
 	IoBufferCore* NewCore = new IoBufferCore(OuterBuffer.m_Buffer, View.GetData(), View.GetSize());
 	NewCore->SetIsImmutable(true);
 	return SharedBuffer(NewCore);