Skip to content

Commit 03beaab

Browse files
brechtvlbrechtvl
committed
Merge branch 'dev' into fix-core-profile
2 parents cf64b5e + 434dfd5 commit 03beaab

File tree

635 files changed

+25618
-5233
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

635 files changed

+25618
-5233
lines changed

‎VERSIONS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Our test machines have the following software versions installed.
2626
| Ptex | 2.4.2 | 2.4.2 | 2.4.2 |
2727
| Qt for Python | PySide2 5.15.2.1 | PySide6 6.3.1 | PySide2 5.15.2.1 |
2828
| PyOpenGL | 3.1.5 | 3.1.5 | 3.1.5 |
29-
| Embree | 3.2.2 | 3.13.3 | 3.2.2 |
29+
| Embree | 4.3.3 | 4.3.3 | 4.3.3 |
3030
| RenderMan | 25.3 | 25.3 | 25.3 |
3131
| Alembic | 1.8.5 | 1.8.5 | 1.8.5 |
3232
| OpenEXR | 3.1.13 | 3.1.13 | 3.1.13 |

‎build_scripts/build_usd.py‎

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1573,36 +1573,17 @@ def InstallMaterialX(context, force, buildArgs):
15731573

15741574
############################################################
15751575
# Embree
1576-
# For MacOS we use version 3.13.3 to include a fix from Intel
1577-
# to build on Apple Silicon.
1578-
if MacOS():
1579-
EMBREE_URL = "https://github.com/embree/embree/archive/v3.13.3.zip"
1580-
else:
1581-
EMBREE_URL = "https://github.com/embree/embree/archive/v3.2.2.zip"
15821576

