Skip to content

Commit

Permalink
Hydra: making HdTextureResource and HdSceneDelegate::GetTextureResour…
Browse files Browse the repository at this point in the history
…ce[ID] deprecated.

(Internal change: 2092493)
  • Loading branch information
unhyperbolic authored and pixar-oss committed Aug 21, 2020
1 parent ff027f4 commit 5d1771d
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 1 deletion.
10 changes: 10 additions & 0 deletions pxr/imaging/hd/sceneDelegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -601,10 +601,20 @@ class HdSceneDelegate {
/// \name Texture Aspects
// -----------------------------------------------------------------------//

///
/// \deprecated It is now the responsibility of the render delegate to load
/// the texture (using the file path authored on the texture node in a
/// material network).
///
/// Returns the texture resource ID for a given texture ID.
HD_API
virtual HdTextureResource::ID GetTextureResourceID(SdfPath const& textureId);

///
/// \deprecated It is now the responsibility of the render delegate to load
/// the texture (using the file path authored on the texture node in a
/// material network).
///
/// Returns the texture resource for a given texture ID.
HD_API
virtual HdTextureResourceSharedPtr GetTextureResource(SdfPath const& textureId);
Expand Down
7 changes: 7 additions & 0 deletions pxr/imaging/hd/textureResource.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@ PXR_NAMESPACE_OPEN_SCOPE

using HdTextureResourceSharedPtr = std::shared_ptr<class HdTextureResource>;

///
/// \class HdTextureResource
///
/// \deprecated It is now the responsibility of the render delegate to load
/// the texture (using the file path authored on the texture node in a
/// material network).
///
class HdTextureResource {
public:
typedef size_t ID;
Expand Down
10 changes: 9 additions & 1 deletion pxr/imaging/hdSt/textureResource.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,15 @@ PXR_NAMESPACE_OPEN_SCOPE

using HdStTextureResourceSharedPtr = std::shared_ptr<class HdStTextureResource>;

/// HdStTextureResource is an interface to a GL-backed texture.
///
/// \class HdStTextureResource
///
/// An interface to a GL-backed texture.
///
/// \deprecated It is now the responsibility of the render delegate to load
/// the texture (using the file path authored on the texture node in a
/// material network).
///
class HdStTextureResource : public HdTextureResource, boost::noncopyable {
public:
HDST_API
Expand Down

0 comments on commit 5d1771d

Please sign in to comment.