X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fgraphicsbuffer.cpp;h=750fc8b40b16117272972304c3a783f88a0fc82d;hp=6f9ea9a0ffc714456763dcfd4a5807be1fa78744;hb=a851cf197844a2eb15fd5ee2c350ee296e415dca;hpb=bdda0103bf26d215d41093316ca0e15cd67fec1d

diff --git a/src/graphicsbuffer.cpp b/src/graphicsbuffer.cpp
index 6f9ea9a..750fc8b 100644
--- a/src/graphicsbuffer.cpp
+++ b/src/graphicsbuffer.cpp
@@ -1,8 +1,5 @@
 #include "graphicsbuffer.h"
 #include "log.h"
-#define GL_GLEXT_PROTOTYPES
-#include <SDL_opengl.h>
-#include <GL/glext.h>
 
 using namespace IPDF;
 
@@ -69,7 +66,11 @@ static GLenum BufferTypeToGLType(GraphicsBuffer::BufferType buffer_type)
 GraphicsBuffer::GraphicsBuffer()
 {
 	m_invalidated = true;
+	m_map_pointer = nullptr;
 	m_buffer_size = 0;
+	m_buffer_shape_dirty = true;
+	m_buffer_handle = 0;
+	m_buffer_usage = BufferUsageDynamicDraw;
 	SetUsage(BufferUsageStaticDraw);
 }
 
@@ -84,13 +85,41 @@ GraphicsBuffer::~GraphicsBuffer()
 
 void GraphicsBuffer::SetType(GraphicsBuffer::BufferType bufType)
 {
-	glGenBuffers(1, &m_buffer_handle);
 	m_buffer_type = bufType;
 }
 
 void GraphicsBuffer::SetUsage(GraphicsBuffer::BufferUsage bufUsage)
 {
-	m_buffer_usage = bufUsage;
+	if (bufUsage != m_buffer_usage)
+	{
+		m_buffer_usage = bufUsage;
+		m_buffer_shape_dirty = true;
+	}
+}
+
+void GraphicsBuffer::Invalidate()
+{
+	m_invalidated = true;
+	// Apparently not supported.
+	//glInvalidateBufferData(m_buffer_handle);
+}
+
+void GraphicsBuffer::RecreateBuffer()
+{
+	// If the buffer is not dirty, don't recreate it.
+	if (!m_buffer_shape_dirty) return;
+	// If the buffer is mapped, don't recreate it.
+	if (m_map_pointer) return;
+	// If the buffer has data in it we need, don't recreate it.
+	if (!m_invalidated) return;
+	if (m_buffer_handle)
+	{
+		glDeleteBuffers(1, &m_buffer_handle);
+	}
+	glGenBuffers(1, &m_buffer_handle);
+	m_buffer_shape_dirty = false;
+	if (m_buffer_size)
+		Upload(m_buffer_size, nullptr);
 }
 
 void* GraphicsBuffer::Map(bool read, bool write, bool invalidate)
@@ -98,12 +127,26 @@ void* GraphicsBuffer::Map(bool read, bool write, bool invalidate)
 	GLbitfield access = ((read)?GL_MAP_READ_BIT:0) | ((write)?GL_MAP_WRITE_BIT:0) | ((invalidate)?GL_MAP_INVALIDATE_BUFFER_BIT:0);
 	GLenum target = BufferTypeToGLType(m_buffer_type);
 
+	if (invalidate)
+	{
+		m_invalidated = true;
+
+		// Intel's Mesa driver does not rename the buffer when we map with GL_MAP_INVALIDATE_BUFFER_BIT,
+		// resulting in the CPU stalling waiting for rendering from the buffer to complete on the GPU.
+		// We manually force the buffer to be renamed here to avoid this.
+		m_buffer_shape_dirty = true;
+	}
+
+	if (m_map_pointer)
+		Warn("Tried to map already mapped buffer!");	
+
+	RecreateBuffer();
+
 	Bind();
 	
-	return glMapBufferRange(target, 0, m_buffer_size, access);
+	m_map_pointer = glMapBufferRange(target, 0, m_buffer_size, access);
 	
-	//TODO: Emulate DSA
-	//return glMapNamedBufferEXT(m_bufferHandle, access);
+	return m_map_pointer;
 }
 
 void* GraphicsBuffer::MapRange(int offset, int length, bool read, bool write, bool invalidate)
@@ -111,12 +154,15 @@ void* GraphicsBuffer::MapRange(int offset, int length, bool read, bool write, bo
 	GLbitfield access = ((read)?GL_MAP_READ_BIT:0) | ((write)?GL_MAP_WRITE_BIT:0) | ((invalidate)?GL_MAP_INVALIDATE_RANGE_BIT:0);
 	GLenum target = BufferTypeToGLType(m_buffer_type);
 
+	if (m_map_pointer)
+		Warn("Tried to map already mapped buffer!");	
+
+	RecreateBuffer();
+
 	Bind();
 	
-	return glMapBufferRange(target, offset, length, access);
-
-	//TODO: Emulate DSA
-	//return glMapNamedBufferRangeEXT(m_bufferHandle, offset, length, access);
+	m_map_pointer = glMapBufferRange(target, offset, length, access);
+	return m_map_pointer;
 }
 
 void GraphicsBuffer::UnMap()
@@ -125,7 +171,8 @@ void GraphicsBuffer::UnMap()
 	
 	Bind();
 	glUnmapBuffer(target);
-	//glUnmapNamedBufferEXT(m_bufferHandle);
+	m_map_pointer = nullptr;
+	m_invalidated = false;
 }
 
 void GraphicsBuffer::Upload(size_t length, const void* data)
@@ -133,27 +180,34 @@ void GraphicsBuffer::Upload(size_t length, const void* data)
 	GLenum target = BufferTypeToGLType(m_buffer_type);
 	
 	GLenum usage = BufferUsageToGLUsage(m_buffer_usage);
+
+	m_invalidated = true;
+	RecreateBuffer();
 	
 	Bind();
 	glBufferData(target, length, data, usage);
+	if (data != nullptr)
+		m_invalidated = false;
 	m_buffer_size = length;
-	//glNamedBufferDataEXT(m_bufferHandle, length, data, usage);
 }
 
 void GraphicsBuffer::UploadRange(size_t length, intptr_t offset, const void* data)
 {
 	GLenum target = BufferTypeToGLType(m_buffer_type);
+
+	RecreateBuffer();
 	
 	Bind();
 	glBufferSubData(target, offset, length, data);
-	//glNamedBufferSubDataEXT(m_bufferHandle, offset, length, data);
+	m_invalidated = false;
 }
 
 void GraphicsBuffer::Resize(size_t length)
 {
 	if (m_invalidated)
 	{
-		Upload(length, nullptr);
+		m_buffer_size = length;
+		RecreateBuffer();	
 	}
 	else
 	{
@@ -166,12 +220,11 @@ void GraphicsBuffer::Resize(size_t length)
 		glBindBuffer(GL_COPY_WRITE_BUFFER, m_buffer_handle);
 		glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, 0, 0, m_buffer_size);
 		glDeleteBuffers(1, &old_buffer);
+		m_buffer_size = length;
 	}
-	m_buffer_size = length;
-
 }
 
-void GraphicsBuffer::Bind()
+void GraphicsBuffer::Bind() const
 {
 	if (m_buffer_type == BufferTypeUniform)
 		glBindBufferBase(GL_UNIFORM_BUFFER, 0, m_buffer_handle);