Merge topic 'rgr_rendertimer'

c51f6a84 Add and use ReleaseGraphicsResources to OGLRenderTimer.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2324

Rendering/OpenGL2/vtkOpenGLFXAAFilter.cxx

@@ -117,6 +117,8 @@ void vtkOpenGLFXAAFilter::Execute(vtkOpenGLRenderer *ren)
 void vtkOpenGLFXAAFilter::ReleaseGraphicsResources()
 {
   this->FreeGLObjects();
+  this->PreparationTimer->ReleaseGraphicsResources();
+  this->FXAATimer->ReleaseGraphicsResources();
 }
 
 //------------------------------------------------------------------------------

Rendering/OpenGL2/vtkOpenGLRenderTimer.cxx

@@ -203,3 +203,9 @@ vtkOpenGLRenderTimer::GetElapsedNanoseconds()
   return 0;
 #endif // NO_TIMESTAMP_QUERIES
 }
+
+//------------------------------------------------------------------------------
+void vtkOpenGLRenderTimer::ReleaseGraphicsResources()
+{
+  this->Reset();
+}

Rendering/OpenGL2/vtkOpenGLRenderTimer.h

@@ -78,6 +78,12 @@ public:
   vtkTypeUInt64 GetElapsedNanoseconds();
   //@}
 
+  /**
+   * Simply calls Reset() to ensure that query ids are freed. All stored timing
+   * information will be lost.
+   */
+  void ReleaseGraphicsResources();
+
 protected:
   bool StartReady;
   bool EndReady;