X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fgraphicsbuffer.cpp;h=c3d9620d36138631f25896053995540bef50268f;hb=a9883b166454c794e342ccc262ca97e0394af980;hp=217fa9a00129e859eb9b5bc16d6d02ea8a686ab9;hpb=5f25f354c33142215147b1fa3d18445bd0d7a6ee;p=ipdf%2Fcode.git

diff --git a/src/graphicsbuffer.cpp b/src/graphicsbuffer.cpp
index 217fa9a..c3d9620 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,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();
@@ -224,7 +234,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,9 +253,18 @@ 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
 	{