Fix Garch opengl check, add ARC conditionals to HgiMetal.#2
Merged
dgovil merged 1 commit intodgovil:ios-imagingfrom Sep 9, 2024
Merged
Fix Garch opengl check, add ARC conditionals to HgiMetal.#2dgovil merged 1 commit intodgovil:ios-imagingfrom
dgovil merged 1 commit intodgovil:ios-imagingfrom
Conversation
* Note blitCmds.mm is still using the wrong MTLResource type on L.361, which should be MTLBuffer, but that issue is addressed in the following PR: PixarAnimationStudios#3226 Signed-off-by: furby™ <devs@wabi.foundation>
dgovil
pushed a commit
that referenced
this pull request
Oct 8, 2025
dirty expression prior to removing it from the collection tables.
Reported by the testLightLinkingSceneIndex test under asan, as:
=1343067==ERROR: AddressSanitizer: heap-use-after-free on address 0x60c0009bd598 at pc 0x7f2b478c6b23 bp 0x7ffff1bf6350 sp 0x7ffff1bf6340
READ of size 8 at 0x60c0009bd598 thread T0
#0 0x7f2b478c6b22 in std::vector<SdfPathExpression::Op, std::allocator<SdfPathExpression::Op> >::size() const /usr/lib/gcc/x86_64-redhat-linux/11/../../../../include/c++/11/bits/stl_vector.h:919
#1 0x7f2b478c6b22 in std::vector<SdfPathExpression::Op, std::allocator<SdfPathExpression::Op> >::vector(std::vector<SdfPathExpression::Op, std::allocator<SdfPathExpression::Op> > const&) /usr/lib/gcc/x86_64-redhat-linux/11/../../../../include/c++/11/bits/stl_vector.h:555
#2 0x7f2b478c6b22 in SdfPathExpression::SdfPathExpression(SdfPathExpression const&) /depts/tools/build_archive/dev/builds/2379295/inst/fedora-gcc64-opt-asan/pxr/include/pxr/usd/sdf/pathExpression.h:54
#3 0x7f2b478cf89d in std::pair<SdfPathExpression, std::optional<std::pair<SdfPath, TfToken> > >::pair<std::pair<SdfPath, TfToken> const&, true>(SdfPathExpression const&, std::pair<SdfPath, TfToken> const&) /usr/lib/gcc/x86_64-redhat-linux/11/../../../../include/c++/11/bits/stl_pair.h:337
PixarAnimationStudios#4 0x7f2b478cf89d in HdsiLightLinkingSceneIndex_Impl::_Cache::ProcessCollection(SdfPath const&, TfToken const&, SdfPathExpression const&) imaging/hdsi/lightLinkingSceneIndex.cpp:156
(Internal change: 2379722)
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Description of Change(s)
Garch: Fix OpenGL support checks to not check
PXR_OPENGL_SUPPORT_ENABLED, but instead check against the properPXR_GL_SUPPORT_ENABLEDpreprocessor.HgiMetal: Guard the
[HgiResource didModifyRange:]instance method invocation only for macOS.blitCmds.mmis still using the wrong MTLResource type, on L.361, which should beusing
MTLBufferinstead, but that issue is addressed in this PR: Support building with objc-arc, enable by default. PixarAnimationStudios/OpenUSD#3226releasecalls with!__has_feature(objc_arc), so this change is in line with the PR linked above.Checklist
I have verified that all unit tests pass with the proposed changes
I have submitted a signed Contributor License Agreement (Reference:
Contributor License Agreement instructions)