have managed buffers remove themselves from registry on destruction

Author: nmwsharp

include/polyscope/render/managed_buffer.h

@@ -247,6 +247,7 @@ template <typename T>
 struct ManagedBufferMap {
 public:
   void addManagedBuffer(ManagedBuffer<T>* buffer);
+  void removeManagedBuffer(ManagedBuffer<T>* buffer);
 
   ManagedBuffer<T>& getManagedBuffer(std::string name);
   bool hasManagedBuffer(std::string name);
@@ -281,6 +282,9 @@ class ManagedBufferRegistry {
   template <typename T>
   void addManagedBuffer(ManagedBuffer<T>* buffer);
 
+  template <typename T>
+  void removeManagedBuffer(ManagedBuffer<T>* buffer);
+
   // clang-format off
   ManagedBufferMap<float>        managedBufferMap_float;
   ManagedBufferMap<double>       managedBufferMap_double;

include/polyscope/render/managed_buffer.ipp

@@ -31,6 +31,23 @@ void ManagedBufferMap<T>::addManagedBuffer(ManagedBuffer<T>* buffer) {
 }
 
 
+template <typename T>
+void ManagedBufferRegistry::removeManagedBuffer(ManagedBuffer<T>* buffer) {
+  ManagedBufferMap<T>::getManagedBufferMapRef(this).removeManagedBuffer(buffer);
+}
+
+template <typename T>
+void ManagedBufferMap<T>::removeManagedBuffer(ManagedBuffer<T>* buffer) {
+  for (auto it = allBuffers.begin(); it != allBuffers.end(); ++it) {
+    if ((*it)->name == buffer->name) {
+      allBuffers.erase(it);
+      return;
+    }
+  }
+
+  // if it is not present, this will silently do nothing
+}
+
 template <typename T>
 ManagedBuffer<T>& ManagedBufferMap<T>::getManagedBuffer(std::string name) {
 

src/render/managed_buffer.cpp

@@ -38,7 +38,11 @@ ManagedBuffer<T>::ManagedBuffer(ManagedBufferRegistry* registry_, const std::str
 }
 
 template <typename T>
-ManagedBuffer<T>::~ManagedBuffer() {}
+ManagedBuffer<T>::~ManagedBuffer() {
+  if (registry) {
+    registry->removeManagedBuffer<T>(this);
+  }
+}
 
 template <typename T>
 void ManagedBuffer<T>::checkInvalidValues() {
@@ -47,15 +51,17 @@ void ManagedBuffer<T>::checkInvalidValues() {
 
 template <typename T>
 void ManagedBuffer<T>::setTextureSize(uint32_t sizeX_) {
-  if (deviceBufferType != DeviceBufferType::Attribute) exception("managed buffer can only be set as texture once");
+  if (deviceBufferType != DeviceBufferType::Attribute)
+    exception("managed buffer cannot be resized, texture size can only be set once");
 
   deviceBufferType = DeviceBufferType::Texture1d;
   sizeX = sizeX_;
 }
 
 template <typename T>
 void ManagedBuffer<T>::setTextureSize(uint32_t sizeX_, uint32_t sizeY_) {
-  if (deviceBufferType != DeviceBufferType::Attribute) exception("managed buffer can only be set as texture once");
+  if (deviceBufferType != DeviceBufferType::Attribute)
+    exception("managed buffer cannot be resized, texture size can only be set once");
 
   deviceBufferType = DeviceBufferType::Texture2d;
   sizeX = sizeX_;
@@ -64,7 +70,8 @@ void ManagedBuffer<T>::setTextureSize(uint32_t sizeX_, uint32_t sizeY_) {
 
 template <typename T>
 void ManagedBuffer<T>::setTextureSize(uint32_t sizeX_, uint32_t sizeY_, uint32_t sizeZ_) {
-  if (deviceBufferType != DeviceBufferType::Attribute) exception("managed buffer can only be set as texture once");
+  if (deviceBufferType != DeviceBufferType::Attribute)
+    exception("managed buffer cannot be resized, texture size can only be set once");
 
   deviceBufferType = DeviceBufferType::Texture3d;
   sizeX = sizeX_;