summaryrefslogtreecommitdiffstats
path: root/src/render/defaults
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2016-03-16 22:41:28 +0000
committerSean Harmer <sean.harmer@kdab.com>2016-03-20 18:52:47 +0000
commitf837692f5b8579125335624ea7228a4edb5897b5 (patch)
tree43959de808fe9c13cee9d229b4b3c1254ca47375 /src/render/defaults
parentad5fe1d0469edb2a250640a2e13c8cf97b07d870 (diff)
Rename QClearBuffer to QClearBuffers
Task-number: QTBUG-51460 Change-Id: I3f522f5eaea7bf0f94dbcdc1e7463f2827c0fe3b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/defaults')
-rw-r--r--src/render/defaults/qforwardrenderer.cpp8
-rw-r--r--src/render/defaults/qforwardrenderer_p.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/render/defaults/qforwardrenderer.cpp b/src/render/defaults/qforwardrenderer.cpp
index cfd68f3dc..3a652f817 100644
--- a/src/render/defaults/qforwardrenderer.cpp
+++ b/src/render/defaults/qforwardrenderer.cpp
@@ -42,7 +42,7 @@
#include <Qt3DRender/qviewport.h>
#include <Qt3DRender/qcameraselector.h>
-#include <Qt3DRender/qclearbuffer.h>
+#include <Qt3DRender/qclearbuffers.h>
#include <Qt3DRender/qfilterkey.h>
#include <Qt3DRender/qfrustumculling.h>
#include <Qt3DRender/qrendersurfaceselector.h>
@@ -56,7 +56,7 @@ QForwardRendererPrivate::QForwardRendererPrivate()
, m_surfaceSelector(new QRenderSurfaceSelector)
, m_viewport(new QViewport())
, m_cameraSelector(new QCameraSelector())
- , m_clearBuffer(new QClearBuffer())
+ , m_clearBuffer(new QClearBuffers())
, m_frustumCulling(new QFrustumCulling())
{
}
@@ -73,7 +73,7 @@ void QForwardRendererPrivate::init()
m_viewport->setNormalizedRect(QRectF(0.0f, 0.0f, 1.0f, 1.0f));
m_viewport->setClearColor(Qt::white);
- m_clearBuffer->setBuffers(QClearBuffer::ColorDepthBuffer);
+ m_clearBuffer->setBuffers(QClearBuffers::ColorDepthBuffer);
QFilterKey *forwardRenderingStyle = new QFilterKey(q);
forwardRenderingStyle->setName(QStringLiteral("renderingStyle"));
@@ -92,7 +92,7 @@ void QForwardRendererPrivate::init()
Internally the Qt3DRender::QForwardRenderer is a subclass of Qt3DRender::QTechniqueFilter.
This a is a single leaf Framegraph tree which contains a Qt3DRender::QViewport, a Qt3DRender::QCameraSelector
- and a Qt3DRender::QClearBuffer.
+ and a Qt3DRender::QClearBuffers.
The Qt3DRender::QForwardRenderer has a default requirement annotation whose name is "renderingStyle" and value "forward".
If you need to filter out your techniques, you should do so based on that annotation.
diff --git a/src/render/defaults/qforwardrenderer_p.h b/src/render/defaults/qforwardrenderer_p.h
index 387ce655b..5e5e6f696 100644
--- a/src/render/defaults/qforwardrenderer_p.h
+++ b/src/render/defaults/qforwardrenderer_p.h
@@ -59,7 +59,7 @@ namespace Qt3DRender {
class QForwardRenderer;
class QViewport;
-class QClearBuffer;
+class QClearBuffers;
class QCameraSelector;
class QFrustumCulling;
class QRenderSurfaceSelector;
@@ -72,7 +72,7 @@ public:
QRenderSurfaceSelector *m_surfaceSelector;
QViewport *m_viewport;
QCameraSelector *m_cameraSelector;
- QClearBuffer *m_clearBuffer;
+ QClearBuffers *m_clearBuffer;
QFrustumCulling *m_frustumCulling;
void init();