OpenUSD v24.08: successful migration.

wabiverse · Aug 7, 2024 · 2478d0c · 2478d0c
1 parent 0bfbec5
commit 2478d0c
Show file tree

Hide file tree

Showing 85 changed files with 12,793 additions and 51,476 deletions.
diff --git a/Sources/Ar/include/Ar/Ar.h b/Sources/Ar/include/Ar/Ar.h
@@ -2,15 +2,26 @@
 #define __PXR_USD_AR_H__
 
 // Ar.
-#include <Ar/arImpl.h>
 #include <Ar/asset.h>
+#include <Ar/assetInfo.h>
+#include <Ar/debugCodes.h>
 #include <Ar/defaultResolver.h>
+#include <Ar/defaultResolverContext.h>
+#include <Ar/definePackageResolver.h>
+#include <Ar/defineResolver.h>
 #include <Ar/defineResolverContext.h>
+#include <Ar/filesystemAsset.h>
 #include <Ar/filesystemWritableAsset.h>
+#include <Ar/inMemoryAsset.h>
+#include <Ar/notice.h>
 #include <Ar/packageResolver.h>
 #include <Ar/packageUtils.h>
+#include <Ar/resolver.h>
+#include <Ar/resolverContext.h>
+#include <Ar/resolverContextBinder.h>
 #include <Ar/resolverScopedCache.h>
 #include <Ar/threadLocalScopedCache.h>
 #include <Ar/timestamp.h>
+#include <Ar/writableAsset.h>
 
 #endif  // __PXR_USD_AR_H__
diff --git a/Sources/Arch/include/Arch/Arch.h b/Sources/Arch/include/Arch/Arch.h
@@ -22,6 +22,7 @@
 #include <Arch/error.h>
 #include <Arch/export.h>
 #include <Arch/fileSystem.h>
+#include <Arch/function.h>
 #include <Arch/functionLite.h>
 #include <Arch/hash.h>
 #include <Arch/hints.h>

diff --git a/Sources/Hd/flattenedMaterialBindingsDataSourceProvider.cpp b/Sources/Hd/flattenedMaterialBindingsDataSourceProvider.cpp
diff --git a/Sources/Hd/include/Hd/Hd.h b/Sources/Hd/include/Hd/Hd.h
@@ -59,7 +59,6 @@
 #include <Hd/flatNormals.h>
 #include <Hd/flattenedDataSourceProvider.h>
 #include <Hd/flattenedDataSourceProviders.h>
-#include <Hd/flattenedMaterialBindingsDataSourceProvider.h>
 #include <Hd/flattenedOverlayDataSourceProvider.h>
 #include <Hd/flattenedPrimvarsDataSourceProvider.h>
 #include <Hd/flattenedPurposeDataSourceProvider.h>

diff --git a/Sources/Hd/include/Hd/flattenedMaterialBindingsDataSourceProvider.h b/Sources/Hd/include/Hd/flattenedMaterialBindingsDataSourceProvider.h
diff --git a/Sources/Hd/sceneIndexAdapterSceneDelegate.cpp b/Sources/Hd/sceneIndexAdapterSceneDelegate.cpp
@@ -108,7 +108,7 @@
 
 #include "pxr/pxrns.h"
 
-#include "tbb/concurrent_unordered_set.h"
+#include <OneTBB/tbb/concurrent_unordered_set.h>
 
 #include <algorithm>
 #include <cstddef>

diff --git a/Sources/Hgi/include/Hgi/Hgi.h b/Sources/Hgi/include/Hgi/Hgi.h
@@ -5,6 +5,7 @@
 #include <Hgi/api.h>
 #include <Hgi/attachmentDesc.h>
 #include <Hgi/blitCmds.h>
+#include <Hgi/blitCmdsOps.h>
 #include <Hgi/buffer.h>
 #include <Hgi/capabilities.h>
 #include <Hgi/cmds.h>
@@ -18,6 +19,7 @@
 #include <Hgi/graphicsPipeline.h>
 #include <Hgi/handle.h>
 #include <Hgi/hgiImpl.h>
+#include <Hgi/indirectCommandEncoder.h>
 #include <Hgi/resourceBindings.h>
 #include <Hgi/sampler.h>
 #include <Hgi/shaderFunction.h>

diff --git a/Sources/Hio/include/Hio/Hio.h b/Sources/Hio/include/Hio/Hio.h
@@ -7,80 +7,13 @@
 #include <Hio/fieldTextureData.h>
 #include <Hio/glslfx.h>
 #include <Hio/glslfxConfig.h>
+#include <Hio/glslfxResourceLayout.h>
 #include <Hio/image.h>
 #include <Hio/imageRegistry.h>
 #include <Hio/rankedTypeMap.h>
 #include <Hio/stb/stb_image.h>
-#include <Hio/stb/stb_image_resize.h>
+#include <Hio/stb/stb_image_resize2.h>
 #include <Hio/stb/stb_image_write.h>
 #include <Hio/types.h>
 
-#include <Hio/OpenEXRConfigInternal.h>
-#include <Hio/OpenEXRCoreUnity.h>
-#include <Hio/adler32_impl.h>
-#include <Hio/adler32_vec_template.h>
-#include <Hio/backward_compatibility.h>
-#include <Hio/bt_matchfinder.h>
-#include <Hio/common_defs.h>
-#include <Hio/cpu_features.h>
-#include <Hio/cpu_features_common.h>
-#include <Hio/decompress_impl.h>
-#include <Hio/decompress_template.h>
-#include <Hio/deflate_compress.h>
-#include <Hio/deflate_constants.h>
-#include <Hio/dwaLookups.h>
-#include <Hio/glslfxResourceLayout.h>
-#include <Hio/hc_matchfinder.h>
-#include <Hio/ht_matchfinder.h>
-#include <Hio/internal_attr.h>
-#include <Hio/internal_channel_list.h>
-#include <Hio/internal_coding.h>
-#include <Hio/internal_compress.h>
-#include <Hio/internal_constants.h>
-#include <Hio/internal_cpuid.h>
-#include <Hio/internal_decompress.h>
-#include <Hio/internal_dwa_channeldata.h>
-#include <Hio/internal_dwa_classifier.h>
-#include <Hio/internal_dwa_compressor.h>
-#include <Hio/internal_dwa_decoder.h>
-#include <Hio/internal_dwa_encoder.h>
-#include <Hio/internal_dwa_helpers.h>
-#include <Hio/internal_dwa_simd.h>
-#include <Hio/internal_file.h>
-#include <Hio/internal_float_vector.h>
-#include <Hio/internal_huf.h>
-#include <Hio/internal_memory.h>
-#include <Hio/internal_opaque.h>
-#include <Hio/internal_posix_file_impl.h>
-#include <Hio/internal_preview.h>
-#include <Hio/internal_string.h>
-#include <Hio/internal_string_vector.h>
-#include <Hio/internal_structs.h>
-#include <Hio/internal_util.h>
-#include <Hio/internal_win32_file_impl.h>
-#include <Hio/internal_xdr.h>
-#include <Hio/lib_common.h>
-#include <Hio/libdeflate.h>
-#include <Hio/matchfinder_common.h>
-#include <Hio/matchfinder_impl.h>
-#include <Hio/openexr-c.h>
-#include <Hio/openexr.h>
-#include <Hio/openexr_attr.h>
-#include <Hio/openexr_base.h>
-#include <Hio/openexr_chunkio.h>
-#include <Hio/openexr_coding.h>
-#include <Hio/openexr_compression.h>
-#include <Hio/openexr_config.h>
-#include <Hio/openexr_context.h>
-#include <Hio/openexr_debug.h>
-#include <Hio/openexr_decode.h>
-#include <Hio/openexr_encode.h>
-#include <Hio/openexr_errors.h>
-#include <Hio/openexr_part.h>
-#include <Hio/openexr_std_attr.h>
-#include <Hio/openexr_version.h>
-#include <Hio/stb_image.h>
-#include <Hio/stb_image_resize2.h>
-#include <Hio/stb_image_write.h>
-#include <Hio/zlib_constants.h>
 #endif  // __PXR_IMAGING_HIO_H__
