Improved ResourceListeners

Former-commit-id: 8016c23cb75aab94762a1e2838dbbcac2093119b

src/Nazara/Renderer/GLSLProgram.cpp

@@ -520,7 +520,7 @@ bool NzGLSLProgram::SendVector(int location, const NzVector4f& vector)
 	return true;
 }
 
-void NzGLSLProgram::OnResourceCreated(const NzResource* resource, int index)
+bool NzGLSLProgram::OnResourceCreated(const NzResource* resource, int index)
 {
 	NazaraUnused(resource);
 
@@ -530,7 +530,7 @@ void NzGLSLProgram::OnResourceCreated(const NzResource* resource, int index)
 	if (it == m_textures.end())
 	{
 		NazaraInternalError("Invalid index (" + NzString::Number(index) + ')');
-		return;
+		return false;
 	}
 	#endif
 
@@ -540,15 +540,17 @@ void NzGLSLProgram::OnResourceCreated(const NzResource* resource, int index)
 	if (slot.texture != resource)
 	{
 		NazaraInternalError("Wrong texture at location #" + NzString::Number(index));
-		return;
+		return false;
 	}
 	#endif
 
 	slot.enabled = true;
 	slot.updated = false;
+
+	return true;
 }
 
-void NzGLSLProgram::OnResourceDestroy(const NzResource* resource, int index)
+bool NzGLSLProgram::OnResourceDestroy(const NzResource* resource, int index)
 {
 	NazaraUnused(resource);
 
@@ -558,7 +560,7 @@ void NzGLSLProgram::OnResourceDestroy(const NzResource* resource, int index)
 	if (it == m_textures.end())
 	{
 		NazaraInternalError("Invalid index (" + NzString::Number(index) + ')');
-		return;
+		return false;
 	}
 	#endif
 
@@ -568,19 +570,19 @@ void NzGLSLProgram::OnResourceDestroy(const NzResource* resource, int index)
 	if (slot.texture != resource)
 	{
 		NazaraInternalError("Wrong texture at location #" + NzString::Number(index));
-		return;
+		return false;
 	}
 	#endif
 
 	slot.enabled = false;
+
+	return true;
 }
 
 void NzGLSLProgram::OnResourceReleased(const NzResource* resource, int index)
 {
 	if (m_textures.erase(index) == 0)
 		NazaraInternalError("Texture " + NzString::Pointer(resource) + " not found");
-
-	resource->RemoveResourceListener(this);
 }
 
 void NzGLSLProgram::PreLinkage()

src/Nazara/Renderer/GLSLProgram.hpp

@@ -60,8 +60,8 @@ class NzGLSLProgram : public NzAbstractShaderProgram, NzResourceListener
 		bool SendVector(int location, const NzVector4f& vector);
 
 	private:
-		void OnResourceCreated(const NzResource* resource, int index) override;
-		void OnResourceDestroy(const NzResource* resource, int index) override;
+		bool OnResourceCreated(const NzResource* resource, int index) override;
+		bool OnResourceDestroy(const NzResource* resource, int index) override;
 		void OnResourceReleased(const NzResource* resource, int index) override;
 		void PreLinkage();
 		bool PostLinkage();

src/Nazara/Renderer/RenderTexture.cpp

@@ -324,11 +324,12 @@ void NzRenderTexture::Destroy()
 {
 	if (m_impl)
 	{
+		bool canFreeFBO = true;
 		#if NAZARA_RENDERER_SAFE
 		if (NzContext::GetCurrent() != m_impl->context)
 		{
-			NazaraError("RenderTexture can only be used with it's creation context");
-			return;
+			NazaraWarning("RenderTexture should be destroyed by it's creation context, this will cause leaks");
+			canFreeFBO = false;
 		}
 		#endif
 
@@ -339,7 +340,7 @@ void NzRenderTexture::Destroy()
 			if (attachment.isUsed)
 			{
 				if (attachment.isBuffer)
-					glDeleteRenderbuffers(1, &attachment.buffer);
+					glDeleteRenderbuffers(1, &attachment.buffer); // Les Renderbuffers sont partagés entre les contextes: Ne posera pas de problème
 				else
 				{
 					attachment.texture->SetRenderTexture(nullptr);
@@ -348,7 +349,8 @@ void NzRenderTexture::Destroy()
 			}
 		}
 
-		glDeleteFramebuffers(1, &m_impl->fbo);
+		if (canFreeFBO)
+			glDeleteFramebuffers(1, &m_impl->fbo);
 
 		delete m_impl;
 		m_impl = nullptr;
@@ -636,11 +638,15 @@ void NzRenderTexture::Desactivate() const
 	glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
 }
 
-void NzRenderTexture::OnResourceDestroy(const NzResource* resource, int index)
+bool NzRenderTexture::OnResourceDestroy(const NzResource* resource, int index)
 {
 	if (resource == m_impl->context)
-		// Notre context a été détruit, libérons la RenderTexture pour éviter un leak
+	{
+		// Notre contexte va être détruit, libérons la RenderTexture pour éviter un leak
 		Destroy();
+
+		return false;
+	}
 	else
 	{
 		// Sinon, c'est une texture
@@ -652,5 +658,7 @@ void NzRenderTexture::OnResourceDestroy(const NzResource* resource, int index)
 
 		m_impl->checked = false;
 		m_impl->drawBuffersUpdated = false;
+
+		return true;
 	}
 }