Skip to content

Apple: Enable Imaging support for Embedded Platforms#3215

Merged
pixar-oss merged 5 commits intoPixarAnimationStudios:devfrom
dgovil:ios-imaging
Oct 3, 2024
Merged

Apple: Enable Imaging support for Embedded Platforms#3215
pixar-oss merged 5 commits intoPixarAnimationStudios:devfrom
dgovil:ios-imaging

Conversation

@dgovil
Copy link
Copy Markdown
Collaborator

@dgovil dgovil commented Aug 8, 2024

Description of Change(s)

This PR ports Thor's Imaging work onto the latest USD dev branch and enables imaging for iOS and visionOS. It also includes some patches from Maddy Adams and me to suit the current state of USD and its dependencies.

There is a single patch to MaterialX to enable support with USD not using OpenGL builds.

Additionally, as requested by Nick Porcino, I have added support for shared memory texture handling on the Mac as well where applicable.

I've tested this on macOS with Apple Silicon but do not have Intel macs to test with. I've also tested building this for both iOS and visionOS.

(Jess I believe you'd tracked this as #USD-9841)

Fixes Issue(s)

  • I have verified that all unit tests pass with the proposed changes
  • I have submitted a signed Contributor License Agreement

@dgovil dgovil mentioned this pull request Aug 8, 2024
2 tasks
@jesschimein
Copy link
Copy Markdown
Collaborator

Filed as internal issue #USD-9955

@jesschimein
Copy link
Copy Markdown
Collaborator

/AzurePipelines run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

Comment thread pxr/imaging/hgiMetal/blitCmds.mm Outdated
@dgovil
Copy link
Copy Markdown
Collaborator Author

dgovil commented Aug 12, 2024

I added a commit that moves all the various shader gen backends behind their respective ifdefs

@dgovil
Copy link
Copy Markdown
Collaborator Author

dgovil commented Aug 13, 2024

@davidgyu actually never mind, @ld_kerley caught some issues so I backed out my shader gen changes. I think we need to revisit it on the MaterialX side and then follow up in OpenUSD later. I'll leave the MaterialX build patch in for that reason.

@jesschimein
Copy link
Copy Markdown
Collaborator

/AzurePipelines run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@dgovil
Copy link
Copy Markdown
Collaborator Author

dgovil commented Sep 9, 2024

Just a heads up that I added some changes from @furby-tm to fix a few minor issues they found.
One thing too though is that it guards the releases behind an arc check, and if we can merge in #3226 then we can potentially remove those as well.

@jesschimein
Copy link
Copy Markdown
Collaborator

/AzurePipelines run

@azure-pipelines
Copy link
Copy Markdown

Pull request contains merge conflicts.

dgovil and others added 3 commits September 10, 2024 17:01
This PR ports Thor's Imaging work onto the latest USD dev branch. It also includes some patches from Maddy Adams and me to suit the current state of USD and its dependencies.

There is a single patch to MaterialX to enable support with USD not using OpenGL builds.

Additionally, as requested by Nick Porcino, I have added support for shared memory texture handling on the Mac as well where applicable.

I've tested this on macOS with Apple Silicon but do not have Intel macs to test with. I've also tested building this for both iOS and visionOS.
* 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 dgovil force-pushed the ios-imaging branch 2 times, most recently from e29fee0 to 38653a8 Compare September 11, 2024 00:09
@jesschimein
Copy link
Copy Markdown
Collaborator

/AzurePipelines run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@pixar-oss pixar-oss merged commit 0900db8 into PixarAnimationStudios:dev Oct 3, 2024
@davidgyu davidgyu mentioned this pull request Oct 28, 2024
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants