Merge branch 'master' of git.ucc.asn.au:/ipdf/code

[ipdf/code.git] / src / graphicsbuffer.cpp

diff --git a/src/graphicsbuffer.cpp b/src/graphicsbuffer.cpp
index fe5ae1c..217fa9a 100644 (file)
--- a/src/graphicsbuffer.cpp
+++ b/src/graphicsbuffer.cpp
@@ -1,8 +1,5 @@
 #include "graphicsbuffer.h"
 #include "log.h"
 #include "graphicsbuffer.h"
 #include "log.h"

-#define GL_GLEXT_PROTOTYPES
-#include <SDL_opengl.h>
-#include <GL/glext.h>

 
 using namespace IPDF;
 
 
 using namespace IPDF;
 


@@ -39,7 +36,7 @@ static GLenum BufferUsageToGLUsage(GraphicsBuffer::BufferUsage buffer_usage)
                usage = GL_STREAM_COPY;
                break;
        default:
                usage = GL_STREAM_COPY;
                break;
        default:

-               SDL_assert(false && "Unknown buffer usage type.");
+               SDL_assert(false && "Unknown buffer usage type."); //WTF?

                usage = GL_DYNAMIC_DRAW;
        }
        return usage;
                usage = GL_DYNAMIC_DRAW;
        }
        return usage;


@@ -59,6 +56,8 @@ static GLenum BufferTypeToGLType(GraphicsBuffer::BufferType buffer_type)
                return GL_PIXEL_UNPACK_BUFFER;
        case GraphicsBuffer::BufferTypeUniform:
                return GL_UNIFORM_BUFFER;
                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:
        case GraphicsBuffer::BufferTypeDrawIndirect:
                return GL_DRAW_INDIRECT_BUFFER;
        default:


@@ -69,9 +68,13 @@ static GLenum BufferTypeToGLType(GraphicsBuffer::BufferType buffer_type)
 GraphicsBuffer::GraphicsBuffer()
 {
        m_invalidated = true;
 GraphicsBuffer::GraphicsBuffer()
 {
        m_invalidated = true;

-       m_map_pointer = nullptr;
+       m_map_pointer = NULL;

        m_buffer_size = 0;
        m_buffer_shape_dirty = true;
        m_buffer_size = 0;
        m_buffer_shape_dirty = true;

+       m_buffer_handle = 0;
+       m_buffer_usage = BufferUsageDynamicDraw;
+       m_faking_map = false;
+       m_name = "Unnamed Buffer";

        SetUsage(BufferUsageStaticDraw);
 }
 
        SetUsage(BufferUsageStaticDraw);
 }
 


