Merge branch 'master' into pr/1875

2022-05-07 13:37:15 -07:00
parent 09d30c6aee 601d08ce64
commit fdc2d76406
61 changed files with 659 additions and 116 deletions
@@ -665,10 +665,21 @@ public:
   */
  QVector<Node *> GetImmediateDependencies() const;

+  struct ShaderRequest
+  {
+    ShaderRequest(const QString &shader_id)
+    {
+      id = shader_id;
+    }
+
+    QString id;
+    QString stub;
+  };
+
  /**
   * @brief Generate hardware accelerated code for this Node
   */
-  virtual ShaderCode GetShaderCode(const QString& shader_id) const;
+  virtual ShaderCode GetShaderCode(const ShaderRequest &request) const;

  /**
   * @brief If Value() pushes a ShaderJob, this is the function that will process them.