Add ifdefs for scene index (#2271)

Author: sebastienblor

libs/render_delegate/reader.cpp

@@ -159,6 +159,7 @@ HydraArnoldReader::HydraArnoldReader(AtUniverse *universe, AtNode *procParent) :
         _purpose(UsdGeomTokens->render), 
         _universe(universe) 
 {
+#ifdef ARNOLD_SCENE_INDEX
     if (ArchHasEnv("USDIMAGINGGL_ENGINE_ENABLE_SCENE_INDEX")) 
     {
         // The environment variable is defined, it takes precedence on any other setting
@@ -170,13 +171,15 @@ HydraArnoldReader::HydraArnoldReader(AtUniverse *universe, AtNode *procParent) :
         }
         _useSceneIndex = (useSceneIndex != "0");
     }
+#endif
 
     _renderDelegate = new HdArnoldRenderDelegate(true, TfToken("kick"), _universe, AI_SESSION_INTERACTIVE, procParent);
     TF_VERIFY(_renderDelegate);
     _renderIndex = HdRenderIndex::New(_renderDelegate, HdDriverVector());
     _sceneDelegateId = SdfPath::AbsoluteRootPath();
 
     if (_useSceneIndex) {
+#ifdef ARNOLD_SCENE_INDEX
         UsdImagingCreateSceneIndicesInfo info;
         info.displayUnloadedPrimsWithBounds = false;
         info.overridesSceneIndexCallback =
@@ -194,7 +197,7 @@ HydraArnoldReader::HydraArnoldReader(AtUniverse *universe, AtNode *procParent) :
             HdsiLegacyDisplayStyleOverrideSceneIndex::New(_sceneIndex);
 
         _renderIndex->InsertSceneIndex(_sceneIndex, _sceneDelegateId);
-        
+#endif        
     } else {        
         _imagingDelegate = new UsdArnoldProcImagingDelegate(_renderIndex, _sceneDelegateId);
     }
@@ -410,6 +413,8 @@ void HydraArnoldReader::WriteDebugScene() const
 }
 
 
+#ifdef ARNOLD_SCENE_INDEX
+
 HdSceneIndexBaseRefPtr
 HydraArnoldReader::_AppendOverridesSceneIndices(
     HdSceneIndexBaseRefPtr const &inputScene)
@@ -448,4 +453,5 @@ HydraArnoldReader::_AppendOverridesSceneIndices(
         UsdImagingRootOverridesSceneIndex::New(sceneIndex);
 
     return sceneIndex;
-}
+}
+#endif

libs/render_delegate/reader.h

@@ -17,6 +17,10 @@ TF_DECLARE_REF_PTRS(UsdImagingRootOverridesSceneIndex);
 TF_DECLARE_REF_PTRS(HdsiLegacyDisplayStyleOverrideSceneIndex);
 TF_DECLARE_REF_PTRS(HdsiPrimTypePruningSceneIndex);
 
+#if PXR_VERSION >= 2411
+#define ARNOLD_SCENE_INDEX
+#endif
+
 class UsdArnoldProcImagingDelegate;
 
 // This is the interface we need for the procedural reader
@@ -72,8 +76,10 @@ class HydraArnoldReader : public ProceduralReader {
     std::string _debugScene;
     bool _useSceneIndex = false; 
 
+#ifdef ARNOLD_SCENE_INDEX
     HdSceneIndexBaseRefPtr
     _AppendOverridesSceneIndices(
         const HdSceneIndexBaseRefPtr &inputScene);
+#endif
 
 };