QRenderAttachment renamed to QRenderTargetOutput

As per API review

Change-Id: Icaca9797c01100402e6d103be2a0425820a717ec
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

5 files changed, 16 insertions, 20 deletions

diff --git a/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp b/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp
index f810d4fa1..0c05bfa4f 100644
--- a/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp
@@ -60,15 +60,15 @@ GBuffer::GBuffer(Qt3DCore::QNode *parent)
         Qt3DRender::QAbstractTextureProvider::D32F
     };
 
-    const Qt3DRender::QRenderAttachment::AttachmentPoint attachmentPoints[AttachmentsCount] = {
-        Qt3DRender::QRenderAttachment::ColorAttachment0,
-        Qt3DRender::QRenderAttachment::ColorAttachment1,
-        Qt3DRender::QRenderAttachment::ColorAttachment2,
-        Qt3DRender::QRenderAttachment::DepthAttachment
+    const Qt3DRender::QRenderTargetOutput::AttachmentPoint attachmentPoints[AttachmentsCount] = {
+        Qt3DRender::QRenderTargetOutput::ColorAttachment0,
+        Qt3DRender::QRenderTargetOutput::ColorAttachment1,
+        Qt3DRender::QRenderTargetOutput::ColorAttachment2,
+        Qt3DRender::QRenderTargetOutput::DepthAttachment
     };
 
     for (int i = 0; i < AttachmentsCount; i++) {
-        Qt3DRender::QRenderAttachment *attachment = new Qt3DRender::QRenderAttachment(this);
+        Qt3DRender::QRenderTargetOutput *attachment = new Qt3DRender::QRenderTargetOutput(this);
 
         m_textures[i] = new Qt3DRender::QTexture2D();
         m_textures[i]->setFormat(formats[i]);
diff --git a/examples/qt3d/deferred-renderer-cpp/gbuffer.h b/examples/qt3d/deferred-renderer-cpp/gbuffer.h
index 7762da159..7b79dc5f8 100644
--- a/examples/qt3d/deferred-renderer-cpp/gbuffer.h
+++ b/examples/qt3d/deferred-renderer-cpp/gbuffer.h
@@ -53,7 +53,7 @@
 
 #include <Qt3DRender/QRenderTarget>
 #include <Qt3DRender/qtexture.h>
-#include <Qt3DRender/QRenderAttachment>
+#include <Qt3DRender/QRenderTargetOutput>
 
 class GBuffer : public Qt3DRender::QRenderTarget
 {
@@ -75,7 +75,7 @@ public:
 
 private:
     Qt3DRender::QAbstractTextureProvider *m_textures[AttachmentsCount];
-    Qt3DRender::QRenderAttachment *m_attachments[AttachmentsCount];
+    Qt3DRender::QRenderTargetOutput *m_attachments[AttachmentsCount];
 };
 
 #endif // GBUFFER_H
diff --git a/examples/qt3d/deferred-renderer-qml/GBuffer.qml b/examples/qt3d/deferred-renderer-qml/GBuffer.qml
index 520a821cb..6ed16d9ea 100644
--- a/examples/qt3d/deferred-renderer-qml/GBuffer.qml
+++ b/examples/qt3d/deferred-renderer-qml/GBuffer.qml
@@ -60,10 +60,9 @@ RenderTarget {
 
     attachments : [
 
-        RenderAttachment {
+        RenderTargetOutput {
             objectName : "color"
             attachmentPoint : RenderAttachment.ColorAttachment0
-
             texture : Texture2D {
                 id : colorAttachment
                 width : 1024
@@ -78,10 +77,9 @@ RenderTarget {
                 }
             }
         },
-        RenderAttachment {
+        RenderTargetOutput {
             objectName : "position"
             attachmentPoint : RenderAttachment.ColorAttachment1
-
             texture : Texture2D {
                 id : positionAttachment
                 width : 1024
@@ -98,10 +96,9 @@ RenderTarget {
                 }
             }
         },
-        RenderAttachment {
+        RenderTargetOutput {
             objectName : "normal"
             attachmentPoint : RenderAttachment.ColorAttachment2
-
             texture : Texture2D {
                 id : normalAttachment
                 width : 1024
@@ -118,10 +115,9 @@ RenderTarget {
                 }
             }
         },
-        RenderAttachment {
+        RenderTargetOutput {
             objectName : "depth"
             attachmentPoint : RenderAttachment.DepthAttachment
-
             texture : Texture2D {
                 id : depthAttachment
                 width : 1024
diff --git a/examples/qt3d/planets-qml/PlanetFrameGraph.qml b/examples/qt3d/planets-qml/PlanetFrameGraph.qml
index 8ac0403af..0f20b193b 100644
--- a/examples/qt3d/planets-qml/PlanetFrameGraph.qml
+++ b/examples/qt3d/planets-qml/PlanetFrameGraph.qml
@@ -73,9 +73,9 @@ FrameGraph {
                 RenderTargetSelector {
                     target: RenderTarget {
                         attachments: [
-                            RenderAttachment {
+                            RenderTargetOutput {
                                 name: "depth"
-                                attachmentPoint: RenderAttachment.DepthAttachment
+                                attachmentPoint: RenderTargetOutput.DepthAttachment
                                 texture: Texture2D {
                                     id: depthTexture
                                     width: mainview.width
diff --git a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
index 945bb4457..9c9cb7ab0 100644
--- a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
+++ b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
@@ -69,9 +69,9 @@ FrameGraph {
             RenderTargetSelector {
                 target: RenderTarget {
                     attachments: [
-                        RenderAttachment {
+                        RenderTargetOutput {
                             name: "depth"
-                            attachmentPoint: RenderAttachment.DepthAttachment
+                            attachmentPoint: RenderTargetOutput.DepthAttachment
                             texture: Texture2D {
                                 id: depthTexture
                                 width: 1024