Sara/authority
1
0
Fork 0
Code Issues 7 Pull requests Projects 2 Releases Packages Wiki Activity Actions

feat: updated engine version to 4.4-rc1

Browse source
This commit is contained in:
Sara 2025-02-23 14:38:14 +01:00
parent ee00efde1f
commit 21ba8e33af
5459 changed files with 1128836 additions and 198305 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engine/thirdparty/embree/kernels/bvh/bvh_statistics.cpp vendored
View file

@ -150,10 +150,8 @@ namespace embree
}
}
else {
// -- GODOT start --
// throw std::runtime_error("not supported node type in bvh_statistics");
//throw std::runtime_error("not supported node type in bvh_statistics");
abort();
// -- GODOT end --
}
return s;
}

12
engine/thirdparty/embree/kernels/common/alloc.h vendored
View file

@ -189,13 +189,11 @@ namespace embree
, atype(osAllocation ? EMBREE_OS_MALLOC : ALIGNED_MALLOC)
, primrefarray(device,0)
{
// -- GODOT start --
// if (osAllocation && useUSM)
// throw std::runtime_error("USM allocation cannot be combined with OS allocation.");
//if (osAllocation && useUSM)
// throw std::runtime_error("USM allocation cannot be combined with OS allocation.");
if (osAllocation && useUSM) {
abort();
}
// -- GODOT end --
for (size_t i=0; i<MAX_THREAD_USED_BLOCK_SLOTS; i++)
{
@ -507,13 +505,11 @@ namespace embree
Block* myUsedBlocks = threadUsedBlocks[slot];
if (myUsedBlocks) {
void* ptr = myUsedBlocks->malloc(device,bytes,align,partial);
// -- GODOT start --
// if (ptr == nullptr && !blockAllocation)
// throw std::bad_alloc();
//if (ptr == nullptr && !blockAllocation)
// throw std::bad_alloc();
if (ptr == nullptr && !blockAllocation) {
abort();
}
// -- GODOT end --
if (ptr) return ptr;
}

22
engine/thirdparty/embree/kernels/common/rtcore.cpp vendored
View file

@ -257,17 +257,15 @@ RTC_NAMESPACE_BEGIN;
RTC_TRACE(rtcSetSceneBuildQuality);
RTC_VERIFY_HANDLE(hscene);
RTC_ENTER_DEVICE(hscene);
// -- GODOT start --
// if (quality != RTC_BUILD_QUALITY_LOW &&
// quality != RTC_BUILD_QUALITY_MEDIUM &&
// quality != RTC_BUILD_QUALITY_HIGH)
// throw std::runtime_error("invalid build quality");
//if (quality != RTC_BUILD_QUALITY_LOW &&
// quality != RTC_BUILD_QUALITY_MEDIUM &&
// quality != RTC_BUILD_QUALITY_HIGH)
// throw std::runtime_error("invalid build quality");
if (quality != RTC_BUILD_QUALITY_LOW &&
quality != RTC_BUILD_QUALITY_MEDIUM &&
quality != RTC_BUILD_QUALITY_HIGH) {
abort();
}
// -- GODOT end --
scene->setBuildQuality(quality);
RTC_CATCH_END2(scene);
}
@ -1570,19 +1568,17 @@ RTC_API void rtcSetGeometryTransform(RTCGeometry hgeometry, unsigned int timeSte
RTC_TRACE(rtcSetGeometryBuildQuality);
RTC_VERIFY_HANDLE(hgeometry);
RTC_ENTER_DEVICE(hgeometry);
// -- GODOT start --
// if (quality != RTC_BUILD_QUALITY_LOW &&
// quality != RTC_BUILD_QUALITY_MEDIUM &&
// quality != RTC_BUILD_QUALITY_HIGH &&
// quality != RTC_BUILD_QUALITY_REFIT)
// throw std::runtime_error("invalid build quality");
//if (quality != RTC_BUILD_QUALITY_LOW &&
// quality != RTC_BUILD_QUALITY_MEDIUM &&
// quality != RTC_BUILD_QUALITY_HIGH &&
// quality != RTC_BUILD_QUALITY_REFIT)
// throw std::runtime_error("invalid build quality");
if (quality != RTC_BUILD_QUALITY_LOW &&
quality != RTC_BUILD_QUALITY_MEDIUM &&
quality != RTC_BUILD_QUALITY_HIGH &&
quality != RTC_BUILD_QUALITY_REFIT) {
abort();
}
// -- GODOT end --
geometry->setBuildQuality(quality);
RTC_CATCH_END2(geometry);
}

20
engine/thirdparty/embree/kernels/common/rtcore.h vendored
View file

@ -13,13 +13,13 @@ namespace embree
__forceinline bool isIncoherent(RTCRayQueryFlags flags) { return (flags & RTC_RAY_QUERY_FLAG_COHERENT) == RTC_RAY_QUERY_FLAG_INCOHERENT; }
/*! Macros used in the rtcore API implementation */
// -- GODOT start --
#define RTC_CATCH_BEGIN
#define RTC_CATCH_END(device)
#define RTC_CATCH_END2(scene)
#define RTC_CATCH_END2_FALSE(scene) return false;
#if 0
// -- GODOT end --
#if 1
# define RTC_CATCH_BEGIN
# define RTC_CATCH_END(device)
# define RTC_CATCH_END2(scene)
# define RTC_CATCH_END2_FALSE(scene) return false;
#else
#define RTC_CATCH_BEGIN try {
#define RTC_CATCH_END(device) \
@ -94,7 +94,6 @@ namespace embree
#define RTC_TRACE(x)
#endif
// -- GODOT start --
#if 0
/*! used to throw embree API errors */
struct rtcore_error : public std::exception
@ -116,13 +115,12 @@ namespace embree
#if defined(DEBUG) // only report file and line in debug mode
#define throw_RTCError(error,str) \
printf("%s (%d): %s", __FILE__, __LINE__, std::string(str).c_str()), abort();
// throw rtcore_error(error,std::string(__FILE__) + " (" + toString(__LINE__) + "): " + std::string(str));
//throw rtcore_error(error,std::string(__FILE__) + " (" + toString(__LINE__) + "): " + std::string(str));
#else
#define throw_RTCError(error,str) \
abort();
// throw rtcore_error(error,str);
//throw rtcore_error(error,str);
#endif
// -- GODOT end --
#define RTC_BUILD_ARGUMENTS_HAS(settings,member) \
(settings.byteSize > (offsetof(RTCBuildArguments,member)+sizeof(settings.member)))

18
engine/thirdparty/embree/kernels/common/scene.cpp vendored
View file

@ -894,18 +894,16 @@ namespace embree
}
/* initiate build */
// -- GODOT start --
// try {
//try {
TaskScheduler::TaskGroupContext context;
scheduler->spawn_root([&]() { commit_task(); Lock<MutexSys> lock(taskGroup->schedulerMutex); taskGroup->scheduler = nullptr; }, &context, 1, !join);
// }
// catch (...) {
// accels_clear();
// Lock<MutexSys> lock(taskGroup->schedulerMutex);
// taskGroup->scheduler = nullptr;
// throw;
// }
// -- GODOT end --
//}
//catch (...) {
// accels_clear();
// Lock<MutexSys> lock(taskGroup->schedulerMutex);
// taskGroup->scheduler = nullptr;
// throw;
//}
}
#endif

14
engine/thirdparty/embree/kernels/common/state.cpp vendored
View file

@ -194,15 +194,13 @@ namespace embree
bool State::parseFile(const FileName& fileName)
{
Ref<Stream<int> > file;
// -- GODOT start --
// try {
//try {
file = new FileStream(fileName);
// }
// catch (std::runtime_error& e) {
// (void) e;
// return false;
// }
// -- GODOT end --
//}
//catch (std::runtime_error& e) {
// (void) e;
// return false;
//}
std::vector<std::string> syms;
for (size_t i=0; i<sizeof(symbols)/sizeof(void*); i++)