godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

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 << ")";
 ...

(cherry picked from commit c24ea0ecca)
This commit is contained in:
Daniel Opitz 2024-05-13 10:17:51 +02:00 committed by Rémi Verschelde
parent 0f170e6ff4
commit 6933fd9e38
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
thirdparty/embree/kernels/geometry/pointi.h vendored
View File

@ -210,9 +210,9 @@ namespace embree
}; };
/*! output operator */ /*! 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: public:

2
thirdparty/embree/kernels/subdiv/bezier_curve.h vendored
View File

@ -135,7 +135,7 @@ namespace embree
} }
friend embree_ostream operator<<(embree_ostream cout, const QuadraticBezierCurve& a) { 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 << ")";
} }
}; };