GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Minor dotnet tweaks

Browse Source
This commit is contained in:
Wojtek Figat
2023-04-03 14:12:27 +02:00
parent d28be9cf44
commit 84bb56d68b
4 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Engine/Engine/NativeInterop.Unmanaged.cs
View File

@@ -496,7 +496,6 @@ namespace FlaxEngine.Interop
return ManagedHandle.Alloc(value);
}
[UnmanagedCallersOnly]
internal static ManagedHandle NewArray(ManagedHandle typeHandle, long size)
{

2
Source/Engine/Platform/UWP/UWPDefines.h
View File

@@ -11,6 +11,6 @@
// Use AOT for Mono
#define USE_MONO_AOT 1
#define USE_MONO_AOT_MODE MONO_AOT_MODE_INTERP // TODO: support Full AOT mode instead of interpreter
#define USE_MONO_AOT_MODE MONO_AOT_MODE_FULL
#endif

28
Source/Engine/Scripting/Runtime/DotNet.cpp
View File

@@ -1266,6 +1266,10 @@ void* MMethod::GetThunk()
{
static void* GetThunkPtr = GetStaticMethodPointer(TEXT("GetThunk"));
_cachedThunk = CallStaticMethod<void*, void*>(GetThunkPtr, _handle);
#if !BUILD_RELEASE
if (!_cachedThunk)
LOG(Error, "Failed to get C# method thunk for {0}::{1}", String(_parentClass->GetFullName()), String(_name));
#endif
}
return _cachedThunk;
}
@@ -1744,6 +1748,27 @@ static MonoAssembly* OnMonoAssemblyPreloadHook(MonoAssemblyName* aname, char** a
return OnMonoAssemblyLoad(mono_assembly_name_get_name(aname));
}
#if 0
static unsigned char* OnMonoLoadAOT(MonoAssembly* assembly, int size, void* user_data, void** out_handle)
{
MonoAssemblyName* assemblyName = mono_assembly_get_name(assembly);
const char* assemblyNameStr = mono_assembly_name_get_name(assemblyName);
#if DOTNET_HOST_MONO_DEBUG
LOG(Info, "Loading AOT data for C# assembly {0}", String(assemblyNameStr));
#endif
return nullptr;
}
static void OnMonoFreeAOT(MonoAssembly* assembly, int size, void* user_data, void* handle)
{
#if DOTNET_HOST_MONO_DEBUG
MonoAssemblyName* assemblyName = mono_assembly_get_name(assembly);
const char* assemblyNameStr = mono_assembly_name_get_name(assemblyName);
LOG(Info, "Free AOT data for C# assembly {0}", String(assemblyNameStr));
#endif
}
#endif
bool InitHostfxr()
{
#if DOTNET_HOST_MONO_DEBUG
@@ -1855,6 +1880,9 @@ bool InitHostfxr()
static_assert(ARRAY_COUNT(appctxKeys) == ARRAY_COUNT(appctxValues), "Invalid appctx setup");
monovm_initialize(ARRAY_COUNT(appctxKeys), appctxKeys, appctxValues);
mono_install_assembly_preload_hook(OnMonoAssemblyPreloadHook, nullptr);
#if 0
mono_install_load_aot_data_hook(OnMonoLoadAOT, OnMonoFreeAOT, nullptr);
#endif
// Init managed runtime
#if PLATFORM_ANDROID || PLATFORM_IOS

8
Source/Tools/Flax.Build/Deps/Dependencies/nethost.cs
View File

@@ -251,6 +251,14 @@ namespace Flax.Deps.Dependencies
CloneGitRepo(root, "https://github.com/FlaxEngine/dotnet-runtime.git", "flax-master", null, true);
SetupDirectory(Path.Combine(root, "src", "external"), false);
/*
* Mono AOT building for Windows:
* .\build.cmd -c release -runtimeFlavor mono mono+libs -cmakeargs "-DDISABLE_JIT=1-DENABLE_PERFTRACING=0-DDISABLE_REFLECTION_EMIT=1-DDISABLE_EVENTPIPE=1-DDISABLE_COM=1-DDISABLE_PROFILER=1-DDISABLE_COMPONENTS=1" /p:FeaturePerfTracing=false /p:FeatureManagedEtw=false /p:FeatureManagedEtwChannels=false /p:FeatureEtw=false
*
* Mono AOT cross-compiler for Windows:
* .\build.cmd -c release -runtimeFlavor mono -subset mono /p:BuildMonoAotCrossCompiler=true
*/
foreach (var platform in options.Platforms)
{
var platformData = Path.Combine(GetBinariesFolder(options, platform), "Data", "nethost");