Rename UniformBuffer to GLBuffer

This class could be reused for any kind of GLBuffer (not just uniform buffer)
so rename it accordingly.

Change-Id: I978696534f64fc3717ac135af94e9fe44aa23fba
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

3 files changed, 18 insertions, 18 deletions

diff --git a/src/render/io/uniformbuffer.cpp b/src/render/io/glbuffer.cpp
index 881d557df..763b21d15 100644
--- a/src/render/io/uniformbuffer.cpp
+++ b/src/render/io/glbuffer.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "uniformbuffer_p.h"
+#include "glbuffer_p.h"
 #include <private/graphicscontext_p.h>
 
 #if !defined(GL_UNIFORM_BUFFER)
@@ -50,50 +50,50 @@ namespace Render {
 // A UBO is created for each ShaderData Shader Pair
 // That means a UBO is unique to a shader/shaderdata
 
-UniformBuffer::UniformBuffer()
+GLBuffer::GLBuffer()
     : m_bufferId(~0)
     , m_isCreated(false)
     , m_bound(false)
 {
 }
 
-void UniformBuffer::bind(GraphicsContext *ctx)
+void GLBuffer::bind(GraphicsContext *ctx)
 {
     ctx->openGLContext()->functions()->glBindBuffer(GL_UNIFORM_BUFFER, m_bufferId);
     m_bound = true;
 }
 
-void UniformBuffer::release(GraphicsContext *ctx)
+void GLBuffer::release(GraphicsContext *ctx)
 {
     m_bound = false;
     ctx->openGLContext()->functions()->glBindBuffer(GL_UNIFORM_BUFFER, 0);
 }
 
-void UniformBuffer::create(GraphicsContext *ctx)
+void GLBuffer::create(GraphicsContext *ctx)
 {
     ctx->openGLContext()->functions()->glGenBuffers(1, &m_bufferId);
     m_isCreated = true;
 }
 
-void UniformBuffer::destroy(GraphicsContext *ctx)
+void GLBuffer::destroy(GraphicsContext *ctx)
 {
     ctx->openGLContext()->functions()->glDeleteBuffers(1, &m_bufferId);
     m_isCreated = false;
 }
 
-void UniformBuffer::allocate(GraphicsContext *ctx, uint size, bool dynamic)
+void GLBuffer::allocate(GraphicsContext *ctx, uint size, bool dynamic)
 {
     // Either GL_STATIC_DRAW OR GL_DYNAMIC_DRAW depending on  the use case
     // TO DO: find a way to know how a buffer/QShaderData will be used to use the right usage
     ctx->openGLContext()->functions()->glBufferData(GL_UNIFORM_BUFFER, size, NULL, dynamic ? GL_DYNAMIC_DRAW : GL_STATIC_DRAW);
 }
 
-void UniformBuffer::update(GraphicsContext *ctx, const void *data, uint size, int offset)
+void GLBuffer::update(GraphicsContext *ctx, const void *data, uint size, int offset)
 {
     ctx->openGLContext()->functions()->glBufferSubData(GL_UNIFORM_BUFFER, offset, size, data);
 }
 
-void UniformBuffer::bindToUniformBlock(GraphicsContext *ctx, int bindingPoint)
+void GLBuffer::bindToUniformBlock(GraphicsContext *ctx, int bindingPoint)
 {
     ctx->bindBufferBase(GL_UNIFORM_BUFFER, bindingPoint, m_bufferId);
 }
diff --git a/src/render/io/uniformbuffer_p.h b/src/render/io/glbuffer_p.h
index e60d30054..ca4798806 100644
--- a/src/render/io/uniformbuffer_p.h
+++ b/src/render/io/glbuffer_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_UNIFORMBUFFER_P_H
-#define QT3DRENDER_RENDER_UNIFORMBUFFER_P_H
+#ifndef QT3DRENDER_RENDER_GLBUFFER_P_H
+#define QT3DRENDER_RENDER_GLBUFFER_P_H
 
 //
 //  W A R N I N G
@@ -61,10 +61,10 @@ class GraphicsContext;
 
 typedef QPair<Qt3DCore::QNodeId, Qt3DCore::QNodeId> ShaderDataShaderUboKey;
 
-class UniformBuffer
+class GLBuffer
 {
 public:
-    UniformBuffer();
+    GLBuffer();
 
     void bind(GraphicsContext *ctx);
     void release(GraphicsContext *ctx);
@@ -90,4 +90,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_UNIFORMBUFFER_P_H
+#endif // QT3DRENDER_RENDER_GLBUFFER_P_H
diff --git a/src/render/io/io.pri b/src/render/io/io.pri
index c2ce822f8..5f8ed6ab2 100644
--- a/src/render/io/io.pri
+++ b/src/render/io/io.pri
@@ -9,10 +9,10 @@ HEADERS += \
     $$PWD/qurlhelper_p.h \
     $$PWD/scene_p.h \
     $$PWD/scenemanager_p.h \
-    $$PWD/uniformbuffer_p.h \
     $$PWD/qsceneparserfactory_p.h \
     $$PWD/qabstractsceneparser.h \
-    $$PWD/qsceneparserplugin.h
+    $$PWD/qsceneparserplugin.h \
+    $$PWD/glbuffer_p.h
 
 SOURCES += \
     $$PWD/objloader.cpp \
@@ -22,7 +22,7 @@ SOURCES += \
     $$PWD/qurlhelper.cpp \
     $$PWD/scene.cpp \
     $$PWD/scenemanager.cpp \
-    $$PWD/uniformbuffer.cpp \
     $$PWD/qabstractsceneparser.cpp \
     $$PWD/qsceneparserplugin.cpp \
-    $$PWD/qsceneparserfactory.cpp
+    $$PWD/qsceneparserfactory.cpp \
+    $$PWD/glbuffer.cpp