Merge branch 'PixarAnimationStudios:dev' into dev

Author: johnnynunez

CHANGELOG.md

@@ -45,14 +45,14 @@ add_subdirectory(pxr)
 add_subdirectory(extras)
 
 if (PXR_BUILD_PRMAN_PLUGIN)
-    set(prmanPluginPath "third_party/renderman-${RENDERMAN_VERSION_MAJOR}")
+    set(prmanPluginPath "third_party/renderman")
 
     get_filename_component(prmanPluginAbsPath "${prmanPluginPath}" ABSOLUTE)
     if (EXISTS "${prmanPluginAbsPath}")
         add_subdirectory("${prmanPluginPath}")
     else()
-        message(FATAL_ERROR "No RenderMan plugin available for "
-                "RenderMan ${RENDERMAN_VERSION_MAJOR}")
+        message(FATAL_ERROR "No RenderMan plugin not found at "
+                "${prmanPluginAbsPath}. Check client mapping")
     endif()
 endif()
 

CMakeLists.txt

@@ -27,7 +27,7 @@ Our test machines have the following software versions installed.
 | Qt for Python | PySide2 5.15.2.1     | PySide6 6.3.1                | PySide2 5.15.2.1               |
 | PyOpenGL      | 3.1.5                | 3.1.5                        | 3.1.5                          |
 | Embree        | 4.3.3                | 4.3.3                        | 4.3.3                          |
-| RenderMan     | 25.3                 | 25.3                         | 25.3                           |
+| RenderMan     | 26.3, 27.0           | 26.3, 27.0                   | 26.3, 27.0                     |
 | Alembic       | 1.8.5                | 1.8.5                        | 1.8.5                          |
 | OpenEXR       | 3.1.13               | 3.1.13                       | 3.1.13                         |
 | MaterialX     | 1.39.3               | 1.39.3                       | 1.39.3                         |

VERSIONS.md

@@ -75,21 +75,34 @@ def MacOS():
 if MacOS():
     import apple_utils
 
+# WASM specific defines and helpers
+TARGET_WASM='wasm'
+TARGET_WASM64='wasm64'
+
+# determines flags based on 32 / 64 bit wasm build target
+def GetWasmCompilerFlags(buildTarget):
+    compileFlags = '-pthread --use-port=zlib'
+    linkerFlags = '-pthread'
+
+    if buildTarget == TARGET_WASM64:
+        compileFlags += ' -sMEMORY64=1'
+        linkerFlags += ' -sMEMORY64=1'
+    
+    return (compileFlags, linkerFlags)
+
 def GetBuildTargetDefault():
     if MacOS():
         return apple_utils.GetBuildTargetDefault()
     else:
         return ''
 
-TARGET_WASM='wasm'
-
 def GetBuildTargets():
     if MacOS():
-        return apple_utils.GetBuildTargets() + [TARGET_WASM]
+        return apple_utils.GetBuildTargets() + [TARGET_WASM, TARGET_WASM64]
     elif Linux():
-        return [TARGET_WASM]
+        return [TARGET_WASM, TARGET_WASM64]
     elif Windows():
-        return [TARGET_WASM]        
+        return [TARGET_WASM, TARGET_WASM64]
     else:
         return []
 
@@ -1007,7 +1020,16 @@ def InstallOneTBB(context, force, buildArgs):
     with CurrentWorkingDirectory(DownloadURL(ONETBB_URL, context, force)):
         cmakeOptions = ['-DTBB_TEST=OFF', '-DTBB_STRICT=OFF']
         if context.targetWasm:
-            cmakeOptions += ['-DBUILD_SHARED_LIBS=OFF', '-DCMAKE_CXX_FLAGS="-pthread"']
+            compileFlags, _ = GetWasmCompilerFlags(context.buildTarget)
+
+            # Note: Emscripten toolchain file will check presence of
+            # '-sMEMORY64=1' in 'CMAKE_C_FLAGS' to determine if a
+            # 64 bit build is to be performed
+            cmakeOptions += [
+                '-DBUILD_SHARED_LIBS=OFF',
+                '-DCMAKE_CXX_FLAGS="{}"'.format(compileFlags),
+                '-DCMAKE_C_FLAGS="{}"'.format(compileFlags)
+            ]
 
         cmakeOptions += buildArgs
         RunCMake(context, force, cmakeOptions)
