also use rendergraph::Engine in scenegraph to initialize and resize n…

…odes, add GeometryNode::markDirtyGeometry() and GeometryNode::markDirtyMaterial()

CMakeLists.txt

@@ -3811,6 +3811,7 @@ endif()
 add_subdirectory(src/rendergraph/opengl)
 add_subdirectory(res/shaders/rendergraph)
 target_link_libraries(mixxx-lib PUBLIC rendergraph_gl)
+target_compile_definitions(mixxx-lib PRIVATE rendergraph=rendergraph_gl)
 
 # WavPack audio file support
 find_package(wavpack)

src/rendergraph/common/engine.cpp

@@ -0,0 +1,16 @@
+#include "rendergraph/engine.h"
+
+#include <cassert>
+
+#include "rendergraph/node.h"
+
+using namespace rendergraph;
+
+Engine::Engine(std::unique_ptr<TreeNode> pNode)
+        : m_pTopNode(std::move(pNode)) {
+    addToEngine(m_pTopNode.get());
+}
+
+void Engine::resize(int w, int h) {
+    resize(m_pTopNode.get(), w, h);
+}

src/rendergraph/common/rendergraph/geometrynode.h

@@ -29,6 +29,9 @@ class rendergraph::GeometryNode : public rendergraph::BaseGeometryNode,
     Geometry& geometry() const;
     Material& material() const;
 
+    void markDirtyGeometry();
+    void markDirtyMaterial();
+
   private:
     std::unique_ptr<Material> m_pMaterial;
     std::unique_ptr<Geometry> m_pGeometry;

src/rendergraph/common/rendergraph/treenode.h

@@ -5,6 +5,7 @@
 #include "backend/basenode.h"
 
 namespace rendergraph {
+class Engine; // fwd decl to avoid circular dependency
 class TreeNode;
 } // namespace rendergraph
 
