Skip to content

Commit 714640f

Browse files
boberflyjohnhaddon
authored andcommitted
Embree : Update to version 4.3.0
This also means disabling the Embree Hydra delegate, since that doesn't support Embree 4 yet - see PixarAnimationStudios/OpenUSD#2313 for work in progress. We put higher value in matching the Embree version to Cycles 4 than we do in having the Embree delegate in `usdview`.
1 parent 763c9ac commit 714640f

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

Changes.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
-------------
33

44
- Cortex : Updated to version 10.5.5.0.
5+
- Embree : Updated to version 4.3.0.
56
- OpenPGL : Updated to version 0.5.0.
67
- OpenVDB : Updated to version 10.1.0.
8+
- USD : Disabled Embree Hydra delegate, since it is incompatible with Embree 4.
79

810
8.0.0 alpha 3 (relative to 8.0.0 alpha 2)
911
-------------

Embree/config.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
"downloads" : [
44

5-
"https://github.com/embree/embree/archive/v3.13.4.tar.gz"
5+
"https://github.com/embree/embree/archive/v4.3.0.tar.gz"
66

77
],
88

@@ -27,6 +27,9 @@
2727
" -D EMBREE_RAY_MASK=ON"
2828
" -D EMBREE_FILTER_FUNCTION=ON"
2929
" -D EMBREE_BACKFACE_CULLING=OFF"
30+
" -D EMBREE_BACKFACE_CULLING_CURVES=ON"
31+
" -D EMBREE_BACKFACE_CULLING_SPHERES=ON"
32+
" -D EMBREE_NO_SPLASH=ON"
3033
" -D EMBREE_TASKING_SYSTEM=TBB"
3134
" ..",
3235
"cd gafferBuild && make install -j {jobs} VERBOSE=1",
@@ -35,9 +38,9 @@
3538

3639
"manifest" : [
3740

38-
"include/embree3",
41+
"include/embree4",
3942

40-
"lib/libembree3*{sharedLibraryExtension}*",
43+
"lib/libembree4*{sharedLibraryExtension}*",
4144

4245
],
4346

USD/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
" -D PXR_BUILD_TESTS=FALSE"
3838
" -D PXR_BUILD_OPENIMAGEIO_PLUGIN=TRUE"
3939
" -D PXR_BUILD_ALEMBIC_PLUGIN=TRUE"
40-
" -D PXR_BUILD_EMBREE_PLUGIN=TRUE"
40+
" -D PXR_BUILD_EMBREE_PLUGIN=FALSE"
4141
" -D PXR_ENABLE_HDF5_SUPPORT=FALSE"
4242
" -D PXR_ENABLE_MATERIALX_SUPPORT=TRUE"
4343
" -D MATERIALX_STDLIB_DIR={buildDir}/materialX"

0 commit comments

Comments
 (0)