UsdImagingGLEngine: Making _engine private and providing accessor _Ge…

…tHdEngine for subclasses instead. (Internal change: 2077286)
PixarAnimationStudios · Jun 30, 2020 · c03508b · c03508b
1 parent 53681e9
commit c03508b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/pxr/usdImaging/usdImagingGL/engine.cpp b/pxr/usdImaging/usdImagingGL/engine.cpp
@@ -1462,5 +1462,11 @@ UsdImagingGLEngine::_GetSceneDelegate() const
     return _sceneDelegate.get();
 }
 
+HdEngine *
+UsdImagingGLEngine::_GetHdEngine()
+{
+    return &_engine;
+}
+
 PXR_NAMESPACE_CLOSE_SCOPE
 
diff --git a/pxr/usdImaging/usdImagingGL/engine.h b/pxr/usdImaging/usdImagingGL/engine.h
@@ -482,6 +482,9 @@ class UsdImagingGLEngine
     USDIMAGINGGL_API
     UsdImagingDelegate *_GetSceneDelegate() const;
 
+    USDIMAGINGGL_API
+    HdEngine *_GetHdEngine();
+
     USDIMAGINGGL_API
     HdSelectionSharedPtr _GetSelection() const;
 
@@ -491,8 +494,11 @@ class UsdImagingGLEngine
     HgiUniquePtr _hgi;
     // Similar for HdDriver.
     HdDriver _hgiDriver;
+
+private:
     HdEngine _engine;
 
+protected:
     // ... and the other Hydra resources
     HdPluginRenderDelegateUniqueHandle _renderDelegate;
     std::unique_ptr<HdRenderIndex> _renderIndex;

diff --git a/pxr/usdImaging/usdImagingGL/version.h b/pxr/usdImaging/usdImagingGL/version.h
@@ -29,7 +29,8 @@
 // 2 -> 3: refactor picking API.
 // 3 -> 4: Add "instancerContext" to new picking API.
 // 4 -> 5: Use UsdImagingGLEngine::_GetSceneDelegate() instead of _delegate.
-#define USDIMAGINGGL_API_VERSION 5
+// 5 -> 6: Use UsdImagingGLEngine::_GetHdEngine() instead of _engine.
+#define USDIMAGINGGL_API_VERSION 6
 
 #endif // PXR_USD_IMAGING_USD_IMAGING_GL_VERSION_H