MAYA-121882 Share the cached HdVP2TextureInfo between all materials so that isSRGB #2145
Conversation
…B and uvScaleOffset and re-used correctly when hitting a texture in the cache.
|
@csyshing I'm not sure if this impacting the issues with background material loading but it is in a similar enough area I thought you should be aware of the change. @JGamache-autodesk we need to save the extra information that is HdVP2TextureInfo so that when another material hits the Maya texture cache we get these values right. The relevant bit of code is https://github.com/Autodesk/maya-usd/blob/dev/lib/mayaUsd/render/vp2RenderDelegate/material.cpp#L1006. Here if we hit the texture manager cache we early exit from the function and don't set the isSRGB value or the uvScaleOffset. We search the _textureMap at https://github.com/Autodesk/maya-usd/blob/dev/lib/mayaUsd/render/vp2RenderDelegate/material.cpp#L2768. This code is only every executed serially. We also call it with async material loading in UpdateLoadedTexture https://github.com/Autodesk/maya-usd/blob/dev/lib/mayaUsd/render/vp2RenderDelegate/material.cpp#L2859, but that is also serial. |
|
I strongly suspect this will help with #2142. |
|
@williamkrick @JGamache-autodesk I will test against #2142 to see how's it going. |
…is allows textures to be deleted when all materials using that texture are destroyed.
williamkrick
dismissed stale reviews from csyshing and JGamache-autodesk
via
36685b9
| // Check the local cache again, do not overwrite if same texture has | ||
| // been loaded asynchronously | ||
| if (_textureMap.find(path) != _textureMap.end()) { | ||
| return; |
There was a problem hiding this comment.
The early exit here is wrong. It also stops marking the sprim dirty and triggering a refresh.
| TfTokenVector _requiredPrimvars; //!< primvars required by this material | ||
| HdVP2ShaderUniquePtr _surfaceShader; //!< VP2 surface shader instance | ||
| SdfPath _surfaceShaderId; //!< Path of the surface shader | ||
| static HdVP2GlobalTextureMap _globalTextureMap; //!< Texture in use by all materials in MayaUSD |
There was a problem hiding this comment.
With a single global static structure we'd never delete the textures until the plugin unloads or Maya exits. At that time it is often not safe to try to destroy the texture, and textures were held in the cache beyond file -new.
This way we get the deletion at the right time.
williamkrick
added
the
ready-for-merge
and uvScaleOffset and re-used correctly when hitting a texture in the cache.