Skip to content

Commit

Permalink
Temp remove matx metal shaders due to errors.
Browse files Browse the repository at this point in the history
* Swift Bundler is currently unable to compile the MaterialX metal shaders,
  remove until we take surrounding metal shader source into account.
* This adds an additional patch to ensure to exclude the entirety of the MXResources/libraries
  directory, else the metal shaders may still attempt to compile and fail in some instances.

Signed-off-by: furby™ <[email protected]>
  • Loading branch information
furby-tm committed Nov 29, 2024
1 parent 3aa2ee7 commit 2e3bc87
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rust-usd"
version = "24.8.9"
version = "24.8.10"
edition = "2021"
publish = []

Expand Down
2 changes: 1 addition & 1 deletion DeclarativePixarUSD.usda
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#usda 1.0
(
doc = "SwiftUSD v24.08.9 | Declarative API"
doc = "SwiftUSD v24.08.10 | Declarative API"
)

def "DeclarativeScene"
Expand Down
2 changes: 1 addition & 1 deletion HelloPixarUSD.usda
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#usda 1.0
(
doc = "SwiftUSD v24.08.9"
doc = "SwiftUSD v24.08.10"
)

def Xform "Geometry"
Expand Down
6 changes: 3 additions & 3 deletions Package.resolved
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"originHash" : "9b417822d1fa9e757fb8d1e51dbbdd82d21c4aa7cf1a47d5cb6ce4e6de79273f",
"originHash" : "1af3a7c5ccc3cad0e6d8f1e74a87f258ce1200775134124095520c4baf0ddbed",
"pins" : [
{
"identity" : "galah",
Expand All @@ -24,8 +24,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/wabiverse/MetaverseKit",
"state" : {
"revision" : "abfc7bf55b48ecc7053d6d6244b364c33f252844",
"version" : "1.8.6"
"revision" : "2a39a3fb7b6cded055c46b69faa89387338eb7c1",
"version" : "1.8.7"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ let package = Package(
// prepare for SwiftCrossUI, for a cross-platform UsdView.
// .package(url: "https://github.com/stackotter/swift-cross-ui", revision: "5c5d8c8"),
.package(url: "https://github.com/wabiverse/icu.git", from: "76.1.2"),
.package(url: "https://github.com/wabiverse/MetaverseKit", from: "1.8.6"),
.package(url: "https://github.com/wabiverse/MetaverseKit", from: "1.8.7"),
.package(url: "https://github.com/swiftlang/swift-syntax.git", from: "600.0.1"),
.package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.4.3"),
.package(url: "https://github.com/apple/swift-log.git", from: "1.5.3"),
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ For more details, please visit the web site [here](http://openusd.org).
##### To use Pixar's USD in swift, add SwiftUSD as a package dependency in your project's Package.swift file.
```swift
dependencies: [
.package(url: "https://github.com/wabiverse/SwiftUSD.git", from: "24.8.9"),
.package(url: "https://github.com/wabiverse/SwiftUSD.git", from: "24.8.10"),
]
```

Expand Down Expand Up @@ -109,7 +109,7 @@ let package = Package(
),
],
dependencies: [
.package(url: "https://github.com/wabiverse/SwiftUSD.git", from: "24.8.9")
.package(url: "https://github.com/wabiverse/SwiftUSD.git", from: "24.8.10")
],
targets: [
/* 📕 For library products... */
Expand Down
2 changes: 1 addition & 1 deletion Sources/pxr/include/pxr/pxrns.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

/* ------ swift usd. ------ */

# define SWIFTUSD_EVOLUTION 9
# define SWIFTUSD_EVOLUTION 10
# define PXR_INTERNAL_NS Pixar

/* ------------------------ */
Expand Down

0 comments on commit 2e3bc87

Please sign in to comment.