@@ -89,6 +92,11 @@ void GraphicsBuffer::SetType(GraphicsBuffer::BufferType bufType)
        m_buffer_type = 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)
 void GraphicsBuffer::SetUsage(GraphicsBuffer::BufferUsage bufUsage)
 {
        if (bufUsage != m_buffer_usage)


@@ -101,26 +109,33 @@ void GraphicsBuffer::SetUsage(GraphicsBuffer::BufferUsage bufUsage)
 void GraphicsBuffer::Invalidate()
 {
        m_invalidated = true;
 void GraphicsBuffer::Invalidate()
 {
        m_invalidated = true;

+       if (!m_buffer_shape_dirty)
+       {
+               // Orphan the block of memory we're pointing to.
+               Upload(m_buffer_size, NULL);
+       }

        // Apparently not supported.
        //glInvalidateBufferData(m_buffer_handle);
 }
 
        // Apparently not supported.
        //glInvalidateBufferData(m_buffer_handle);
 }
 

-void GraphicsBuffer::RecreateBuffer()
+bool GraphicsBuffer::RecreateBuffer(const void *data)

 {
        // If the buffer is not dirty, don't recreate it.
 {
        // If the buffer is not dirty, don't recreate it.

-       if (!m_buffer_shape_dirty) return;
+       if (!m_buffer_shape_dirty) return false;

        // If the buffer is mapped, don't recreate it.
        // If the buffer is mapped, don't recreate it.

-       if (m_map_pointer) return;
+       if (!m_faking_map && m_map_pointer) return false;

        // If the buffer has data in it we need, don't recreate it.
        // If the buffer has data in it we need, don't recreate it.

-       if (!m_invalidated) return;
+       if (!m_invalidated) return false;

        if (m_buffer_handle)
        {
                glDeleteBuffers(1, &m_buffer_handle);
        }
        glGenBuffers(1, &m_buffer_handle);
        if (m_buffer_handle)
        {
                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)
        m_buffer_shape_dirty = false;
        if (m_buffer_size)

-               Upload(m_buffer_size, nullptr);
+               Upload(m_buffer_size, data);
+       return true;

 }
 
 void* GraphicsBuffer::Map(bool read, bool write, bool invalidate)
 }
 
 void* GraphicsBuffer::Map(bool read, bool write, bool invalidate)


@@ -129,11 +144,26 @@ void* GraphicsBuffer::Map(bool read, bool write, bool invalidate)
        GLenum target = BufferTypeToGLType(m_buffer_type);
 
        if (invalidate)
        GLenum target = BufferTypeToGLType(m_buffer_type);
 
        if (invalidate)

-              m_invalidated = true;
+       {
+               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!");    
 
 
        if (m_map_pointer)
                Warn("Tried to map already mapped buffer!");    
 

+
+       if (!read && m_buffer_usage == BufferUsage::BufferUsageStaticDraw)
+       {
+               m_map_pointer = malloc(m_buffer_size);
+               m_faking_map = true;
+               return m_map_pointer;
+       }
+

        RecreateBuffer();
 
        Bind();
        RecreateBuffer();
 
        Bind();


@@ -163,9 +193,24 @@ void GraphicsBuffer::UnMap()
 {
        GLenum target = BufferTypeToGLType(m_buffer_type);
        
 {
        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 = NULL;
+               m_invalidated = false;
+               m_faking_map = false;
+               return;
+       }
+       

        Bind();
        glUnmapBuffer(target);
        Bind();
        glUnmapBuffer(target);

-       m_map_pointer = nullptr;
+       m_map_pointer = NULL;
+       m_invalidated = false;

 }
 
 void GraphicsBuffer::Upload(size_t length, const void* data)
 }
 
 void GraphicsBuffer::Upload(size_t length, const void* data)


@@ -175,11 +220,14 @@ void GraphicsBuffer::Upload(size_t length, const void* data)
        GLenum usage = BufferUsageToGLUsage(m_buffer_usage);
 
        m_invalidated = true;
        GLenum usage = BufferUsageToGLUsage(m_buffer_usage);
 
        m_invalidated = true;

-       RecreateBuffer();
-       
-       Bind();
-       glBufferData(target, length, data, usage);

        m_buffer_size = length;
        m_buffer_size = length;

+       if (!RecreateBuffer(data))
+       {
+               Bind();
+               glBufferData(target, length, data, usage);
+       }
+       if (data != NULL)
+               m_invalidated = false;

 }
 
 void GraphicsBuffer::UploadRange(size_t length, intptr_t offset, const void* data)
 }
 
 void GraphicsBuffer::UploadRange(size_t length, intptr_t offset, const void* data)


@@ -190,6 +238,7 @@ void GraphicsBuffer::UploadRange(size_t length, intptr_t offset, const void* dat
        
        Bind();
        glBufferSubData(target, offset, length, data);
        
        Bind();
        glBufferSubData(target, offset, length, data);

+       m_invalidated = false;

 }
 
 void GraphicsBuffer::Resize(size_t length)
 }
 
 void GraphicsBuffer::Resize(size_t length)


@@ -197,24 +246,26 @@ void GraphicsBuffer::Resize(size_t length)
        if (m_invalidated)
        {
                m_buffer_size = length;
        if (m_invalidated)
        {
                m_buffer_size = length;

-               RecreateBuffer();       

        }
        else
        {
        }
        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);
                // 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;
                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();

        }
 }
 
        }
 }
 

-void GraphicsBuffer::Bind()
+void GraphicsBuffer::Bind() const

 {
        if (m_buffer_type == BufferTypeUniform)
                glBindBufferBase(GL_UNIFORM_BUFFER, 0, m_buffer_handle);
 {
        if (m_buffer_type == BufferTypeUniform)
                glBindBufferBase(GL_UNIFORM_BUFFER, 0, m_buffer_handle);


@@ -222,3 +273,7 @@ void GraphicsBuffer::Bind()
                glBindBuffer(BufferTypeToGLType(m_buffer_type), m_buffer_handle);
 }
 
                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);
+}