merge changes from acolombier, clear and set owned by parent flag, mo…

…re clear transfer of waveformrendermarknode

src/rendergraph/opengl/CMakeLists.txt

@@ -62,6 +62,17 @@ target_link_libraries(rendergraph_gl PUBLIC
     Qt6::Gui
     Qt6::OpenGL
 )
+find_package(Microsoft.GSL CONFIG)
+if(Microsoft.GSL_FOUND)
+  target_link_libraries(rendergraph_gl PRIVATE Microsoft.GSL::GSL)
+else()
+  # check if the headers have been installed without cmake config (< 3.1.0)
+  check_include_file_cxx(gsl/gsl HAVE_GSL_GSL)
+  if(NOT HAVE_GSL_GSL)
+    unset(HAVE_GSL_GSL CACHE) # unset cache to re-evaluate this until it succeeds. check_include_file_cxx() has no REQUIRED flag.
+    message(FATAL_ERROR "ms-gsl development headers (libmsgsl-dev) not found")
+  endif()
+endif()
 target_compile_definitions(rendergraph_gl PRIVATE rendergraph=rendergraph_gl)
 
 # USE_QSHADER_FOR_GL is set in rendergraph/CMakeLists.txt

src/rendergraph/opengl/engine.cpp

@@ -11,6 +11,8 @@ Engine::Engine(std::unique_ptr<BaseNode> pRootNode)
 }
 
 Engine::~Engine() {
+    // Explicitly remove the root node (and tree from the engine before deallocating its vectors)
+    remove(m_pRootNode.get());
 }
 
 void Engine::add(BaseNode* pNode) {

src/rendergraph/opengl/texture.cpp

@@ -1,20 +1,49 @@
 #include "rendergraph/texture.h"
 
+#include <qnamespace.h>
+#include <qrgb.h>
+
+#include "rendergraph/assert.h"
 #include "rendergraph/context.h"
 
 using namespace rendergraph;
 
 namespace {
 QImage premultiplyAlpha(const QImage& image) {
+    // Since the image is passed by const reference, implicit copy cannot be
+    // used, and this Qimage::bits will return a ref the QImage buffer, which
+    // may have a shorter lifecycle that the texture buffer. In order to
+    // workaround this, and because we cannot copy the image as we need to use
+    // the raw bitmap with an explicit image format, we make a manual copy of
+    // the buffer
+    QImage result(image.width(), image.height(), QImage::Format_RGBA8888);
+    if (image.format() == QImage::Format_RGBA8888_Premultiplied) {
+        VERIFY_OR_DEBUG_ASSERT(result.sizeInBytes() == image.sizeInBytes()) {
+            result.fill(QColor(Qt::transparent).rgba());
+            return result;
+        }
+        std::memcpy(result.bits(), image.bits(), result.sizeInBytes());
+    } else {
+        auto convertedImage = image.convertToFormat(QImage::Format_RGBA8888_Premultiplied);
+        VERIFY_OR_DEBUG_ASSERT(result.sizeInBytes() == convertedImage.sizeInBytes()) {
+            result.fill(QColor(Qt::transparent).rgba());
+            return result;
+        }
+        std::memcpy(result.bits(), convertedImage.bits(), result.sizeInBytes());
+    }
+    return result;
+    /* TODO rendergraph ASK @acolombier to try if the following works as well
+     * (added the .copy())
     if (image.format() == QImage::Format_RGBA8888_Premultiplied) {
-        return QImage(image.bits(), image.width(), image.height(), QImage::Format_RGBA8888);
+        return QImage(image.bits(), image.width(), image.height(), QImage::Format_RGBA8888).copy();
     }
     return QImage(
             image.convertToFormat(QImage::Format_RGBA8888_Premultiplied)
                     .bits(),
             image.width(),
             image.height(),
-            QImage::Format_RGBA8888);
+            QImage::Format_RGBA8888).copy();
+    */
 }
 } // namespace
 

src/rendergraph/scenegraph/CMakeLists.txt

@@ -55,6 +55,17 @@ target_link_libraries(rendergraph_sg PUBLIC
     Qt6::Qml
     Qt6::Quick
 )
+find_package(Microsoft.GSL CONFIG)
+if(Microsoft.GSL_FOUND)
+  target_link_libraries(rendergraph_sg PRIVATE Microsoft.GSL::GSL)
+else()
+  # check if the headers have been installed without cmake config (< 3.1.0)
+  check_include_file_cxx(gsl/gsl HAVE_GSL_GSL)
+  if(NOT HAVE_GSL_GSL)
+    unset(HAVE_GSL_GSL CACHE) # unset cache to re-evaluate this until it succeeds. check_include_file_cxx() has no REQUIRED flag.
+    message(FATAL_ERROR "ms-gsl development headers (libmsgsl-dev) not found")
+  endif()
+endif()
 target_compile_definitions(rendergraph_sg PRIVATE rendergraph=rendergraph_sg)
 
 target_include_directories(rendergraph_sg PUBLIC . ../common)

src/rendergraph/scenegraph/context.cpp

@@ -2,10 +2,10 @@
 
 using namespace rendergraph;
 
-Context::Context(QQuickWindow* pWindow)
+Context::Context(gsl::not_null<QQuickWindow*> pWindow)
         : m_pWindow(pWindow) {
 }
 
-QQuickWindow* Context::window() const {
+gsl::not_null<QQuickWindow*> Context::window() const {
     return m_pWindow;
 }

src/rendergraph/scenegraph/rendergraph/context.h

@@ -1,15 +1,16 @@
 #pragma once
 
 #include <QQuickWindow>
+#include <gsl/pointers>
 
 namespace rendergraph {
 class Context;
 }
 
 class rendergraph::Context {
   public:
-    Context(QQuickWindow* pWindow);
-    QQuickWindow* window() const;
+    Context(gsl::not_null<QQuickWindow*> pWindow);
+    gsl::not_null<QQuickWindow*> window() const;
 
   private:
     QQuickWindow* m_pWindow;

src/rendergraph/scenegraph/rendergraph/nodeinterface.h

@@ -0,0 +1,26 @@
+#pragma once
+
+#include "backend/basenode.h"
+#include "rendergraph/assert.h"
+
+namespace rendergraph {
+
+template<class T_Node>
+class NodeInterface : public T_Node {
+  public:
+    void appendChildNode(std::unique_ptr<BaseNode> pNode) {
+        BaseNode* pRawNode = pNode.release();
+        pRawNode->setFlag(QSNode::OwnedByParent, true);
+        T_Node::appendChildNode(pRawNode);
+        DEBUG_ASSERT(pNode->flags() & QSNode::OwnedByParent);
+    }
+    std::unique_ptr<BaseNode> detachChildNode(BaseNode* pNode) {
+        DEBUG_ASSERT(pNode->flags() & QSNode::OwnedByParent);
+        pNode->setFlag(QSNode::OwnedByParent, false);
+        T_Node::removeChildNode(pNode);
+        DEBUG_ASSERT(!pNode->flags() & QSNode::OwnedByParent);
+        return std::unique_ptr<BaseNode>(pNode);
+    }
+};
+
+} // namespace rendergraph