15831577
def InstallEmbree(context, force, buildArgs):
1578+
EMBREE_URL = "https://github.com/RenderKit/embree/archive/refs/tags/v4.3.3.zip"
1579+
15841580
with CurrentWorkingDirectory(DownloadURL(EMBREE_URL, context, force)):
15851581
extraArgs = [
1586-
'-DTBB_ROOT={instDir}'.format(instDir=context.instDir),
1582+
'-DTBB_ROOT="{instDir}"'.format(instDir=context.instDir),
15871583
'-DEMBREE_TUTORIALS=OFF',
15881584
'-DEMBREE_ISPC_SUPPORT=OFF'
15891585
]
15901586
if MacOS():
1591-
# Backport fix for clang build errors in debug output operators
1592-
# to Embree 3.13.3. This is fixed in Embree 4.3.2.
1593-
# https://github.com/RenderKit/embree/issues/486
1594-
PatchFile("kernels/subdiv/bezier_curve.h",
1595-
[('return cout << "QuadraticBezierCurve ( (" << a.u.lower << ", " << a.u.upper << "), " << a.v0 << ", " << a.v1 << ", " << a.v2 << ")";',
1596-
'return cout << "QuadraticBezierCurve (" << a.v0 << ", " << a.v1 << ", " << a.v2 << ")";'),
1597-
]
1598-
)
1599-
PatchFile("kernels/geometry/pointi.h",
1600-
[("friend __forceinline embree_ostream operator<<(embree_ostream cout, const PointMi& line)",
1601-
"friend __forceinline embree_ostream operator<<(embree_ostream cout, const PointMi& point)"),
1602-
('return cout << "Line" << M << "i {" << line.v0 << ", " << line.geomID() << ", " << line.primID() << "}";',
1603-
'return cout << "Point" << M << "i {" << point.geomID() << ", " << point.primID() << "}";')
1604-
]
1605-
)
16061587
# Suppress clang build warnings as errors
16071588
PatchFile("kernels/CMakeLists.txt",
16081589
[("DISABLE_STACK_PROTECTOR_FOR_INTERSECTORS(${EMBREE_LIBRARY_FILES})\n"
@@ -1621,7 +1602,8 @@ def InstallEmbree(context, force, buildArgs):
16211602

16221603
RunCMake(context, force, extraArgs)
16231604

1624-
EMBREE = Dependency("Embree", InstallEmbree, "include/embree3/rtcore.h")
1605+
EMBREE = Dependency("Embree", InstallEmbree,
1606+
"include/embree4/rtcore.h")
16251607

16261608
############################################################
16271609
# AnimX
@@ -2479,11 +2461,6 @@ def ForceBuildDependency(self, dep):
24792461
PrintError("Draco plugin can not be enabled for monolithic build on Windows")
24802462
sys.exit(1)
24812463

2482-
# The versions of Embree we currently support do not support oneTBB.
2483-
if context.buildOneTBB and context.buildEmbree:
2484-
PrintError("Embree support cannot be enabled when building against oneTBB")
2485-
sys.exit(1)
2486-
24872464
# Windows ARM64 requires oneTBB. Since oneTBB is a non-standard option for the
24882465
# currently aligned version of the VFX Reference Platform, we error out and
24892466
# require the user to explicitly specify --onetbb instead of silently switching

‎cmake/defaults/Version.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
# Versioning information
88
set(PXR_MAJOR_VERSION "0")
99
set(PXR_MINOR_VERSION "25")
10-
set(PXR_PATCH_VERSION "8") # NOTE: Must not have leading 0 for single digits
10+
set(PXR_PATCH_VERSION "11") # NOTE: Must not have leading 0 for single digits
1111

1212
math(EXPR PXR_VERSION "${PXR_MAJOR_VERSION} * 10000 + ${PXR_MINOR_VERSION} * 100 + ${PXR_PATCH_VERSION}")

‎cmake/defaults/gccdefaults.cmake‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,11 @@ endif()
2323
# See https://gcc.gnu.org/bugzilla/buglist.cgi?quicksearch=maybe%20uninitialized&list_id=394666
2424
_disable_warning("maybe-uninitialized")
2525

26+
# TBB's concurrent_hash_map.h generates class-memaccess warnings on gcc with -Wall.
27+
# The header is consumed in many targets, so we disable it globally for now until we
28+
# update to a version of TBB that no longer generates this warning.
29+
#
30+
# See https://github.com/uxlfoundation/oneTBB/issues/307
31+
_disable_warning("class-memaccess")
32+
2633
set(_PXR_CXX_FLAGS "${_PXR_GCC_CLANG_SHARED_CXX_FLAGS}")

‎cmake/modules/FindEmbree.cmake‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
#=============================================================================
2121

2222
if (APPLE)
23-
set (EMBREE_LIB_NAME libembree3.dylib)
23+
set (EMBREE_LIB_NAME libembree4.dylib)
2424
elseif (UNIX)
25-
set (EMBREE_LIB_NAME libembree3.so)
25+
set (EMBREE_LIB_NAME libembree4.so)
2626
elseif (WIN32)
27-
set (EMBREE_LIB_NAME embree3.lib)
27+
set (EMBREE_LIB_NAME embree4.lib)
2828
endif()
2929

3030
find_library(EMBREE_LIBRARY
@@ -39,20 +39,20 @@ find_library(EMBREE_LIBRARY
3939
)
4040

4141
find_path(EMBREE_INCLUDE_DIR
42-
embree3/rtcore.h
42+
embree4/rtcore.h
4343
HINTS
4444
"${EMBREE_LOCATION}/include"
4545
"$ENV{EMBREE_LOCATION}/include"
4646
DOC
4747
"Embree headers path"
4848
)
4949

50-
if (EMBREE_INCLUDE_DIR AND EXISTS "${EMBREE_INCLUDE_DIR}/embree3/rtcore_version.h" )
51-
file(STRINGS "${EMBREE_INCLUDE_DIR}/embree3/rtcore_version.h" TMP REGEX "^#define RTC_VERSION_MAJOR.*$")
50+
if (EMBREE_INCLUDE_DIR AND EXISTS "${EMBREE_INCLUDE_DIR}/embree4/rtcore_config.h" )
51+
file(STRINGS "${EMBREE_INCLUDE_DIR}/embree4/rtcore_config.h" TMP REGEX "^#define RTC_VERSION_MAJOR.*$")
5252
string(REGEX MATCHALL "[0-9]+" MAJOR ${TMP})
53-
file(STRINGS "${EMBREE_INCLUDE_DIR}/embree3/rtcore_version.h" TMP REGEX "^#define RTC_VERSION_MINOR.*$")
53+
file(STRINGS "${EMBREE_INCLUDE_DIR}/embree4/rtcore_config.h" TMP REGEX "^#define RTC_VERSION_MINOR.*$")
5454
string(REGEX MATCHALL "[0-9]+" MINOR ${TMP})
55-
file(STRINGS "${EMBREE_INCLUDE_DIR}/embree3/rtcore_version.h" TMP REGEX "^#define RTC_VERSION_PATCH.*$")
55+
file(STRINGS "${EMBREE_INCLUDE_DIR}/embree4/rtcore_config.h" TMP REGEX "^#define RTC_VERSION_PATCH.*$")
5656
string(REGEX MATCHALL "[0-9]+" PATCH ${TMP})
5757

5858
set (EMBREE_VERSION ${MAJOR}.${MINOR}.${PATCH})

‎docs/performance/25.08_macos_alab.yaml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
bring_up_the_ui:
2-
max: 0.715789
3-
mean: 0.65744214
4-
min: 0.625508
2+
max: 0.810602
3+
mean: 0.77272948
4+
min: 0.746893
55
close_stage:
6-
max: 0.048991
7-
mean: 0.03884433
8-
min: 0.032612
6+
max: 0.04918
7+
mean: 0.0390062
8+
min: 0.034247
99
configure_and_load_plugins:
10-
max: 0.000163
11-
mean: 8.081000000000001e-05
12-
min: 7.2e-05
10+
max: 0.000128
11+
mean: 7.747e-05
12+
min: 7.1e-05
1313
create_first_image:
14-
max: N/A
15-
mean: N/A
16-
min: N/A
14+
max: 3.368372
15+
mean: 2.89288254
16+
min: 2.657903
1717
open_and_close_usdview:
18-
max: 5.98781
19-
mean: 5.76950674
20-
min: 5.533854
18+
max: 6.330425
19+
mean: 5.82210685
20+
min: 5.583791
2121
open_stage:
22-
max: 0.46994
23-
mean: 0.41664456
24-
min: 0.392859
22+
max: 0.493983
23+
mean: 0.45685697
24+
min: 0.428753
2525
reset_prim_browser:
26-
max: 0.001075
27-
mean: 0.00079793
28-
min: 0.000764
26+
max: 0.001009
27+
mean: 0.00079992
28+
min: 0.000768
2929
shut_down_hydra:
30-
max: 0.145758
31-
mean: 0.13353185
32-
min: 0.119319
30+
max: 0.156347
31+
mean: 0.14399794999999999
32+
min: 0.132151
3333
tear_down_the_ui:
34-
max: 0.017487
35-
mean: 0.01443295
36-
min: 0.011788
34+
max: 0.017357
35+
mean: 0.01541444
36+
min: 0.012482
3737
traverse_stage:
38-
max: 0.00362
39-
mean: 0.00291495
40-
min: 0.002507
38+
max: 0.003775
39+
mean: 0.00304707
40+
min: 0.002934

‎docs/performance/25.08_macos_kitchenset.yaml‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
bring_up_the_ui:
2-
max: 0.315408
3-
mean: 0.29421102
4-
min: 0.285745
2+
max: 0.401326
3+
mean: 0.37004813000000003
4+
min: 0.361645
55
close_stage:
6-
max: 0.003614
7-
mean: 0.00246525
8-
min: 0.002068
6+
max: 0.00337
7+
mean: 0.00238007
8+
min: 0.002052
99
configure_and_load_plugins:
1010
max: 0.000115
11-
mean: 7.921e-05
12-
min: 7.3e-05
11+
mean: 7.825e-05
12+
min: 7.2e-05
1313
create_first_image:
14-
max: N/A
15-
mean: N/A
16-
min: N/A
14+
max: 0.28059
15+
mean: 0.27415653
16+
min: 0.267277
1717
open_and_close_usdview:
18-
max: 0.741258
19-
mean: 0.71475806
20-
min: 0.699489
18+
max: 0.884275
19+
mean: 0.85272668
20+
min: 0.829283
2121
open_stage:
22-
max: 0.091097
23-
mean: 0.07023873
24-
min: 0.063025
22+
max: 0.092138
23+
mean: 0.07211904
24+
min: 0.062594
2525
reset_prim_browser:
26-
max: 0.000693
27-
mean: 0.0005058
28-
min: 0.000476
26+
max: 0.000611
27+
mean: 0.00049297
28+
min: 0.000471
2929
shut_down_hydra:
30-
max: 0.027748
31-
mean: 0.02143834
32-
min: 0.016104
30+
max: 0.028413
31+
mean: 0.02203196
32+
min: 0.01597
3333
tear_down_the_ui:
34-
max: 0.017842
35-
mean: 0.01369398
36-
min: 0.011391
34+
max: 0.015908
35+
mean: 0.01374634
36+
min: 0.012352
3737
traverse_stage:
38-
max: 0.000748
39-
mean: 0.00056266
40-
min: 0.000532
38+
max: 0.000742
39+
mean: 0.00056883
40+
min: 0.000546

‎docs/performance/25.08_macos_moorelane.yaml‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
bring_up_the_ui:
2-
max: 0.5292
3-
mean: 0.49018344
4-
min: 0.447203
2+
max: 0.552822
3+
mean: 0.53779607
4+
min: 0.529111
55
close_stage:
6-
max: 0.00931
7-
mean: 0.00404583
8-
min: 0.003274
6+
max: 0.008957
7+
mean: 0.00411859
8+
min: 0.003404
99
configure_and_load_plugins:
10-
max: 8.7e-05
11-
mean: 7.707e-05
10+
max: 0.000102
11+
mean: 7.807e-05
1212
min: 7.2e-05
1313
create_first_image:
14-
max: N/A
15-
mean: N/A
16-
min: N/A
14+
max: 5.759676
15+
mean: 5.24863536
16+
min: 4.769172
1717
open_and_close_usdview:
18-
max: 9.234204
19-
mean: 8.64364932
20-
min: 8.251155
18+
max: 9.048722
19+
mean: 8.50882737
20+
min: 7.953749
2121
open_stage:
22-
max: 0.089193
23-
mean: 0.08186438
24-
min: 0.079864
22+
max: 0.086238
23+
mean: 0.08345228
24+
min: 0.081982
2525
reset_prim_browser:
26-
max: 0.005433
27-
mean: 0.00489295
28-
min: 0.004701
26+
max: 0.005299
27+
mean: 0.00486792
28+
min: 0.004709
2929
shut_down_hydra:
30-
max: 0.126883
31-
mean: 0.11503616
32-
min: 0.108814
30+
max: 0.153164
31+
mean: 0.12138309
32+
min: 0.114935
3333
tear_down_the_ui:
34-
max: 0.042262
35-
mean: 0.038801
36-
min: 0.036354
34+
max: 0.041735
35+
mean: 0.03945752
36+
min: 0.03724
3737
traverse_stage:
38-
max: 0.000839
39-
mean: 0.00060817
40-
min: 0.000553
38+
max: 0.000857
39+
mean: 0.00060229
40+
min: 0.000579

0 commit comments

Comments
 (0)