Remove vtkShaderDeviceAdapter2 and vtkShaderProgram2

Fixes #17632 Both of these types are not used with the removal of the OpenGL1 backend.
Kitware · Jun 27, 2019 · 9cd1bcb · 9cd1bcb
1 parent 4506195
commit 9cd1bcb
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 381 deletions.
diff --git a/Charts/Core/Testing/Cxx/TestGLSL.cxx b/Charts/Core/Testing/Cxx/TestGLSL.cxx
diff --git a/Rendering/Core/CMakeLists.txt b/Rendering/Core/CMakeLists.txt
@@ -84,7 +84,6 @@ set(classes
   vtkRendererDelegate
   vtkRendererSource
   vtkSelectVisiblePoints
-  vtkShaderDeviceAdapter2
   vtkShaderProperty
   vtkSkybox
   vtkStereoCompositor

diff --git a/Rendering/Core/vtkProperty.h b/Rendering/Core/vtkProperty.h
@@ -51,7 +51,6 @@ class vtkActor;
 class vtkInformation;
 class vtkRenderer;
 class vtkShaderProgram;
-class vtkShaderDeviceAdapter2;
 class vtkTexture;
 class vtkWindow;
 class vtkXMLDataElement;
@@ -421,12 +420,6 @@ class VTKRENDERINGCORE_EXPORT vtkProperty : public vtkObject
   vtkBooleanMacro(Shading, vtkTypeBool);
   //@}
 
-  /**
-   * Get the vtkShaderDeviceAdapter2 if set, returns null otherwise.
-   */
-  virtual vtkShaderDeviceAdapter2* GetShaderDeviceAdapter2()
-    { return nullptr; }
-
   //@{
   /**
    * Provide values to initialize shader variables.

diff --git a/Rendering/Core/vtkShaderDeviceAdapter2.cxx b/Rendering/Core/vtkShaderDeviceAdapter2.cxx