X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fgraphicsbuffer.cpp;h=02a8f7cc627bd8345ee015bcf3eb2b8dd5464db1;hp=91c3478669ce641dca4f7e7fe2dff4397f4ab64e;hb=d68c91a7a2a3a4b3a312a50cbab5a7539d4cd7d5;hpb=4f60a4a972fa76800580f8731aba54a8fe94e1fb

diff --git a/src/graphicsbuffer.cpp b/src/graphicsbuffer.cpp
index 91c3478..02a8f7c 100644
--- a/src/graphicsbuffer.cpp
+++ b/src/graphicsbuffer.cpp
@@ -130,11 +130,13 @@ bool GraphicsBuffer::RecreateBuffer(const void *data)
 	{
 		glDeleteBuffers(1, &m_buffer_handle);
 	}
-	glGenBuffers(1, &m_buffer_handle);
-	glObjectLabel(GL_BUFFER, m_buffer_handle, -1, m_name);
-	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;
 }
 
@@ -156,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)
 	{
@@ -181,6 +187,13 @@ 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);
+
+	if ((size_t)(length + offset) > m_buffer_size)
+		Fatal("Tried to map outside of range!");
+
+
 	RecreateBuffer();
 
 	Bind();
@@ -224,7 +237,7 @@ 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 != NULL)
 		m_invalidated = false;
@@ -243,13 +256,22 @@ void GraphicsBuffer::UploadRange(size_t length, intptr_t offset, const void* dat
 
 void GraphicsBuffer::Resize(size_t length)
 {
-	glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, -1, "Resizing buffer.");
+	if (!m_buffer_size)
+	{
+		m_invalidated = true;
+		m_buffer_size = length;
+		return;
+	}
 	if (m_invalidated)
 	{
 		m_buffer_size = length;
+		m_buffer_shape_dirty = true;
 	}
 	else
 	{
+		size_t oldsize = m_buffer_size;
+		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;	
@@ -257,11 +279,11 @@ void GraphicsBuffer::Resize(size_t length)
 		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);
+		glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, 0, 0, oldsize);
 		glDeleteBuffers(1, &old_buffer);
 		m_buffer_size = length;
+		glPopDebugGroup();
 	}
-	glPopDebugGroup();
 }
 
 void GraphicsBuffer::Bind() const