@@ -1196,6 +1218,9 @@ def InstallJPEG(context, force, buildArgs):
         extraJPEGArgs = buildArgs
         if not which("nasm"):
             extraJPEGArgs.append("-DWITH_SIMD=FALSE")
+        
+        # For compatibility with CMake 4+
+        extraJPEGArgs.append("-DCMAKE_POLICY_VERSION_MINIMUM=3.5")
 
         RunCMake(context, force, extraJPEGArgs)
         return os.getcwd()
@@ -1230,6 +1255,10 @@ def InstallTIFF(context, force, buildArgs):
         else:
             extraArgs = []
         extraArgs += buildArgs
+
+        # For compatibility with CMake 4+
+        extraArgs.append("-DCMAKE_POLICY_VERSION_MINIMUM=3.5")
+
         RunCMake(context, force, extraArgs)
 
 TIFF = Dependency("TIFF", InstallTIFF, "include/tiff.h")
@@ -1467,10 +1496,15 @@ def InstallOpenSubdiv(context, force, buildArgs):
             '-DNO_PTEX=ON',
             '-DNO_TBB=ON',
         ]
+        # Note: Emscripten toolchain file will check presence of
+        # '-sMEMORY64=1' in 'CMAKE_C_FLAGS' to determine if a
+        # 64 bit build is to be performed
         if context.targetWasm:
+            compileFlags, _ = GetWasmCompilerFlags(context.buildTarget)
+
             extraArgs.append('-DBUILD_SHARED_LIB=OFF')
-            extraArgs.append('-DCMAKE_CXX_FLAGS="-pthread"')
-            extraArgs.append('-DCMAKE_C_FLAGS="-pthread"')
+            extraArgs.append('-DCMAKE_CXX_FLAGS="{}"'.format(compileFlags))
+            extraArgs.append('-DCMAKE_C_FLAGS="{}"'.format(compileFlags))
             extraArgs.append('-DNO_METAL=ON')
 
         # Use Metal for macOS and all Apple embedded systems.
@@ -1885,6 +1919,12 @@ def InstallUSD(context, force, buildArgs):
 
             extraArgs.append('-DBUILD_SHARED_LIBS=OFF')
 
+            compileFlags, linkFlags = GetWasmCompilerFlags(context.buildTarget)
+
+            extraArgs.append('-DCMAKE_CXX_FLAGS="{}"'.format(compileFlags))
+            extraArgs.append('-DCMAKE_C_FLAGS="{}"'.format(compileFlags))
+            extraArgs.append('-DCMAKE_EXE_LINKER_FLAGS="{}"'.format(linkFlags))
+
         RunCMake(context, force, extraArgs, context.usdInstDir)
 
 USD = Dependency("USD", InstallUSD, "include/pxr/pxr.h")
@@ -2346,7 +2386,8 @@ def __init__(self, args):
 
         self.ignorePaths = args.ignore_paths or []
         # Build target and code signing
-        self.targetWasm = (args.build_target == TARGET_WASM)
+        self.targetWasm = (args.build_target == TARGET_WASM or 
+                           args.build_target == TARGET_WASM64)
         self.buildTarget = args.build_target
         if MacOS():
             apple_utils.SetTarget(self, self.buildTarget)

build_scripts/build_usd.py

@@ -28,7 +28,7 @@ if(APPLE)
 endif()
 
 if(EMSCRIPTEN)
-    set(EMSCRIPTEN_COMPILE_FLAGS "-sMAXIMUM_MEMORY=4GB -fexceptions")
+    set(EMSCRIPTEN_COMPILE_FLAGS "-fexceptions")
     add_compile_options("SHELL:${EMSCRIPTEN_COMPILE_FLAGS}")
     add_link_options("SHELL:${EMSCRIPTEN_COMPILE_FLAGS} -sALLOW_MEMORY_GROWTH=1")
 endif()

cmake/defaults/ProjectDefaults.cmake

@@ -6,7 +6,7 @@
 #
 # Versioning information
 set(PXR_MAJOR_VERSION "0")
-set(PXR_MINOR_VERSION "25")
-set(PXR_PATCH_VERSION "11") # NOTE: Must not have leading 0 for single digits
+set(PXR_MINOR_VERSION "26")
+set(PXR_PATCH_VERSION "2") # NOTE: Must not have leading 0 for single digits
 
 math(EXPR PXR_VERSION "${PXR_MAJOR_VERSION} * 10000 + ${PXR_MINOR_VERSION} * 100 + ${PXR_PATCH_VERSION}")