diff --git a/Sources/Pegtl/include/Pegtl/contrib/check_bytes.hpp b/Sources/Pegtl/include/Pegtl/contrib/check_bytes.hpp
@@ -24,8 +24,8 @@ namespace PXR_PEGTL_NAMESPACE
       : maybe_nothing
    {
       template< typename Rule,
-                pegtl::apply_mode A,
-                pegtl::rewind_mode M,
+                PXR_PEGTL_NAMESPACE::apply_mode A,
+                PXR_PEGTL_NAMESPACE::rewind_mode M,
                 template< typename... >
                 class Action,
                 template< typename... >

diff --git a/Sources/Pegtl/include/Pegtl/contrib/internal/endian_gcc.hpp b/Sources/Pegtl/include/Pegtl/contrib/internal/endian_gcc.hpp
@@ -4,6 +4,8 @@
 #ifndef PXR_PEGTL_CONTRIB_INTERNAL_ENDIAN_GCC_HPP
 #define PXR_PEGTL_CONTRIB_INTERNAL_ENDIAN_GCC_HPP
 
+#if !defined(_WIN32)
+
 #include <cstdint>
 #include <cstring>
 
@@ -195,4 +197,6 @@ namespace PXR_PEGTL_NAMESPACE::internal
 
 }  // namespace PXR_PEGTL_NAMESPACE::internal
 
+#endif // !defined(_WIN32)
+
 #endif
diff --git a/Sources/Pegtl/include/Pegtl/contrib/internal/endian_win.hpp b/Sources/Pegtl/include/Pegtl/contrib/internal/endian_win.hpp
@@ -4,6 +4,8 @@
 #ifndef PXR_PEGTL_CONTRIB_INTERNAL_ENDIAN_WIN_HPP
 #define PXR_PEGTL_CONTRIB_INTERNAL_ENDIAN_WIN_HPP
 
+#if defined(_WIN32)
+
 #include <cstdint>
 #include <cstdlib>
 #include <cstring>
@@ -99,4 +101,6 @@ namespace PXR_PEGTL_NAMESPACE::internal
 
 }  // namespace PXR_PEGTL_NAMESPACE::internal
 
+#endif // defined(_WIN32)
+
 #endif
diff --git a/Sources/Pegtl/include/Pegtl/contrib/json.hpp b/Sources/Pegtl/include/Pegtl/contrib/json.hpp
@@ -36,7 +36,7 @@ namespace PXR_PEGTL_NAMESPACE::json
    struct int_ : sor< one< '0' >, plus< digit > > {};  // NOLINT(readability-identifier-naming)
    struct number : seq< opt< one< '-' > >, int_, opt< frac >, opt< exp > > {};
 
-   struct xdigit : pegtl::xdigit {};
+   struct xdigit : PXR_PEGTL_NAMESPACE::xdigit {};
    struct unicode : list< seq< one< 'u' >, rep< 4, xdigit > >, one< '\\' > > {};
    struct escaped_char : one< '"', '\\', '/', 'b', 'f', 'n', 'r', 't' > {};
    struct escaped : sor< escaped_char, unicode > {};

diff --git a/Sources/Pegtl/include/Pegtl/contrib/peg.hpp b/Sources/Pegtl/include/Pegtl/contrib/peg.hpp
@@ -5,7 +5,7 @@
 #ifndef PXR_PEGTL_CONTRIB_PEG_HPP
 #define PXR_PEGTL_CONTRIB_PEG_HPP
 
-#include <tao/pegtl.hpp>
+#include <Pegtl/Pegtl.hpp>
 
 namespace PXR_PEGTL_NAMESPACE::peg
 {