tags/v2.83.2 - embree release reissued, breaks build (changed source archive md5) #78775

New Issue

Paul Bransford · 2020-07-09T21:12:11+02:00

Paul Bransford commented

2020-07-09 21:12:11 +02:00

System Information
Operating system: N/A
Graphics card: N/A

Blender Version
Broken: tags/v2.83.2
Worked: N/A

Short description of error
Build failure due to embree upstream re-issuing 3.8.0

Old md5sum: ac504d5426945fe25dec1267e0c39d52
New md5sum: 837b297bfe9c328152e9ce42c301d340

NOTICE: @LazyDodo was able to determine that the project made code-changes during this re-issuance, as they had a copy of the original release to compare with.

Exact steps for others to reproduce the error

git clone -b master --recursive git://git.blender.org/blender.git
cd blender
git checkout tags/v2.83.2
make deps

**System Information** Operating system: N/A Graphics card: N/A **Blender Version** Broken: tags/v2.83.2 Worked: N/A **Short description of error** Build failure due to embree upstream re-issuing 3.8.0 Old md5sum: ac504d5426945fe25dec1267e0c39d52 New md5sum: 837b297bfe9c328152e9ce42c301d340 NOTICE: @LazyDodo was able to determine that the project made code-changes during this re-issuance, as they had a copy of the original release to compare with. **Exact steps for others to reproduce the error** ``` git clone -b master --recursive git://git.blender.org/blender.git cd blender git checkout tags/v2.83.2 make deps ```

Paul Bransford commented

2020-07-09 21:12:11 +02:00

Added subscribers: @LazyDodo, @draeath

Paul Bransford commented

2020-07-09 21:12:40 +02:00

Assuming the upstream changes are not relevant:

diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake
index d1e729a29e5..b6aeaae4aa3 100644
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -301,7 +301,7 @@ set(SQLITE_HASH fb558c49ee21a837713c4f1e7e413309aabdd9c7)

 set(EMBREE_VERSION 3.8.0)
 set(EMBREE_URI https://github.com/embree/embree/archive/v${EMBREE_VERSION}.zip)
-set(EMBREE_HASH ac504d5426945fe25dec1267e0c39d52)
+set(EMBREE_HASH 837b297bfe9c328152e9ce42c301d340)

 set(USD_VERSION 19.11)
 set(USD_URI https://github.com/PixarAnimationStudios/USD/archive/v${USD_VERSION}.tar.gz)

Assuming the upstream changes are not relevant: ``` diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index d1e729a29e5..b6aeaae4aa3 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -301,7 +301,7 @@ set(SQLITE_HASH fb558c49ee21a837713c4f1e7e413309aabdd9c7) set(EMBREE_VERSION 3.8.0) set(EMBREE_URI https://github.com/embree/embree/archive/v${EMBREE_VERSION}.zip) -set(EMBREE_HASH ac504d5426945fe25dec1267e0c39d52) +set(EMBREE_HASH 837b297bfe9c328152e9ce42c301d340) set(USD_VERSION 19.11) set(USD_URI https://github.com/PixarAnimationStudios/USD/archive/v${USD_VERSION}.tar.gz) ```

Paul Bransford commented

2020-07-09 21:13:52 +02:00

This comment was removed by @draeath

*This comment was removed by @draeath*

Ray molenkamp commented

2020-07-09 21:15:42 +02:00

Added subscribers: @Stefan_Werner, @brecht

Ray molenkamp commented

2020-07-09 21:15:43 +02:00

I had a copy of the of the ac504d5426945fe25dec1267e0c39d52 zip, diff between it and 837b297bfe9c328152e9ce42c301d340

diff -Naur old/CHANGELOG.md new/CHANGELOG.md
--- old/CHANGELOG.md	2020-02-03 23:01:08 -0700
+++ new/CHANGELOG.md	2020-02-03 01:19:08 -0700
@@ -1,19 +1,15 @@
 Version History
 ---------------
 
-### Embree 3.8.0
-
-#### New Features:
+### New Features in Embree 3.8.0
 -   Added collision detection support for user geometries (see rtcCollide API function)
--   Passing geomID to user geometry callbacks.
-
-#### Fixed Issues:
+-   RTCIntersectContext always non-const in Embree API
+-   Made RTCHit aligned to 16 bytes in Embree API
 -   Bugfix in AVX512VL codepath for rtcIntersect1
 -   For sphere geometries the intersection filter gets now invoked for
     front and back hit.
+-   Passing geomID to user geometry callbacks.
 -   Fixed some bugs for quaternion motion blur.
--   RTCIntersectContext always non-const in Embree API
--   Made RTCHit aligned to 16 bytes in Embree API
 
 ### New Features in Embree 3.7.0
 -   Added quaternion motion blur for correct interpolation of rotational transformations.
diff -Naur old/doc/src/changelog.md new/doc/src/changelog.md
--- old/doc/src/changelog.md	2020-02-03 23:01:08 -0700
+++ new/doc/src/changelog.md	2020-02-03 01:19:08 -0700
@@ -1,19 +1,15 @@
 Version History
 ---------------
 
-### Embree 3.8.0
-
-#### New Features:
+### New Features in Embree 3.8.0
 -   Added collision detection support for user geometries (see rtcCollide API function)
--   Passing geomID to user geometry callbacks.
-
-#### Fixed Issues:
+-   RTCIntersectContext always non-const in Embree API
+-   Made RTCHit aligned to 16 bytes in Embree API
 -   Bugfix in AVX512VL codepath for rtcIntersect1
 -   For sphere geometries the intersection filter gets now invoked for
     front and back hit.
+-   Passing geomID to user geometry callbacks.
 -   Fixed some bugs for quaternion motion blur.
--   RTCIntersectContext always non-const in Embree API
--   Made RTCHit aligned to 16 bytes in Embree API
 
 ### New Features in Embree 3.7.0
 -   Added quaternion motion blur for correct interpolation of rotational transformations.
diff -Naur old/kernels/common/geometry.cpp new/kernels/common/geometry.cpp
--- old/kernels/common/geometry.cpp	2020-02-03 23:01:08 -0700
+++ new/kernels/common/geometry.cpp	2020-02-03 01:19:08 -0700
@@ -60,7 +60,6 @@
       numPrimitives(numPrimitives), numTimeSteps(unsigned(numTimeSteps)), fnumTimeSegments(float(numTimeSteps-1)), time_range(0.0f,1.0f),
       mask(-1),
       gtype(gtype),
-      gsubtype(GTY_SUBTYPE_DEFAULT),
       quality(RTC_BUILD_QUALITY_MEDIUM),
       state((unsigned)State::MODIFIED),
       enabled(true),
diff -Naur old/kernels/common/geometry.h new/kernels/common/geometry.h
--- old/kernels/common/geometry.h	2020-02-03 23:01:08 -0700
+++ new/kernels/common/geometry.h	2020-02-03 01:19:08 -0700
@@ -183,7 +183,6 @@
 
     enum GSubType
     {
-      GTY_SUBTYPE_DEFAULT= 0,
       GTY_SUBTYPE_INSTANCE_LINEAR = 0,
       GTY_SUBTYPE_INSTANCE_QUATERNION = 1
     };
diff -Naur old/readme.pdf new/readme.pdf
--- old/readme.pdf	2020-02-03 23:01:08 -0700
+++ new/readme.pdf	2020-02-03 01:19:08 -0700
<long binary diff  here>

Doesn't look super interesting change wise, but still what were they thinking?!

cc: @brecht , @Stefan_Werner

I had a copy of the of the `ac504d5426945fe25dec1267e0c39d52` zip, diff between it and `837b297bfe9c328152e9ce42c301d340` ```lines=10 diff -Naur old/CHANGELOG.md new/CHANGELOG.md --- old/CHANGELOG.md 2020-02-03 23:01:08 -0700 +++ new/CHANGELOG.md 2020-02-03 01:19:08 -0700 @@ -1,19 +1,15 @@ Version History --------------- -### Embree 3.8.0 - -#### New Features: +### New Features in Embree 3.8.0 - Added collision detection support for user geometries (see rtcCollide API function) -- Passing geomID to user geometry callbacks. - -#### Fixed Issues: +- RTCIntersectContext always non-const in Embree API +- Made RTCHit aligned to 16 bytes in Embree API - Bugfix in AVX512VL codepath for rtcIntersect1 - For sphere geometries the intersection filter gets now invoked for front and back hit. +- Passing geomID to user geometry callbacks. - Fixed some bugs for quaternion motion blur. -- RTCIntersectContext always non-const in Embree API -- Made RTCHit aligned to 16 bytes in Embree API ### New Features in Embree 3.7.0 - Added quaternion motion blur for correct interpolation of rotational transformations. diff -Naur old/doc/src/changelog.md new/doc/src/changelog.md --- old/doc/src/changelog.md 2020-02-03 23:01:08 -0700 +++ new/doc/src/changelog.md 2020-02-03 01:19:08 -0700 @@ -1,19 +1,15 @@ Version History --------------- -### Embree 3.8.0 - -#### New Features: +### New Features in Embree 3.8.0 - Added collision detection support for user geometries (see rtcCollide API function) -- Passing geomID to user geometry callbacks. - -#### Fixed Issues: +- RTCIntersectContext always non-const in Embree API +- Made RTCHit aligned to 16 bytes in Embree API - Bugfix in AVX512VL codepath for rtcIntersect1 - For sphere geometries the intersection filter gets now invoked for front and back hit. +- Passing geomID to user geometry callbacks. - Fixed some bugs for quaternion motion blur. -- RTCIntersectContext always non-const in Embree API -- Made RTCHit aligned to 16 bytes in Embree API ### New Features in Embree 3.7.0 - Added quaternion motion blur for correct interpolation of rotational transformations. diff -Naur old/kernels/common/geometry.cpp new/kernels/common/geometry.cpp --- old/kernels/common/geometry.cpp 2020-02-03 23:01:08 -0700 +++ new/kernels/common/geometry.cpp 2020-02-03 01:19:08 -0700 @@ -60,7 +60,6 @@ numPrimitives(numPrimitives), numTimeSteps(unsigned(numTimeSteps)), fnumTimeSegments(float(numTimeSteps-1)), time_range(0.0f,1.0f), mask(-1), gtype(gtype), - gsubtype(GTY_SUBTYPE_DEFAULT), quality(RTC_BUILD_QUALITY_MEDIUM), state((unsigned)State::MODIFIED), enabled(true), diff -Naur old/kernels/common/geometry.h new/kernels/common/geometry.h --- old/kernels/common/geometry.h 2020-02-03 23:01:08 -0700 +++ new/kernels/common/geometry.h 2020-02-03 01:19:08 -0700 @@ -183,7 +183,6 @@ enum GSubType { - GTY_SUBTYPE_DEFAULT= 0, GTY_SUBTYPE_INSTANCE_LINEAR = 0, GTY_SUBTYPE_INSTANCE_QUATERNION = 1 }; diff -Naur old/readme.pdf new/readme.pdf --- old/readme.pdf 2020-02-03 23:01:08 -0700 +++ new/readme.pdf 2020-02-03 01:19:08 -0700 <long binary diff here> ``` Doesn't look super interesting change wise, but still what were they thinking?! cc: @brecht , @Stefan_Werner

Jeroen Bakker commented

2020-07-09 21:49:20 +02:00

Added subscriber: @Jeroen-Bakker

blender-admin commented

2020-07-10 14:25:56 +02:00

This issue was referenced by 7329138e82

This issue was referenced by 7329138e828b5baced8baa539f6e40b0e2d4a136

Brecht Van Lommel commented

2020-07-10 14:30:58 +02:00

@Jeroen-Bakker, I committed the changed hash to blender-v2.83-release. Probably not worth mentioning in the changelog since Embree is not enabled in 2.83 builds.

Brecht Van Lommel commented

2020-07-10 14:31:55 +02:00

Changed status from 'Needs Triage' to: 'Resolved'

Brecht Van Lommel closed this issue

2020-07-10 14:31:55 +02:00

Brecht Van Lommel self-assigned this 2020-07-10 14:31:55 +02:00

Sign in to join this conversation.

No Label

Download

What's New

Blender Studio

Manual

Developers Blog

Documentation

Benchmark

Blender Conference

Development Fund

One-time Donations

tags/v2.83.2 - embree release reissued, breaks build (changed source archive md5) #78775