[gfx] Implement support for geometry filters and Geometry Filter object

Author: jcelerier

3rdparty/avendish

@@ -785,8 +785,10 @@ struct TSerializer<JSONObject, oscr::ProcessModel<Info>>
           [&obj,
            &indices]<std::size_t Idx, typename P>(avnd::field_reflection<Idx, P> field) {
         if constexpr(avnd::dynamic_ports_port<P>)
-          indices[avnd::get_c_identifier<P>()]
+        {
+          indices[std::string(avnd::get_c_identifier<P>())]
               = obj.dynamic_ports.num_in_ports(avnd::field_index<Idx>{});
+        }
       });
       s.obj["DynamicInlets"] = indices;
     }
@@ -797,7 +799,7 @@ struct TSerializer<JSONObject, oscr::ProcessModel<Info>>
           [&obj,
            &indices]<std::size_t Idx, typename P>(avnd::field_reflection<Idx, P> field) {
         if constexpr(avnd::dynamic_ports_port<P>)
-          indices[avnd::get_c_identifier<P>()]
+          indices[std::string(avnd::get_c_identifier<P>())]
               = obj.dynamic_ports.num_out_ports(avnd::field_index<Idx>{});
       });
       s.obj["DynamicOutlets"] = indices;
@@ -820,7 +822,7 @@ struct TSerializer<JSONObject, oscr::ProcessModel<Info>>
                 avnd::field_reflection<Idx, P> field) {
           if constexpr(avnd::dynamic_ports_port<P>)
             obj.dynamic_ports.num_in_ports(avnd::field_index<Idx>{})
-                = indices[avnd::get_c_identifier<P>()];
+                = indices[std::string(avnd::get_c_identifier<P>())];
         });
       }
     }
@@ -835,7 +837,7 @@ struct TSerializer<JSONObject, oscr::ProcessModel<Info>>
                 avnd::field_reflection<Idx, P> field) {
           if constexpr(avnd::dynamic_ports_port<P>)
             obj.dynamic_ports.num_out_ports(avnd::field_index<Idx>{})
-                = indices[avnd::get_c_identifier<P>()];
+                = indices[std::string(avnd::get_c_identifier<P>())];
         });
       }
     }

3rdparty/libossia

@@ -2,6 +2,8 @@
 
 #include "sajson.h"
 
+#include <boost/algorithm/string.hpp>
+
 #include <array>
 #include <iostream>
 #include <regex>
@@ -72,6 +74,27 @@ layout(std140, binding = 1) uniform process_t {
   vec4 DATE;
 } isf_process_uniforms;
  
+float TIME = isf_process_uniforms.TIME;
+float TIMEDELTA = isf_process_uniforms.TIMEDELTA;
+float PROGRESS = isf_process_uniforms.PROGRESS;
+int PASSINDEX = isf_process_uniforms.PASSINDEX;
+int FRAMEINDEX = isf_process_uniforms.FRAMEINDEX;
+vec4 DATE = isf_process_uniforms.DATE;
+)_";
+
+  static constexpr auto defaultGeometryUniforms = R"_(
+// Time-dependent uniforms, only relevant during execution
+layout(std140, binding = 1) uniform process_t {
+  float TIME;
+  float TIMEDELTA;
+  float PROGRESS;
+
+  int PASSINDEX;
+  int FRAMEINDEX;
+
+  vec4 DATE;
+} isf_process_uniforms;
+ 
 float TIME = isf_process_uniforms.TIME;
 float TIMEDELTA = isf_process_uniforms.TIMEDELTA;
 float PROGRESS = isf_process_uniforms.PROGRESS;
@@ -147,6 +170,12 @@ uniform int PASSINDEX;
 } GLSL3;
 }
 
+parser::parser(std::string geom)
+    : m_source_geometry_filter{std::move(geom)}
+{
+  parse_geometry_filter();
+}
+
 parser::parser(std::string vert, std::string frag, int glslVersion, ShaderType t)
     : m_sourceVertex{std::move(vert)}
     , m_sourceFragment{std::move(frag)}
@@ -198,6 +227,8 @@ parser::parser(std::string vert, std::string frag, int glslVersion, ShaderType t
       parse_glsl_sandbox();
       break;
     }
+    default:
+      break;
   }
 }
 
@@ -216,6 +247,11 @@ std::string parser::fragment() const
   return m_fragment;
 }
 
+std::string parser::geometry_filter() const
+{
+  return m_geometry_filter;
+}
+
 static bool is_number(sajson::value& v)
 {
   auto t = v.get_type();
@@ -612,24 +648,24 @@ struct create_val_visitor_450
   return_type operator()(const audioFFT_input&) { return {"uniform sampler2D", true}; }
 };
 
-void parser::parse_isf()
+std::string parser::parse_isf_header(std::string_view source)
 {
   using namespace std::literals;
 
-  auto start = m_sourceFragment.find("/*");
+  auto start = source.find("/*");
   if(start == std::string::npos)
     throw invalid_file{"Missing start comment"};
-  auto end = m_sourceFragment.find("*/", start);
+  auto end = source.find("*/", start);
   if(end == std::string::npos)
     throw invalid_file{"Unfinished comment"};
-  auto fragWithoutISF = m_sourceFragment;
+  std::string fragWithoutISF = std::string(source);
   fragWithoutISF.erase(0, end + 2);
 
   // First comes the json part
   auto doc = sajson::parse(
       sajson::dynamic_allocation(),
       sajson::mutable_string_view(
-          (end - start - 2), const_cast<char*>(m_sourceFragment.data()) + start + 2));
+          (end - start - 2), const_cast<char*>(source.data()) + start + 2));
   if(!doc.is_valid())
   {
     std::stringstream err;
@@ -658,12 +694,73 @@ void parser::parse_isf()
   }
   m_desc = d;
 
