Merge pull request #4065 from SunBlack/deprecate_legacy_vtk_opengl_ba…

…ckend [visualization] Deprecate legacy OpenGL backend of VTK
PointCloudLibrary · May 8, 2020 · e647b08 · e647b08
2 parents ff2c07c + 201a20a
commit e647b08
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -424,6 +424,9 @@ if(WITH_VTK AND NOT ANDROID)
       endif()
       if(${VTK_RENDERING_BACKEND} STREQUAL "OpenGL")
         set(VTK_RENDERING_BACKEND_OPENGL_VERSION "1")
+        message(DEPRECATION "The rendering backend OpenGL is deprecated and not available anymore since VTK 8.2."
+                            "Please switch to the OpenGL2 backend instead, which is available since VTK 6.2."
+                            "Support of the deprecated backend will be dropped with PCL 1.13.")
       elseif(${VTK_RENDERING_BACKEND} STREQUAL "OpenGL2")
         set(VTK_RENDERING_BACKEND_OPENGL_VERSION "2")
       endif()

diff --git a/outofcore/tools/outofcore_viewer.cpp b/outofcore/tools/outofcore_viewer.cpp
@@ -56,7 +56,9 @@
 // PCL - visualziation
 //#include <pcl/visualization/pcl_visualizer.h>
 #include <pcl/visualization/common/common.h>
+#if VTK_RENDERING_BACKEND_OPENGL_VERSION < 2
 #include <pcl/visualization/vtk/vtkVertexBufferObjectMapper.h>
+#endif
 
 //#include "vtkVBOPolyDataMapper.h"
 

diff --git a/visualization/include/pcl/visualization/vtk/vtkVertexBufferObject.h b/visualization/include/pcl/visualization/vtk/vtkVertexBufferObject.h
@@ -42,6 +42,7 @@ class vtkUnsignedCharArray;
 class vtkOpenGLExtensionManager;
 class vtkRenderWindow;
 
+PCL_DEPRECATED(1, 13, "The OpenGL backend of VTK is deprecated. Please switch to the OpenGL2 backend.")
 class PCL_EXPORTS vtkVertexBufferObject : public vtkObject
 {
 public:

diff --git a/visualization/include/pcl/visualization/vtk/vtkVertexBufferObjectMapper.h b/visualization/include/pcl/visualization/vtk/vtkVertexBufferObjectMapper.h
@@ -22,6 +22,7 @@
 #pragma once
 
 #include <pcl/pcl_exports.h>
+#include <pcl/pcl_macros.h>
 
 #include "vtkMapper.h"
 #include "vtkSmartPointer.h"
@@ -34,6 +35,7 @@ class vtkShader2;
 class vtkShaderProgram2;
 class vtkVertexBufferObject;
 
+PCL_DEPRECATED(1, 13, "The OpenGL backend of VTK is deprecated. Please switch to the OpenGL2 backend.")
 class PCL_EXPORTS vtkVertexBufferObjectMapper : public vtkMapper
 {
 public: