fixup

Broke FLAMEGPU_ADVANCED_API whilst cleaning up Tweak CI to build with it enabled? It shouldn't increase time.
FLAMEGPU · Dec 15, 2023 · 5abb665 · 5abb665
1 parent 5a4a57c
commit 5abb665
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/include/flamegpu/runtime/environment/HostEnvironmentDirectedGraph.cuh b/include/flamegpu/runtime/environment/HostEnvironmentDirectedGraph.cuh
@@ -22,11 +22,15 @@ class HostEnvironmentDirectedGraph {
     // So be extra safe with weak ptr
     std::weak_ptr<detail::CUDAEnvironmentDirectedGraphBuffers> directed_graph;
     const cudaStream_t stream;
+#ifdef FLAMEGPU_ADVANCED_API
+    detail::CUDAScatter &scatter;
+    const unsigned int streamID;
+#endif
 
  public:
     class VertexMap;
     class EdgeMap;
-    HostEnvironmentDirectedGraph(std::shared_ptr<detail::CUDAEnvironmentDirectedGraphBuffers>& _directed_graph, cudaStream_t _stream);
+    HostEnvironmentDirectedGraph(std::shared_ptr<detail::CUDAEnvironmentDirectedGraphBuffers>& _directed_graph, cudaStream_t _stream, detail::CUDAScatter& _scatter, unsigned int _streamID);
     // Graph Structure Modifiers
     /**
      * Attempts to import edge and vertex data from the specified file

diff --git a/src/flamegpu/runtime/environment/HostEnvironment.cu b/src/flamegpu/runtime/environment/HostEnvironment.cu
@@ -115,7 +115,7 @@ void HostEnvironment::exportMacroProperty(const std::string& property_name, cons
 HostEnvironmentDirectedGraph HostEnvironment::getDirectedGraph(const std::string& name) const {
     const auto rt = directed_graph_map.find(name);
     if (rt != directed_graph_map.end())
-        return HostEnvironmentDirectedGraph(rt->second, stream);
+        return HostEnvironmentDirectedGraph(rt->second, stream, scatter, streamID);
     THROW exception::InvalidGraphName("Directed Graph with name '%s' was not found, "
         "in HostEnvironment::getDirectedGraph()",
         name.c_str());

diff --git a/src/flamegpu/runtime/environment/HostEnvironmentDirectedGraph.cu b/src/flamegpu/runtime/environment/HostEnvironmentDirectedGraph.cu
@@ -7,9 +7,14 @@
 #include "flamegpu/io/JSONGraphWriter.h"
 
 namespace flamegpu {
-HostEnvironmentDirectedGraph::HostEnvironmentDirectedGraph(std::shared_ptr<detail::CUDAEnvironmentDirectedGraphBuffers>& _directed_graph, const cudaStream_t _stream)
+HostEnvironmentDirectedGraph::HostEnvironmentDirectedGraph(std::shared_ptr<detail::CUDAEnvironmentDirectedGraphBuffers>& _directed_graph, const cudaStream_t _stream,
+    detail::CUDAScatter& _scatter, const unsigned int _streamID)
     : directed_graph(_directed_graph)
     , stream(_stream)
+#ifdef FLAMEGPU_ADVANCED_API
+    , scatter(_scatter)
+    , streamID(_streamID)
+#endif
 { }
 void HostEnvironmentDirectedGraph::importGraph(const std::string& in_file) {
     // Case insensitive ends_with()