Check for GL object leaks at termination.

src/OpenGL/common/Object.cpp

@@ -19,15 +19,27 @@
 
 namespace gl
 {
+#ifndef NDEBUG
+std::set<Object*> Object::instances;
+#endif
 
 Object::Object()
 {
 	referenceCount = 0;
+
+	#ifndef NDEBUG
+		instances.insert(this);
+	#endif
 }
 
 Object::~Object()
 {
     ASSERT(referenceCount == 0);
+
+	#ifndef NDEBUG
+		ASSERT(instances.find(this) != instances.end());   // Check for double deletion
+		instances.erase(this);
+	#endif
 }
 
 void Object::addRef()
@@ -58,4 +70,16 @@ NamedObject::~NamedObject()
 {
 }
 
+#ifndef NDEBUG
+struct ObjectLeakCheck
+{
+	~ObjectLeakCheck()
+	{
+		ASSERT(Object::instances.empty());   // Check for GL object leak at termination
+	}
+};
+
+static ObjectLeakCheck objectLeakCheck;
+#endif
+
 }

src/OpenGL/common/Object.hpp

@@ -18,6 +18,8 @@
 
 #include "common/debug.h"
 
+#include <set>
+
 typedef unsigned int GLuint;
 
 namespace gl
@@ -34,6 +36,11 @@ public:
 
 private:
     volatile int referenceCount;
+
+#ifndef NDEBUG
+public:
+	static std::set<Object*> instances;   // For leak checking
+#endif
 };
 
 class NamedObject : public Object