diff options
author | Daniel Opitz <daniel.opitz@intel.com> | 2024-05-13 10:17:51 +0200 |
---|---|---|
committer | Martin Capitanio <capnm@capitanio.org> | 2024-06-10 19:14:01 +0200 |
commit | c24ea0ecca315676ba31387bf3a277de39ba339a (patch) | |
tree | 3a372a1a6599c00c30cab847edb254c1c272ed07 /thirdparty | |
parent | 5241d30bfa223ed45784e32d8143d20a98a8d862 (diff) | |
download | redot-engine-c24ea0ecca315676ba31387bf3a277de39ba339a.tar.gz |
CI: Hotfix for build error with newer clang++
It will be included in the next release at some point.
- https://github.com/RenderKit/embree/issues 486
"fix output operator"
[ 30%] Compiling thirdparty/embree/kernels/common/accelset.cpp ...
In file included from thirdparty/embree/kernels/common/device.cpp:12:
In file included from thirdparty/embree/kernels/common/scene_curves.h:10:
thirdparty/embree/kernels/common/../subdiv/bezier_curve.h:138:56:
error: no member named 'u' in 'QuadraticBezierCurve<V>'
138 | return cout << "QuadraticBezierCurve ( (" << a.u.lower << ", "
<< a.u.upper << "), " << a.v0 << ", " << a.v1 << ", " << a.v2 << ")";
...
Diffstat (limited to 'thirdparty')
-rw-r--r-- | thirdparty/embree/kernels/geometry/pointi.h | 4 | ||||
-rw-r--r-- | thirdparty/embree/kernels/subdiv/bezier_curve.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/thirdparty/embree/kernels/geometry/pointi.h b/thirdparty/embree/kernels/geometry/pointi.h index f81edb9035..aba8ec4ab3 100644 --- a/thirdparty/embree/kernels/geometry/pointi.h +++ b/thirdparty/embree/kernels/geometry/pointi.h @@ -210,9 +210,9 @@ namespace embree }; /*! output operator */ - friend __forceinline embree_ostream operator<<(embree_ostream cout, const PointMi& line) + friend __forceinline embree_ostream operator<<(embree_ostream cout, const PointMi& point) { - return cout << "Line" << M << "i {" << line.v0 << ", " << line.geomID() << ", " << line.primID() << "}"; + return cout << "Point" << M << "i {" << point.geomID() << ", " << point.primID() << "}"; } public: diff --git a/thirdparty/embree/kernels/subdiv/bezier_curve.h b/thirdparty/embree/kernels/subdiv/bezier_curve.h index 257e0afd40..5e3b5c83b3 100644 --- a/thirdparty/embree/kernels/subdiv/bezier_curve.h +++ b/thirdparty/embree/kernels/subdiv/bezier_curve.h @@ -135,7 +135,7 @@ namespace embree } friend embree_ostream operator<<(embree_ostream cout, const QuadraticBezierCurve& a) { - return cout << "QuadraticBezierCurve ( (" << a.u.lower << ", " << a.u.upper << "), " << a.v0 << ", " << a.v1 << ", " << a.v2 << ")"; + return cout << "QuadraticBezierCurve (" << a.v0 << ", " << a.v1 << ", " << a.v2 << ")"; } }; |