cmake/defaults/Version.cmake

@@ -735,6 +735,34 @@ function(_pxr_install_rpath rpathRef NAME)
     )
 endfunction()
 
+# Sets up an install rule to copy assets from the source tree into the
+# ctest folder in the install location. These files are copied at runtime into
+# a temporary directory by the test runner before each test is run.
+function(_pxr_install_test_dir)
+    if (NOT PXR_BUILD_TESTS)
+        return()
+    endif()
+
+    # If the package for this test does not have a target it must not be
+    # getting built, in which case we can skip building associated tests.
+    if (NOT TARGET ${PXR_PACKAGE})
+        return()
+    endif()
+
+    cmake_parse_arguments(bt
+        "" 
+        "SRC;DEST"
+        ""
+        ${ARGN}
+    )
+
+    # XXX -- We shouldn't have to install to run tests.
+    install(
+        DIRECTORY ${bt_SRC}/
+        DESTINATION tests/ctest/${bt_DEST}
+    )
+endfunction() # _pxr_install_test_dir
+
 # Split the library (target) names in libs into internal-to-the-monolithic-
 # library and external-of-it lists.
 function(_pxr_split_libraries libs internal_result external_result)

cmake/macros/Private.cmake

@@ -728,15 +728,8 @@ function(pxr_test_scripts)
 endfunction() # pxr_test_scripts
 
 function(pxr_install_test_dir)
-    if (NOT PXR_BUILD_TESTS)
-        return()
-    endif()
-
-    # If the package for this test does not have a target it must not be
-    # getting built, in which case we can skip building associated tests.
-    if (NOT TARGET ${PXR_PACKAGE})
-        return()
-    endif()
+    message(DEPRECATION "Please use the TESTENV parameter of pxr_register_test "
+                        "to specify test asset directories.")
 
     cmake_parse_arguments(bt
         "" 
@@ -745,10 +738,9 @@ function(pxr_install_test_dir)
         ${ARGN}
     )
 
-    # XXX -- We shouldn't have to install to run tests.
-    install(
-        DIRECTORY ${bt_SRC}/
-        DESTINATION tests/ctest/${bt_DEST}
+    _pxr_install_test_dir(
+        SRC ${bt_SRC}
+        DEST ${bt_DEST}
     )
 endfunction() # pxr_install_test_dir
 
@@ -773,7 +765,7 @@ function(pxr_register_test TEST_NAME)
             FILES_EXIST FILES_DONT_EXIST
             CLEAN_OUTPUT
             EXPECTED_RETURN_CODE
-            TESTENV
+            TESTENV TESTENV_DEST
             WARN WARN_PERCENT HARD_WARN FAIL FAIL_PERCENT HARD_FAIL)
     set(MULTI_VALUE_ARGS DIFF_COMPARE IMAGE_DIFF_COMPARE ENV PRE_PATH POST_PATH)
 
@@ -842,13 +834,34 @@ function(pxr_register_test TEST_NAME)
         set(testWrapperCmd ${testWrapperCmd} --post-command-stderr-redirect=${bt_POST_COMMAND_STDERR_REDIRECT})
     endif()
 
-    # Not all tests will have testenvs, but if they do let the wrapper know so
-    # it can copy the testenv contents into the run directory. By default,
-    # assume the testenv has the same name as the test but allow it to be
-    # overridden by specifying TESTENV.
+    # Determine test environment directory and set up any necessary
+    # directory copying during the install step. testenvDir is passed to the
+    # test wrapper so it can copy the testenv contents into the run directory.
     if (bt_TESTENV)
