Another pass on disabling HAVS mapper

Change-Id: Ibf1c3dc775df548f31c84afe378000541f7bdd80

Author: aashish24

ParaViewCore/ServerImplementation/Rendering/CMakeLists.txt

@@ -40,6 +40,11 @@ set (Module_SRCS
   vtkSICompositeOrthographicSliceRepresentationProxy.cxx
 )
 
+# OpenGL2 specific definitions
+if("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2")
+  add_definitions(-DVTKGL2)
+endif()
+
 #------------------------------------------------------------------------------
 vtk_module_library(vtkPVServerImplementationRendering
   ${Module_SRCS})

ParaViewCore/ServerImplementation/Rendering/vtkSIUnstructuredGridVolumeRepresentationProxy.cxx

@@ -43,12 +43,14 @@ void vtkSIUnstructuredGridVolumeRepresentationProxy::OnCreateVTKObjects()
          << "Projected tetra"
          << this->GetSubSIProxy("VolumePTMapper")->GetVTKObject()
          << vtkClientServerStream::End;
+#ifndef VTKGL2
   stream << vtkClientServerStream::Invoke
          << self
          << "AddVolumeMapper"
          << "HAVS"
          << this->GetSubSIProxy("VolumeHAVSMapper")->GetVTKObject()
          << vtkClientServerStream::End;
+#endif
   stream << vtkClientServerStream::Invoke
          << self
          << "AddVolumeMapper"
@@ -70,6 +72,7 @@ void vtkSIUnstructuredGridVolumeRepresentationProxy::OnCreateVTKObjects()
 void vtkSIUnstructuredGridVolumeRepresentationProxy::UpdateRenderViewExtensions(
   vtkSIViewProxy* view)
 {
+#ifndef VTKGL2
   vtkSIRenderViewProxy* rvp = vtkSIRenderViewProxy::SafeDownCast(view);
   if (!rvp)
     {
@@ -108,6 +111,7 @@ void vtkSIUnstructuredGridVolumeRepresentationProxy::UpdateRenderViewExtensions(
       this->SupportsHAVSMapper = 1;
       }
     }
+#endif
   this->RenderViewExtensionsTested = 1;
 }
 #endif

ParaViewCore/ServerManager/SMApplication/CMakeLists.txt

@@ -37,6 +37,11 @@ SET_SOURCE_FILES_PROPERTIES(
   ABSTRACT
   )
 
+# OpenGL2 specific definitions
+if("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2")
+  add_definitions(-DVTKGL2)
+endif()
+
 vtk_module_library(vtkPVServerManagerApplication ${Module_SRCS})
 
 #------------------------------------------------------------------------------
@@ -103,21 +108,14 @@ SET(requestedResourceFiles
   ${CMAKE_CURRENT_SOURCE_DIR}/Resources/filters.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/Resources/internal_writers.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/Resources/readers.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/Resources/rendering.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/Resources/sources.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/Resources/utilities.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/Resources/views_and_representations.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/Resources/writers.xml
   ${module_sm_xmls}
   )
 
-if("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2")
-  list(APPEND requestedResourceFiles
-    ${CMAKE_CURRENT_SOURCE_DIR}/Resources/rendering_opengl2.xml)
-else()
-  list(APPEND requestedResourceFiles
-    ${CMAKE_CURRENT_SOURCE_DIR}/Resources/rendering.xml)
-endif()
-
 if (PARAVIEW_ENABLE_PYTHON)
   list(APPEND requestedResourceFiles
       ${CMAKE_CURRENT_SOURCE_DIR}/Resources/pythonfilter.xml

ParaViewCore/ServerManager/SMApplication/Resources/rendering.xml

@@ -134,9 +134,11 @@
     <Proxy class="vtkProjectedTetrahedraMapper"
            name="ProjectedTetrahedraMapper"
            processes="client|renderserver|dataserver"></Proxy>
+#ifndef VTKGL2
     <Proxy class="vtkHAVSVolumeMapper"
            name="HAVSVolumeMapper"
            processes="client|renderserver|dataserver"></Proxy>
+#endif
     <Proxy name="DummyVolumeMapper">
       <ProxyProperty command="SetRayCastFunction"
                      name="RayCastFunction">

ParaViewCore/ServerManager/SMApplication/Resources/views_and_representations.xml

@@ -3832,7 +3832,9 @@
         rendering.</Documentation>
         <StringListDomain name="list">
           <String value="Projected tetra" />
+#ifndef VTKGL2
           <String value="HAVS" />
+#endif
           <String value="Z sweep" />
           <String value="Bunyk ray cast" />
         </StringListDomain>
@@ -3875,12 +3877,14 @@
                proxyname="ProjectedTetrahedraMapper"></Proxy>
         <ShareProperties subproxy="VolumeDummyMapper"></ShareProperties>
       </SubProxy>
+#ifndef VTKGL2
       <SubProxy>
         <Proxy name="VolumeHAVSMapper"
                proxygroup="mappers"
                proxyname="HAVSVolumeMapper"></Proxy>
         <ShareProperties subproxy="VolumeDummyMapper"></ShareProperties>
       </SubProxy>
+#endif
       <!-- end of UnstructuredGridVolumeRepresentation -->
     </RepresentationProxy>