Fix creating multiple asset instances #7269 #7288
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bejado
approved these changes
Oct 23, 2023
poweifeng
approved these changes
Oct 23, 2023
The temporary variable has been used to store the current instance of FFilamentAsset being loaded for easy access from internal methods. This causes a crash as to a complex scenario as follows. val asset1 = assetLoader.createAsset(assetBuffer1) val instance1 = assetLoader.createInstance(asset1) val asset2 = assetLoader.createAsset(assetBuffer2) val instance2 = assetLoader.createInstance(asset1) As the first step of fixing this issue, remove the transient property `mAsset` from FAssetLoader. This commit alone doesn't resolve the issue, and more commits are following. Consolidate the low level version of createInstance, which takes a pointer to cgltf_data type, into the high level version as the latter one uses a parameter for FFilamentAsset instead of referencing mAsset. Update all other relevant methods to take a FFilamentAsset pointer instead of cgltf_data. This partially fixes #7269
There's no functional change in this commit. Make some parameter names more legible by renaming them and put output parameters to the right of their function.
The transient property `mRootNotes` in FAssetLoader is built when a new root asset is created and referenced whenever a new instance is created. So it incurs an undefined behavior when a previously created asset tries creating a new instance after a newly created asset has already created via the same asset loader. Move this transient property to each asset so that they can reference it when a new instance is created. This partially fixes #7269
z3moon
force-pushed
the
zm/multi-asset-instances
branch
from
6345c1f to
3d02d89
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.