Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[workspace] Upgrade openusd_internal to latest release 24.11 #22082

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 63 additions & 21 deletions tools/workspace/openusd_internal/lock/files.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,9 @@ FILES = {
"anyWeakPtr",
"atomicOfstreamWrapper",
"bigRWMutex",
"bits",
"bitUtils",
"compressedBits",
"debug",
"debugNotice",
"denseHashMap",
Expand Down Expand Up @@ -605,6 +607,36 @@ FILES = {
"PRIVATE_HEADERS": [],
"CPPFILES": [],
},
"pxr/base/ts": {
"NAME": "ts",
"LIBRARIES": [
"vt",
"gf",
"tf",
],
"PUBLIC_CLASSES": [
"binary",
"debugCodes",
"eval",
"knot",
"knotData",
"knotMap",
"raii",
"regressionPreventer",
"spline",
"splineData",
"tangentConversions",
"typeHelpers",
"types",
],
"PUBLIC_HEADERS": [
"api.h",
"valueTypeDispatch.h",
],
"PRIVATE_CLASSES": [],
"PRIVATE_HEADERS": [],
"CPPFILES": [],
},
"pxr/base/vt": {
"NAME": "vt",
"LIBRARIES": [
Expand Down Expand Up @@ -648,6 +680,7 @@ FILES = {
],
"PUBLIC_HEADERS": [
"api.h",
"sort.h",
"withScopedParallelism.h",
],
"PRIVATE_CLASSES": [],
Expand Down Expand Up @@ -735,6 +768,7 @@ FILES = {
"parserPlugin",
"property",
"registry",
"sdfTypeIndicator",
],
"PUBLIC_HEADERS": [
"api.h",
Expand All @@ -760,6 +794,7 @@ FILES = {
"changes",
"composeSite",
"dependency",
"dependentNamespaceEditUtils",
"dynamicFileFormatContext",
"dynamicFileFormatDependencyData",
"dynamicFileFormatInterface",
Expand Down Expand Up @@ -812,6 +847,7 @@ FILES = {
"gf",
"pegtl",
"trace",
"ts",
"vt",
"work",
"ar",
Expand Down Expand Up @@ -878,7 +914,6 @@ FILES = {
"variableExpression",
"variantSetSpec",
"variantSpec",
"textFileFormat.tab",
],
"PUBLIC_HEADERS": [
"api.h",
Expand All @@ -905,6 +940,7 @@ FILES = {
"parserValueContext",
"pathParser",
"subLayerListEditor",
"textFileFormatParser",
"textParserContext",
"textParserHelpers",
"valueTypeRegistry",
Expand All @@ -916,9 +952,7 @@ FILES = {
"instantiatePool.h",
"valueTypePrivate.h",
],
"CPPFILES": [
"textFileFormat.lex.cpp",
],
"CPPFILES": [],
},
"pxr/usd/sdr": {
"NAME": "sdr",
Expand Down Expand Up @@ -955,14 +989,15 @@ FILES = {
"plug",
"tf",
"trace",
"ts",
"vt",
"work",
],
"PUBLIC_CLASSES": [
"apiSchemaBase",
"attribute",
"clipsAPI",
"attributeQuery",
"clipsAPI",
"collectionAPI",
"collectionMembershipQuery",
"collectionPredicateLibrary",
Expand Down Expand Up @@ -1005,14 +1040,15 @@ FILES = {
"timeCode",
"tokens",
"typed",
"validator",
"validatorTokens",
"validationError",
"validationRegistry",
"usdFileFormat",
"usdaFileFormat",
"usdcFileFormat",
"usdzFileFormat",
"validationContext",
"validationError",
"validationRegistry",
"validator",
"validatorTokens",
"variantSets",
"zipFile",
],
Expand Down Expand Up @@ -1059,25 +1095,23 @@ FILES = {
"work",
],
"PUBLIC_CLASSES": [
"debugCodes",
"tokens",
"bboxCache",
"constraintTarget",
"xformCache",
"basisCurves",
"bboxCache",
"boundable",
"boundableComputeExtent",
"camera",
"capsule",
"capsule_1",
"cone",
"constraintTarget",
"cube",
"curves",
"cylinder",
"cylinder_1",
"debugCodes",
"gprim",
"hermiteCurves",
"imageable",
"gprim",
"mesh",
"metrics",
"modelAPI",
Expand All @@ -1094,11 +1128,14 @@ FILES = {
"sphere",
"subset",
"tetMesh",
"tokens",
"validatorTokens",
"visibilityAPI",
"xform",
"xformable",
"xformOp",
"xformCache",
"xformCommonAPI",
"xformOp",
"xformable",
],
"PUBLIC_HEADERS": [
"api.h",
Expand All @@ -1107,7 +1144,9 @@ FILES = {
"samplingUtils",
],
"PRIVATE_HEADERS": [],
"CPPFILES": [],
"CPPFILES": [
"validators.cpp",
],
},
"pxr/usd/usdPhysics": {
"NAME": "usdPhysics",
Expand Down Expand Up @@ -1171,15 +1210,15 @@ FILES = {
"material",
"materialBindingAPI",
"nodeDefAPI",
"nodeGraph",
"output",
"shader",
"shaderDefParser",
"shaderDefUtils",
"nodeGraph",
"tokens",
"validatorTokens",
"udimUtils",
"utils",
"validatorTokens",
],
"PUBLIC_HEADERS": [
"api.h",
Expand Down Expand Up @@ -1219,6 +1258,7 @@ FILES = {
"stitchClips",
"timeCodeRange",
"usdzPackage",
"validatorTokens",
],
"PUBLIC_HEADERS": [
"api.h",
Expand All @@ -1230,6 +1270,8 @@ FILES = {
"assetLocalizationPackage",
],
"PRIVATE_HEADERS": [],
"CPPFILES": [],
"CPPFILES": [
"validators.cpp",
],
},
}
6 changes: 5 additions & 1 deletion tools/workspace/openusd_internal/package.BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ package(default_visibility = ["//visibility:private"])

filegroup(
name = "cmakelists",
srcs = glob(["**/CMakeLists.txt"]),
srcs = glob([
"**/CMakeLists.txt",
"**/generatedSchema.classes.txt",
]),
visibility = ["//visibility:public"],
)

Expand All @@ -34,6 +37,7 @@ cmake_configure_file(
"PXR_PREFER_SAFETY_OVER_SPEED",
# We don't need Python.
"PXR_PYTHON_SUPPORT_ENABLED=0",
"PXR_USE_INTERNAL_BOOST_PYTHON=0",
# Use Drake-specific namespaces.
"PXR_USE_NAMESPACES=1",
"PXR_EXTERNAL_NAMESPACE=drake_vendor_pxr",
Expand Down
15 changes: 15 additions & 0 deletions tools/workspace/openusd_internal/patches/nanocolor_namespace.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[openusd_internal] Use drake namespace for nanocolor

Reasoning for not upstreaming this patch: Drake-specific tweak.

--- pxr/base/gf/nc/nanocolor.h
+++ pxr/base/gf/nc/nanocolor.h
@@ -18,7 +18,7 @@
// is a C++ only header; so the generated namespace prefixes can't be
// used here.
#ifndef NCNAMESPACE
-#define NCNAMESPACE pxr_nc_1_0_
+#define NCNAMESPACE drake_vendor_pxr_nc_1_0_
#endif

// The NCCONCAT macro is used to apply a namespace to the symbols in the public

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[openusd_internal] Fix mis-use of system include path

This bug fix should be upstreamed.

--- pxr/usd/usdUtils/validators.cpp
+++ pxr/usd/usdUtils/validators.cpp
@@ -5,7 +5,7 @@
// https://openusd.org/license.
//

-#include <pxr/usd/sdf/fileFormat.h>
+#include "pxr/usd/sdf/fileFormat.h"
#include "pxr/usd/usd/validationError.h"
#include "pxr/usd/usd/validationRegistry.h"
#include "pxr/usd/usdUtils/validatorTokens.h"
Loading