+  return fragWithoutISF;
+}
+
+void parser::parse_geometry_filter()
+{
+  using namespace std::literals;
+
+  auto geomWithoutISF = parse_isf_header(m_source_geometry_filter);
+
   // There is always one pass at least
   if(m_desc.passes.empty())
   {
     m_desc.passes.push_back(isf::pass{});
   }
 
+  boost::algorithm::trim(geomWithoutISF);
+  boost::algorithm::replace_all(geomWithoutISF, "this_filter", "filter_%node%");
+
+  std::string filter_ubo;
+  if(!m_desc.inputs.empty())
+  {
+    std::string globalvars;
+    filter_ubo += "layout(std140, binding = %next%) uniform filter_%node%_t {\n";
+    for(const isf::input& val : m_desc.inputs)
+    {
+      auto [type, isSampler] = ossia::visit(create_val_visitor_450{}, val.data);
+
+      {
+        filter_ubo += "  ";
+        filter_ubo += type;
+        filter_ubo += ' ';
+        filter_ubo += val.name;
+        filter_ubo += ";\n";
+
+        // // See comment above regarding little dance to make spirv-cross happy
+        // globalvars += type;
+        // globalvars += ' ';
+        // globalvars += val.name;
+        // globalvars += " = filter_%node%.";
+        // globalvars += val.name;
+        // globalvars += ";\n";
+      }
+    }
+
+    filter_ubo += "} filter_%node%;\n";
+    filter_ubo += "\n";
+    // filter_ubo += globalvars;
+    // filter_ubo += "\n";
+  }
+  m_geometry_filter
+      = glsl45_t::defaultGeometryUniforms + filter_ubo + geomWithoutISF + "\n";
+}
+
+void parser::parse_isf()
+{
+  using namespace std::literals;
+
+  auto fragWithoutISF = parse_isf_header(m_sourceFragment);
+
+  // There is always one pass at least
+  if(m_desc.passes.empty())
+  {
+    m_desc.passes.push_back(isf::pass{});
+  }
+
+  auto& d = m_desc;
+
   // We start from empty strings.
 
   bool simpleVS = false;

src/plugins/score-plugin-avnd/Crousti/ProcessModel.hpp

@@ -120,10 +120,12 @@ class parser
 {
   std::string m_sourceVertex;
   std::string m_sourceFragment;
+  std::string m_source_geometry_filter;
   int m_version{450};
 
   std::string m_vertex;
   std::string m_fragment;
+  std::string m_geometry_filter;
 
   descriptor m_desc;
 
@@ -133,19 +135,25 @@ class parser
     Autodetect,
     ISF,
     ShaderToy,
-    GLSLSandBox
+    GLSLSandBox,
+    GeometryFilter
   };
   parser(
       std::string vert, std::string frag, int glslVersion = 450,
       ShaderType = ShaderType::Autodetect);
+  explicit parser(std::string isf_geom_filter);
 
   descriptor data() const;
   std::string vertex() const;
   std::string fragment() const;
+  std::string geometry_filter() const;
 
 private:
   void parse_isf();
   void parse_shadertoy();
   void parse_glsl_sandbox();
+  void parse_geometry_filter();
+
+  std::string parse_isf_header(std::string_view source);
 };
 }

src/plugins/score-plugin-gfx/3rdparty/libisf/src/isf.cpp

@@ -74,6 +74,11 @@ set(HDRS
     Gfx/Filter/Library.hpp
     Gfx/Filter/PreviewWidget.hpp
 
+    Gfx/GeometryFilter/Executor.hpp
+    Gfx/GeometryFilter/Metadata.hpp
+    Gfx/GeometryFilter/Process.hpp
+    Gfx/GeometryFilter/Layer.hpp
+
     Gfx/Video/Executor.hpp
     Gfx/Video/Inspector.hpp
     Gfx/Video/Metadata.hpp
@@ -95,6 +100,8 @@ set(HDRS
     Gfx/Graph/CommonUBOs.hpp
     Gfx/Graph/CustomMesh.hpp
     Gfx/Graph/DepthNode.hpp
+    Gfx/Graph/GeometryFilterNode.hpp
+    Gfx/Graph/GeometryFilterNodeRenderer.hpp
     Gfx/Graph/OutputNode.hpp
     Gfx/Graph/Scale.hpp
     Gfx/Graph/Window.hpp
@@ -168,6 +175,9 @@ set(SRCS
     Gfx/Filter/Process.cpp
     Gfx/Filter/PreviewWidget.cpp
 
+    Gfx/GeometryFilter/Executor.cpp
+    Gfx/GeometryFilter/Process.cpp
+
     Gfx/Video/Executor.cpp
     Gfx/Video/Inspector.cpp
     Gfx/Video/Presenter.cpp
@@ -183,6 +193,8 @@ set(SRCS
 
     Gfx/Graph/decoders/GPUVideoDecoder.cpp
     Gfx/Graph/decoders/HAP.cpp
+    Gfx/Graph/GeometryFilterNode.cpp
+    Gfx/Graph/GeometryFilterNodeRenderer.cpp
     Gfx/Graph/Node.cpp
     Gfx/Graph/Graph.cpp
     Gfx/Graph/RenderList.cpp