@@ -55,11 +56,19 @@ class rendergraph::TreeNode {
     virtual void resize(int, int) {
     }
 
+    void setEngine(Engine* pEngine) {
+        m_pEngine = pEngine;
+    }
+    Engine* engine() const {
+        return m_pEngine;
+    }
+
   private:
     void onAppendChildNode(TreeNode* pChild);
     void onRemoveAllChildNodes();
     void onRemoveChildNode(TreeNode* pChild);
 
+    Engine* m_pEngine{};
     rendergraph::BaseNode* m_pBackendNode;
     TreeNode* m_pParent{};
     std::unique_ptr<TreeNode> m_pFirstChild;

src/rendergraph/examples/gl_example/window.cpp

@@ -2,6 +2,7 @@
 
 #include "examplenodes.h"
 #include "rendergraph/context.h"
+#include "rendergraph/engine.h"
 
 Window::Window() {
 }

src/rendergraph/examples/sg_example/customitem.cpp

@@ -8,6 +8,7 @@
 
 #include "examplenodes.h"
 #include "rendergraph/context.h"
+#include "rendergraph/engine.h"
 #include "rendergraph/node.h"
 
 CustomItem::CustomItem(QQuickItem* parent)
@@ -31,8 +32,12 @@ QSGNode* CustomItem::updatePaintNode(QSGNode* node, UpdatePaintNodeData*) {
         bgNode->setRect(boundingRect());
 
         rendergraph::Context context(window());
-        m_node = std::make_unique<rendergraph::ExampleTopNode>(context);
-        bgNode->appendChildNode(m_node->backendNode());
+
+        auto pTopNode = std::make_unique<rendergraph::ExampleTopNode>(context);
+        bgNode->appendChildNode(pTopNode->backendNode());
+
+        m_pEngine = std::make_unique<rendergraph::Engine>(std::move(pTopNode));
+        m_pEngine->initialize();
 
         node = bgNode;
     } else {
@@ -41,6 +46,7 @@ QSGNode* CustomItem::updatePaintNode(QSGNode* node, UpdatePaintNodeData*) {
 
     if (m_geometryChanged) {
         bgNode->setRect(boundingRect());
+        m_pEngine->resize(boundingRect().width(), boundingRect().height());
         m_geometryChanged = false;
     }
 

src/rendergraph/examples/sg_example/customitem.h

@@ -5,6 +5,7 @@
 
 namespace rendergraph {
 class Node;
+class Engine;
 }
 
 class CustomItem : public QQuickItem {
@@ -20,7 +21,7 @@ class CustomItem : public QQuickItem {
     void geometryChange(const QRectF& newGeometry, const QRectF& oldGeometry) override;
 
     bool m_geometryChanged{};
-    std::unique_ptr<rendergraph::Node> m_node;
+    std::unique_ptr<rendergraph::Engine> m_pEngine;
 };
 
 #endif // CUSTOMITEM_H

src/rendergraph/opengl/CMakeLists.txt

@@ -1,10 +1,10 @@
 add_library(rendergraph_gl
-../common/treenode.cpp
+../common/engine.cpp
 ../common/node.cpp
 ../common/opacitynode.cpp
 ../common/rendergraph/attributeinit.h
 ../common/rendergraph/attributeset.h
-../common/rendergraph/treenode.h
+../common/rendergraph/engine.h
 ../common/rendergraph/geometry.h
 ../common/rendergraph/geometrynode.h
 ../common/rendergraph/material.h
@@ -25,13 +25,16 @@ add_library(rendergraph_gl
 ../common/rendergraph/node.h
 ../common/rendergraph/opacitynode.h
 ../common/rendergraph/texture.h
+../common/rendergraph/treenode.h
 ../common/rendergraph/types.h
 ../common/rendergraph/uniform.h
 ../common/rendergraph/uniformscache.cpp
 ../common/rendergraph/uniformscache.h
 ../common/rendergraph/uniformset.cpp
 ../common/rendergraph/uniformset.h
+../common/treenode.cpp
 ../common/types.cpp
+attributeset.cpp
 backend/baseattributeset.cpp
 backend/baseattributeset.h
 backend/basegeometry.cpp
@@ -46,20 +49,18 @@ backend/basenode.h
 backend/baseopacitynode.h
 backend/baseopenglnode.cpp
 backend/baseopenglnode.h
-backend/shadercache.h
 backend/basetexture.h
-attributeset.cpp
-treenode.cpp
+backend/shadercache.h
 engine.cpp
 geometry.cpp
 geometrynode.cpp
 material.cpp
 materialshader.cpp
 openglnode.cpp
 rendergraph/context.h
-rendergraph/engine.h
 rendergraph/openglnode.h
 texture.cpp
+treenode.cpp
 )
 
 target_link_libraries(rendergraph_gl PUBLIC

src/rendergraph/opengl/backend/basenode.h

@@ -1,9 +1,5 @@
 #pragma once
 
-namespace rendergraph {
-class Engine; // fwd decl to avoid circular dependency
-}
-
 namespace rendergraph {
 class BaseNode;
 }
@@ -31,14 +27,6 @@ class rendergraph::BaseNode {
     virtual void resizeBackend(int, int) {
     }
 
-    void setEngine(Engine* pEngine) {
-        m_pEngine = pEngine;
-    }
-    Engine* engine() const {
-        return m_pEngine;
-    }
-
   private:
     bool m_usePreprocess{};
-    Engine* m_pEngine{};
 };

src/rendergraph/opengl/engine.cpp

@@ -1,22 +1,23 @@
 #include "rendergraph/engine.h"
-
 #include <cassert>
 
-#include "rendergraph/node.h"
-
 using namespace rendergraph;
 
-Engine::Engine(std::unique_ptr<TreeNode> pNode)
-        : m_pTopNode(std::move(pNode)) {
-    addToEngine(m_pTopNode.get());
-}
+void Engine::addToEngine(TreeNode* pNode) {
+    assert(pNode->engine() == nullptr);
 
-void Engine::initialize() {
-    for (auto pNode : m_pInitializeNodes) {
-        pNode->backendNode()->initializeBackend();
-        pNode->initialize();
+    pNode->setEngine(this);
+    m_pInitializeNodes.push_back(pNode);
+    if (pNode->backendNode()->usePreprocess()) {
+        m_pPreprocessNodes.push_back(pNode);
+    }
+    pNode = pNode->firstChild();
+    while (pNode) {
+        if (pNode->engine() != this) {
+            addToEngine(pNode);
+        }
+        pNode = pNode->nextSibling();
     }
-    m_pInitializeNodes.clear();
 }
 
 void Engine::render() {
@@ -28,8 +29,15 @@ void Engine::render() {
     }
 }
 
-void Engine::resize(int w, int h) {
-    resize(m_pTopNode.get(), w, h);
+void Engine::render(TreeNode* pNode) {
+    pNode->backendNode()->renderBackend();
+    pNode = pNode->firstChild();
+    while (pNode) {
+        if (!pNode->backendNode()->isSubtreeBlocked()) {
+            render(pNode);
+        }
+        pNode = pNode->nextSibling();
+    }
 }
 
 void Engine::preprocess() {
@@ -40,15 +48,12 @@ void Engine::preprocess() {
     }
 }
 
-void Engine::render(TreeNode* pNode) {
-    pNode->backendNode()->renderBackend();
-    pNode = pNode->firstChild();
-    while (pNode) {
-        if (!pNode->backendNode()->isSubtreeBlocked()) {
-            render(pNode);
-        }
-        pNode = pNode->nextSibling();
+void Engine::initialize() {
+    for (auto pNode : m_pInitializeNodes) {
+        pNode->backendNode()->initializeBackend();
+        pNode->initialize();
     }
+    m_pInitializeNodes.clear();
 }
 
 void Engine::resize(TreeNode* pNode, int w, int h) {
@@ -60,20 +65,3 @@ void Engine::resize(TreeNode* pNode, int w, int h) {
         pNode = pNode->nextSibling();
     }
 }
-
-void Engine::addToEngine(TreeNode* pNode) {
-    assert(pNode->backendNode()->engine() == nullptr);
-
-    pNode->backendNode()->setEngine(this);
-    m_pInitializeNodes.push_back(pNode);
-    if (pNode->backendNode()->usePreprocess()) {
-        m_pPreprocessNodes.push_back(pNode);
-    }
-    pNode = pNode->firstChild();
-    while (pNode) {
-        if (pNode->backendNode()->engine() != this) {
-            addToEngine(pNode);
-        }
-        pNode = pNode->nextSibling();
-    }
-}

src/rendergraph/opengl/geometrynode.cpp

@@ -21,3 +21,11 @@ Geometry& GeometryNode::geometry() const {
 Material& GeometryNode::material() const {
     return *m_pMaterial;
 }
+
+void GeometryNode::markDirtyGeometry() {
+    // not (yet) needed for opengl
+}
+
+void GeometryNode::markDirtyMaterial() {
+    // not (yet) needed for opengl
+}

src/rendergraph/opengl/treenode.cpp

@@ -9,9 +9,9 @@ void TreeNode::setUsePreprocess(bool value) {
 }
 
 void TreeNode::onAppendChildNode(TreeNode* pChild) {
-    if (backendNode()->engine() != nullptr &&
-            backendNode()->engine() != pChild->backendNode()->engine()) {
-        backendNode()->engine()->addToEngine(pChild);
+    if (engine() != nullptr &&
+            engine() != pChild->engine()) {
+        engine()->addToEngine(pChild);
     }
 }
 

src/rendergraph/scenegraph/CMakeLists.txt

@@ -1,10 +1,10 @@
 add_library(rendergraph_sg
-../common/treenode.cpp
+../common/engine.cpp
 ../common/node.cpp
 ../common/opacitynode.cpp
 ../common/rendergraph/attributeinit.h
 ../common/rendergraph/attributeset.h
-../common/rendergraph/treenode.h
+../common/rendergraph/engine.h
 ../common/rendergraph/geometry.h
 ../common/rendergraph/geometrynode.h
 ../common/rendergraph/material.h
@@ -25,13 +25,16 @@ add_library(rendergraph_sg
 ../common/rendergraph/node.h
 ../common/rendergraph/opacitynode.h
 ../common/rendergraph/texture.h
+../common/rendergraph/treenode.h
 ../common/rendergraph/types.h
 ../common/rendergraph/uniform.h
 ../common/rendergraph/uniformscache.cpp
 ../common/rendergraph/uniformscache.h
 ../common/rendergraph/uniformset.cpp
 ../common/rendergraph/uniformset.h
+../common/treenode.cpp
 ../common/types.cpp
+attributeset.cpp
 backend/baseattributeset.cpp
 backend/baseattributeset.h
 backend/basegeometry.h
@@ -43,15 +46,15 @@ backend/basematerialtype.h
 backend/basenode.h
 backend/baseopacitynode.h
 backend/basetexture.h
-attributeset.cpp
-treenode.cpp
 context.cpp
+engine.cpp
 geometry.cpp
 geometrynode.cpp
 material.cpp
 materialshader.cpp
 rendergraph/context.h
 texture.cpp
+treenode.cpp
 )
 
 target_link_libraries(rendergraph_sg PUBLIC