X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fgraphicsbuffer.cpp;h=576c2d68668a1a7e1d81c129044452f448bd4e39;hp=82c6a3098eb1d1b029d8900a44bf758270edb704;hb=d2a8386f675fc01216c29e96d35518789b25965b;hpb=ddf7783ce69eb619f5a6b12e779c134279aa2ac6 diff --git a/src/graphicsbuffer.cpp b/src/graphicsbuffer.cpp index 82c6a30..576c2d6 100644 --- a/src/graphicsbuffer.cpp +++ b/src/graphicsbuffer.cpp @@ -36,7 +36,7 @@ static GLenum BufferUsageToGLUsage(GraphicsBuffer::BufferUsage buffer_usage) 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; @@ -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: @@ -66,7 +68,7 @@ static GLenum BufferTypeToGLType(GraphicsBuffer::BufferType buffer_type) GraphicsBuffer::GraphicsBuffer() { m_invalidated = true; - m_map_pointer = nullptr; + m_map_pointer = NULL; m_buffer_size = 0; m_buffer_shape_dirty = true; m_buffer_handle = 0; @@ -104,7 +106,7 @@ void GraphicsBuffer::Invalidate() if (!m_buffer_shape_dirty) { // Orphan the block of memory we're pointing to. - Upload(m_buffer_size, nullptr); + Upload(m_buffer_size, NULL); } // Apparently not supported. //glInvalidateBufferData(m_buffer_handle);