cleanup and moved common rendergraph files to common/rendergraph

Author: m0dB

src/rendergraph/opengl/rendergraph/attribute.h renamed to src/rendergraph/common/rendergraph/attribute.h

@@ -1,5 +1,4 @@
 add_library(rendergraph_gl
-    rendergraph/attribute.h
     rendergraph/attributeset.cpp
     rendergraph/attributeset.h
     rendergraph/context.cpp
@@ -21,12 +20,6 @@ add_library(rendergraph_gl
     rendergraph/texture.cpp
     rendergraph/texture.h
     rendergraph/types.cpp
-    rendergraph/types.h
-    rendergraph/uniform.h
-    rendergraph/uniformscache.cpp
-    rendergraph/uniformscache.h
-    rendergraph/uniformset.cpp
-    rendergraph/uniformset.h
     ../common/rendergraph/material/endoftrackmaterial.cpp
     ../common/rendergraph/material/endoftrackmaterial.h
     ../common/rendergraph/material/patternmaterial.cpp
@@ -39,6 +32,13 @@ add_library(rendergraph_gl
     ../common/rendergraph/material/rgbmaterial.h
     ../common/rendergraph/material/unicolormaterial.cpp
     ../common/rendergraph/material/unicolormaterial.h
+    ../common/rendergraph/attribute.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
     rendergraph/graph.cpp
     rendergraph/graph.h
     rendergraph/openglnode.cpp

src/rendergraph/scenegraph/rendergraph/types.h renamed to src/rendergraph/common/rendergraph/types.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <QVector2D>
+#include <QVector3D>
 #include <memory>
 
 #include "rendergraph/types.h"

src/rendergraph/opengl/rendergraph/uniform.h renamed to src/rendergraph/common/rendergraph/uniform.h

@@ -1,5 +1,4 @@
 add_library(rendergraph_sg
-    rendergraph/attribute.h
     rendergraph/attributeset.cpp
     rendergraph/attributeset.h
     rendergraph/context.cpp
@@ -23,12 +22,6 @@ add_library(rendergraph_sg
     rendergraph/texture.cpp
     rendergraph/texture.h
     rendergraph/types.cpp
-    rendergraph/types.h
-    rendergraph/uniform.h
-    rendergraph/uniformscache.cpp
-    rendergraph/uniformscache.h
-    rendergraph/uniformset.cpp
-    rendergraph/uniformset.h
     rendergraph/scenegraph.cpp
     rendergraph/scenegraph.h
     ../common/rendergraph/material/endoftrackmaterial.cpp
@@ -43,6 +36,13 @@ add_library(rendergraph_sg
     ../common/rendergraph/material/texturematerial.h
     ../common/rendergraph/material/unicolormaterial.cpp
     ../common/rendergraph/material/unicolormaterial.h
+    ../common/rendergraph/attribute.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
 )
 
 target_link_libraries(rendergraph_sg PUBLIC

src/rendergraph/opengl/rendergraph/uniformscache.cpp renamed to src/rendergraph/common/rendergraph/uniformscache.cpp

@@ -53,6 +53,8 @@ class rendergraph::Geometry : public QSGGeometry {
     Geometry(const rendergraph::AttributeSet& attributeSet, int vertexCount);
     ~Geometry();
 
+    void allocate(int vertexCount);
+
     void setAttributeValues(int attributePosition, const float* data, int numTuples);
 
     float* vertexData();
@@ -62,8 +64,6 @@ class rendergraph::Geometry : public QSGGeometry {
         return static_cast<T*>(QSGGeometry::vertexData());
     }
 
-    void allocate(int vertexCount);
-
     DrawingMode drawingMode() const;
     void setDrawingMode(DrawingMode mode);
 

src/rendergraph/opengl/rendergraph/uniformscache.h renamed to src/rendergraph/common/rendergraph/uniformscache.h

@@ -20,6 +20,9 @@ bool Material::updateUniformsByteArray(QByteArray* buf) {
 }
 
 QSGMaterialShader* Material::createShader(QSGRendererInterface::RenderMode) const {
-    auto pShader = createShader().release(); // This leaks
+    // This looks like a leak but it isn't: we pass ownership to Qt. Qt will
+    // cache and reuse the shader for all Material of the same type.
+    // TODO make sure that RenderMode is always the same.
+    auto pShader = createShader().release();
     return pShader;
 }

src/rendergraph/opengl/rendergraph/uniformset.cpp renamed to src/rendergraph/common/rendergraph/uniformset.cpp

@@ -46,6 +46,10 @@ class rendergraph::Material : public QSGMaterial {
 
     QSGMaterialShader* createShader(QSGRendererInterface::RenderMode) const override;
 
+    int compare(const QSGMaterial* other) const override {
+        return compare(dynamic_cast<const Material*>(other));
+    }
+
     bool updateUniformsByteArray(QByteArray* buf);
 
   private: