godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #92993 from capnm/240610-embree-error-hotfix 

CI: Hotfix for build error with newer clang++
This commit is contained in:
Rémi Verschelde 2024-06-11 10:49:07 +02:00
parent 7359423b16 c24ea0ecca
commit 4223444d87
No known key found for this signature in database
GPG Key ID: C3336907360768E1
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 << ")";
} }
}; };