Trying to fix invalid descriptorlayout

2020-10-03 11:00:10 +02:00
parent 79388bf41a
commit ceee96b462
69 changed files with 1087 additions and 393 deletions
@@ -14,11 +14,9 @@ public:
    ~MaterialInstance();
    virtual void save() override;
    virtual void load() override;
-    virtual PMaterial getRenderMaterial();
-    PMaterial getBaseMaterial() const;
-    Gfx::PDescriptorSet getDescriptor();
+    virtual const Material* getRenderMaterial() const;
 private:
-    PMaterial baseMaterial;
+    Material* baseMaterial;
 };
 DEFINE_REF(MaterialInstance);
 } // namespace Seele