X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fgraphicsbuffer.cpp;h=c3d9620d36138631f25896053995540bef50268f;hp=eb9845028d1c846e29c021d9fdc3cf8c021953c8;hb=f28146cf72fc68c8d3690814b1f89d47b8c4e7b9;hpb=f8ef964f021d1d6da6ea46bbb1fe8f0250a5be8c

diff --git a/src/graphicsbuffer.cpp b/src/graphicsbuffer.cpp
index eb98450..c3d9620 100644
--- a/src/graphicsbuffer.cpp
+++ b/src/graphicsbuffer.cpp
@@ -56,6 +56,8 @@ static GLenum BufferTypeToGLType(GraphicsBuffer::BufferType buffer_type)
 		return GL_PIXEL_UNPACK_BUFFER;
 	case GraphicsBuffer::BufferTypeUniform:
 		return GL_UNIFORM_BUFFER;
+	case GraphicsBuffer::BufferTypeTexture:
+		return GL_TEXTURE_BUFFER;
 	case GraphicsBuffer::BufferTypeDrawIndirect:
 		return GL_DRAW_INDIRECT_BUFFER;
 	default:
@@ -72,6 +74,7 @@ GraphicsBuffer::GraphicsBuffer()
 	m_buffer_handle = 0;
 	m_buffer_usage = BufferUsageDynamicDraw;
 	m_faking_map = false;
+	m_name = "Unnamed Buffer";
 	SetUsage(BufferUsageStaticDraw);
 }
 
@@ -89,6 +92,11 @@ void GraphicsBuffer::SetType(GraphicsBuffer::BufferType bufType)
 	m_buffer_type = bufType;
 }
 
+void GraphicsBuffer::SetName(const char *name)
+{
+	m_name = name;
+}
+
 void GraphicsBuffer::SetUsage(GraphicsBuffer::BufferUsage bufUsage)
 {
 	if (bufUsage != m_buffer_usage)
@@ -122,10 +130,13 @@ bool GraphicsBuffer::RecreateBuffer(const void *data)
 	{
 		glDeleteBuffers(1, &m_buffer_handle);
 	}
-	glGenBuffers(1, &m_buffer_handle);
-	m_buffer_shape_dirty = false;
 	if (m_buffer_size)
+	{
+		glGenBuffers(1, &m_buffer_handle);
+		glObjectLabel(GL_BUFFER, m_buffer_handle, -1, m_name);
+		m_buffer_shape_dirty = false;
 		Upload(m_buffer_size, data);
+	}
 	return true;
 }
 
@@ -147,6 +158,10 @@ void* GraphicsBuffer::Map(bool read, bool write, bool invalidate)
 	if (m_map_pointer)
 		Warn("Tried to map already mapped buffer!");	
 
+	// Intel really doesn't seem to like this.
+	if (!m_buffer_size)
+		return (m_map_pointer = 0);
+
 
 	if (!read && m_buffer_usage == BufferUsage::BufferUsageStaticDraw)
 	{
@@ -172,6 +187,10 @@ void* GraphicsBuffer::MapRange(int offset, int length, bool read, bool write, bo
 	if (m_map_pointer)
 		Warn("Tried to map already mapped buffer!");	
 
+	// This sometimes makes Intel corrupt memory?
+	if (!length) return (m_map_pointer = 0);
+
+
 	RecreateBuffer();
 
 	Bind();
@@ -183,12 +202,16 @@ void* GraphicsBuffer::MapRange(int offset, int length, bool read, bool write, bo
 void GraphicsBuffer::UnMap()
 {
 	GLenum target = BufferTypeToGLType(m_buffer_type);
+	
+	// If we're not mapped, unmapping is a no-op.
+	if (!m_map_pointer)
+		return;
 
 	if (m_faking_map)
 	{
 		Upload(m_buffer_size, m_map_pointer);
 		free(m_map_pointer);
-		m_map_pointer = nullptr;
+		m_map_pointer = NULL;
 		m_invalidated = false;
 		m_faking_map = false;
 		return;
@@ -196,7 +219,7 @@ void GraphicsBuffer::UnMap()
 	
 	Bind();
 	glUnmapBuffer(target);
-	m_map_pointer = nullptr;
+	m_map_pointer = NULL;
 	m_invalidated = false;
 }
 
@@ -211,9 +234,9 @@ void GraphicsBuffer::Upload(size_t length, const void* data)
 	if (!RecreateBuffer(data))
 	{
 		Bind();
-		glBufferData(target, length, data, usage);
+		glBufferData(target, length+1, data, usage);
 	}
-	if (data != nullptr)
+	if (data != NULL)
 		m_invalidated = false;
 }
 
@@ -230,22 +253,34 @@ void GraphicsBuffer::UploadRange(size_t length, intptr_t offset, const void* dat
 
 void GraphicsBuffer::Resize(size_t length)
 {
-	if (m_invalidated)
+	if (!m_buffer_size)
+	{
+		m_buffer_size = length;
+		return;
+	}
+	if (m_invalidated && m_buffer_size >= length)
 	{
 		m_buffer_size = length;
 	}
+	else if (length <= m_buffer_size)
+	{
+		// Don't need to do anything.
+	}
 	else
 	{
+		glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, -1, "Resizing buffer.");
+		glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DEBUG_SEVERITY_HIGH, 0, NULL, GL_TRUE);
 		// Create a new buffer and copy the old data into it.
 		UnMap();
 		GLuint old_buffer = m_buffer_handle;	
 		glGenBuffers(1, &m_buffer_handle);
-		Upload(length, nullptr);
+		Upload(length, NULL);
 		glBindBuffer(GL_COPY_READ_BUFFER, old_buffer);
 		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;
+		glPopDebugGroup();
 	}
 }
 
@@ -257,3 +292,7 @@ void GraphicsBuffer::Bind() const
 		glBindBuffer(BufferTypeToGLType(m_buffer_type), m_buffer_handle);
 }
 
+void GraphicsBuffer::BindRange(size_t start, size_t size) const
+{
+	glBindBufferRange(BufferTypeToGLType(m_buffer_type), 0, m_buffer_handle, start, size);
+}