diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2015-12-08 11:56:35 +0100 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2016-01-13 14:02:41 +0000 |
commit | 45e8d67176b37c56c0403590a5f721e980101148 (patch) | |
tree | 065629a913b2b78ac808af51dc5ddefda0ce594e | |
parent | 5c89a2c7e43f930758b207acb0e89cd7477c4f60 (diff) |
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>
-rw-r--r-- | src/render/backend/managers_p.h | 6 | ||||
-rw-r--r-- | src/render/backend/nodemanagers.cpp | 6 | ||||
-rw-r--r-- | src/render/backend/nodemanagers_p.h | 10 | ||||
-rw-r--r-- | src/render/backend/renderview.cpp | 4 | ||||
-rw-r--r-- | src/render/graphicshelpers/graphicscontext.cpp | 4 | ||||
-rw-r--r-- | src/render/io/glbuffer.cpp (renamed from src/render/io/uniformbuffer.cpp) | 18 | ||||
-rw-r--r-- | src/render/io/glbuffer_p.h (renamed from src/render/io/uniformbuffer_p.h) | 10 | ||||
-rw-r--r-- | src/render/io/io.pri | 8 | ||||
-rw-r--r-- | src/render/materialsystem/shaderdata.cpp | 2 | ||||
-rw-r--r-- | src/render/materialsystem/shaderdata_p.h | 2 |
10 files changed, 35 insertions, 35 deletions
diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h index ca2d3e264..5df8345d0 100644 --- a/src/render/backend/managers_p.h +++ b/src/render/backend/managers_p.h @@ -66,7 +66,7 @@ #include <Qt3DRender/private/parameter_p.h> #include <Qt3DRender/private/shaderdata_p.h> #include <Qt3DRender/private/handle_types_p.h> -#include <Qt3DRender/private/uniformbuffer_p.h> +#include <Qt3DRender/private/glbuffer_p.h> #include <Qt3DRender/private/textureimage_p.h> #include <Qt3DRender/private/attribute_p.h> #include <Qt3DRender/private/geometry_p.h> @@ -281,8 +281,8 @@ public: ShaderDataManager() {} }; -class UBOManager : public Qt3DCore::QResourceManager< - UniformBuffer, +class GLBufferManager : public Qt3DCore::QResourceManager< + GLBuffer, ShaderDataShaderUboKey, 16, Qt3DCore::ArrayAllocatingPolicy, diff --git a/src/render/backend/nodemanagers.cpp b/src/render/backend/nodemanagers.cpp index 578cd1c82..fca3d1198 100644 --- a/src/render/backend/nodemanagers.cpp +++ b/src/render/backend/nodemanagers.cpp @@ -72,7 +72,7 @@ NodeManagers::NodeManagers() , m_sortCriterionManager(new SortCriterionManager()) , m_parameterManager(new ParameterManager()) , m_shaderDataManager(new ShaderDataManager()) - , m_uboManager(new UBOManager()) + , m_glBufferManager(new GLBufferManager()) , m_textureImageManager(new TextureImageManager()) , m_bufferManager(new BufferManager()) , m_attributeManager(new AttributeManager()) @@ -211,9 +211,9 @@ ShaderDataManager *NodeManagers::manager<ShaderData>() const Q_DECL_NOEXCEPT } template<> -UBOManager *NodeManagers::manager<UniformBuffer>() const Q_DECL_NOEXCEPT +GLBufferManager *NodeManagers::manager<GLBuffer>() const Q_DECL_NOEXCEPT { - return m_uboManager; + return m_glBufferManager; } template<> diff --git a/src/render/backend/nodemanagers_p.h b/src/render/backend/nodemanagers_p.h index 9fb4074e1..092a40156 100644 --- a/src/render/backend/nodemanagers_p.h +++ b/src/render/backend/nodemanagers_p.h @@ -83,7 +83,7 @@ class AttachmentManager; class SortCriterionManager; class ParameterManager; class ShaderDataManager; -class UBOManager; +class GLBufferManager; class TextureImageManager; class CriterionManager; class FrameGraphManager; @@ -113,7 +113,7 @@ class RenderTarget; class ShaderData; class SortCriterion; class Parameter; -class UniformBuffer; +class GLBuffer; class TextureImage; class Buffer; class Attribute; @@ -183,7 +183,7 @@ public: inline SortCriterionManager *sortCriterionManager() const Q_DECL_NOEXCEPT { return m_sortCriterionManager; } inline ParameterManager *parameterManager() const Q_DECL_NOEXCEPT { return m_parameterManager; } inline ShaderDataManager *shaderDataManager() const Q_DECL_NOEXCEPT { return m_shaderDataManager; } - inline UBOManager *uboManager() const Q_DECL_NOEXCEPT { return m_uboManager; } + inline GLBufferManager *glBufferManager() const Q_DECL_NOEXCEPT { return m_glBufferManager; } inline TextureImageManager *textureImageManager() const Q_DECL_NOEXCEPT { return m_textureImageManager; } inline BufferManager *bufferManager() const Q_DECL_NOEXCEPT { return m_bufferManager; } inline AttributeManager *attributeManager() const Q_DECL_NOEXCEPT { return m_attributeManager; } @@ -215,7 +215,7 @@ private: SortCriterionManager *m_sortCriterionManager; ParameterManager *m_parameterManager; ShaderDataManager *m_shaderDataManager; - UBOManager *m_uboManager; + GLBufferManager *m_glBufferManager; TextureImageManager *m_textureImageManager; BufferManager *m_bufferManager; AttributeManager *m_attributeManager; @@ -292,7 +292,7 @@ template<> QT3DRENDERSHARED_PRIVATE_EXPORT ShaderDataManager *NodeManagers::manager<ShaderData>() const Q_DECL_NOEXCEPT; template<> -QT3DRENDERSHARED_PRIVATE_EXPORT UBOManager *NodeManagers::manager<UniformBuffer>() const Q_DECL_NOEXCEPT; +QT3DRENDERSHARED_PRIVATE_EXPORT GLBufferManager *NodeManagers::manager<GLBuffer>() const Q_DECL_NOEXCEPT; template<> QT3DRENDERSHARED_PRIVATE_EXPORT TextureImageManager *NodeManagers::manager<TextureImage>() const Q_DECL_NOEXCEPT; diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp index c9f5c9a27..7d9434a01 100644 --- a/src/render/backend/renderview.cpp +++ b/src/render/backend/renderview.cpp @@ -582,8 +582,8 @@ void RenderView::setUniformBlockValue(QUniformPack &uniformPack, Shader *shader, bool uboNeedsUpdate = false; // build UBO at uboId if not created before - if (!m_manager->uboManager()->contains(uboKey)) { - m_manager->uboManager()->getOrCreateResource(uboKey); + if (!m_manager->glBufferManager()->contains(uboKey)) { + m_manager->glBufferManager()->getOrCreateResource(uboKey); uboNeedsUpdate = true; } diff --git a/src/render/graphicshelpers/graphicscontext.cpp b/src/render/graphicshelpers/graphicscontext.cpp index 8dc27f80a..dada9e8b8 100644 --- a/src/render/graphicshelpers/graphicscontext.cpp +++ b/src/render/graphicshelpers/graphicscontext.cpp @@ -889,12 +889,12 @@ void GraphicsContext::setUniforms(QUniformPack &uniforms) // Bind UniformBlocks to UBO and update UBO from ShaderData const QVector<BlockToUBO> &blockToUbos = uniforms.uniformBuffers(); - UniformBuffer *ubo = Q_NULLPTR; + GLBuffer *ubo = Q_NULLPTR; bool needsToUnbindUBO = false; for (int i = 0; i < blockToUbos.length(); ++i) { const ShaderUniformBlock &block = m_activeShader->uniformBlock(blockToUbos[i].m_blockIndex); if (block.m_index != -1 && block.m_size > 0) { - ubo = manager->lookupResource<UniformBuffer, UBOManager>(ShaderDataShaderUboKey(blockToUbos[i].m_shaderDataID, + ubo = manager->lookupResource<GLBuffer, GLBufferManager>(ShaderDataShaderUboKey(blockToUbos[i].m_shaderDataID, m_activeShader->peerUuid())); // bind Uniform Block of index ubos[i].m_index to binding point i bindUniformBlock(m_activeShader->getOrCreateProgram(this)->programId(), block.m_index, i); 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 diff --git a/src/render/materialsystem/shaderdata.cpp b/src/render/materialsystem/shaderdata.cpp index 9e07c5810..96e15bd3b 100644 --- a/src/render/materialsystem/shaderdata.cpp +++ b/src/render/materialsystem/shaderdata.cpp @@ -42,7 +42,7 @@ #include <Qt3DCore/qscenepropertychange.h> #include <private/graphicscontext_p.h> #include <private/qbackendnode_p.h> -#include <private/uniformbuffer_p.h> +#include <private/glbuffer_p.h> #include <private/managers_p.h> #include <private/nodemanagers_p.h> diff --git a/src/render/materialsystem/shaderdata_p.h b/src/render/materialsystem/shaderdata_p.h index d87ae8644..d4cdecf9e 100644 --- a/src/render/materialsystem/shaderdata_p.h +++ b/src/render/materialsystem/shaderdata_p.h @@ -61,7 +61,7 @@ namespace Qt3DRender { namespace Render { class GraphicsContext; -class UniformBuffer; +class GLBuffer; class NodeManagers; class Q_AUTOTEST_EXPORT ShaderData : public Qt3DCore::QBackendNode |