-        set(testenvDir ${CMAKE_INSTALL_PREFIX}/tests/ctest/${bt_TESTENV})
-    else()
+        if (bt_TESTENV_DEST)
+            # if a dest directory is specified, then we will assume that it
+            # will contain a folder with ${TEST_NAME} in its path which will
+            # be set as the testenvDir below. This is currently only used
+            # for a few specific tests and in general we prefer to use the
+            # automatic method below.
+            _pxr_install_test_dir(SRC ${bt_TESTENV} DEST ${bt_TESTENV_DEST})
+        else()
+            # when using the testenv without a specific destination set, we
+            # want to set the testenvDir to the folder name of the testenv dir
+            # we copied. This allows multiple tests to reference the same set
+            # of test files even though their test name will be different.
+            cmake_path(GET bt_TESTENV FILENAME testNameDir)
+            _pxr_install_test_dir(SRC ${bt_TESTENV} DEST ${testNameDir})
+            set(testenvDir ${CMAKE_INSTALL_PREFIX}/tests/ctest/${testNameDir})
+        endif()
+    endif()
+
+    # By default we will simply use the test name for the testenvDir. In
+    # the case that  no testenv is specified, this will point to a non
+    # existant folder and no copy will be executed. In the case where a
+    # destination was explicitly specified, the directory which matches
+    # the test name and its contents will be recursively copied.
+    if (NOT DEFINED testenvDir)
         set(testenvDir ${CMAKE_INSTALL_PREFIX}/tests/ctest/${TEST_NAME})
     endif()
 
@@ -1202,6 +1215,26 @@ function(pxr_toplevel_epilogue)
             )
         endif()
 
+        # When building a monolithic library (static or shared) we want all
+        # API functions to be exported. So add FOO_EXPORTS=1 for every
+        # library in PXR_OBJECT_LIBS, where FOO is the uppercase version
+        # of the library name, to every library in PXR_OBJECT_LIBS.
+        set(exports "")
+        foreach(lib ${PXR_OBJECT_LIBS})
+            string(TOUPPER ${lib} uppercaseName)
+            list(APPEND exports "${uppercaseName}_EXPORTS=1")
+        endforeach()
+
+        if (TARGET python)
+            # The boost python target uses a different export macro so
+            # add that as well.
+            list(APPEND exports "PXR_BOOST_PYTHON_SOURCE=1")
+        endif()
+
+        foreach(lib ${PXR_OBJECT_LIBS})
+            target_compile_definitions(${lib} PRIVATE ${exports})
+        endforeach()
+
         if(BUILD_SHARED_LIBS)
             target_link_libraries(usd_m
                 PUBLIC
@@ -1215,13 +1248,7 @@ function(pxr_toplevel_epilogue)
             _pxr_add_rpath(rpath "${CMAKE_INSTALL_PREFIX}/lib")
             _pxr_install_rpath(rpath usd_m)
         else()
-            # When building a static monolithic library we want all API functions to be
-            # exported. So add FOO_EXPORTS=1 for every library in PXR_OBJECT_LIBS,
-            # where FOO is the uppercase version of the library name, to every
-            # library in PXR_OBJECT_LIBS.
             foreach(lib ${PXR_OBJECT_LIBS})
-                string(TOUPPER ${lib} uppercaseName)
-                target_compile_definitions(${lib} PRIVATE "${uppercaseName}_EXPORTS=1")
                 target_link_libraries(usd_m
                     PUBLIC
                         ${lib}

cmake/macros/Public.cmake

@@ -5,6 +5,11 @@
     --monospace: ui-monospace, -apple-system-ui-serif, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", Courier, 'Andale Mono', 'Ubuntu Mono', monospace;
 }
 
+.document {
+  container-type: inline-size;
+  container-name: document;
+}
+
 body, .rst-content {
     font-family: var(--san-serif);
 }
@@ -37,6 +42,10 @@ h4 {
   text-decoration: underline;
 }
 
+.mono {
+  overflow-wrap: break-word;
+}
+
 .mono, .rst-content .linenodiv pre, .rst-content div[class^=highlight] pre, .rst-content pre.literal-block {
   font-family: var(--monospace)
 }
@@ -153,3 +162,24 @@ div.usd-tutorial-admonition > p {
   color: #6A0E0E;
 } 
 
+@container document (max-width: 72rem) {
+  .fourcolumn {
+    -webkit-column-count: 3; /* Chrome, Safari, Opera */
+    -moz-column-count: 3; /* Firefox */
+    column-count: 3;
+  }
+}
+
+@container document (max-width: 48rem) {
+  .fourcolumn {
+    -webkit-column-count: 2; /* Chrome, Safari, Opera */
+    -moz-column-count: 2; /* Firefox */
+    column-count: 2;
+  }
+
+  .threecolumn {
+    -webkit-column-count: 2; /* Chrome, Safari, Opera */
+    -moz-column-count: 2; /* Firefox */
+    column-count: 2;
+  }
+}