talezero/integration
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed mouse grab issue, added EnginePatch, improvements to build-everything

Browse Source
This commit is contained in:
jyelon
2024-11-05 20:26:39 -05:00
parent 29dc91e43c
commit bf5e3e7a2a
3 changed files with 70 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
EnginePatches/EnginePatch Normal file
View File

@@ -0,0 +1,52 @@
diff --git a/Engine/Source/Runtime/ApplicationCore/Private/Linux/LinuxPlatformApplicationMisc.cpp b/Engine/Source/Runtime/ApplicationCore/Private/Linux/LinuxPlatformApplicationMisc.cpp
index ca5f4b5fb5ff..a436a624d5b7 100644
--- a/Engine/Source/Runtime/ApplicationCore/Private/Linux/LinuxPlatformApplicationMisc.cpp
+++ b/Engine/Source/Runtime/ApplicationCore/Private/Linux/LinuxPlatformApplicationMisc.cpp
@@ -299,6 +299,9 @@ bool FLinuxPlatformApplicationMisc::InitSDL()
SDL_SetHint(SDL_HINT_MOUSE_RELATIVE_MODE_SHOW_CURSOR, "1"); // When relative mouse mode is acive, don't hide cursor.
SDL_SetHint(SDL_HINT_MOUSE_RELATIVE_MODE_WARP, "0"); // Don't warp the cursor to the center in relative mouse mode.
+ // Unreal does its own dynamic capturing, we don't need SDL to do it.
+ SDL_SetHint(SDL_HINT_MOUSE_AUTO_CAPTURE, "0");
+
// If we're rendering offscreen, use the "dummy" SDL video driver
if (FParse::Param(FCommandLine::Get(), TEXT("RenderOffScreen")) && !getenv("SDL_VIDEODRIVER"))
{
diff --git a/Engine/Source/Runtime/Core/Private/Logging/LogMacros.cpp b/Engine/Source/Runtime/Core/Private/Logging/LogMacros.cpp
index 1677269adb69..dae6bcde6c25 100644
--- a/Engine/Source/Runtime/Core/Private/Logging/LogMacros.cpp
+++ b/Engine/Source/Runtime/Core/Private/Logging/LogMacros.cpp
@@ -10,6 +10,13 @@
#include "Stats/Stats.h"
#include "ProfilingDebugging/CsvProfiler.h"
+namespace UBreakPoint {
+ volatile int OnLogError_V;
+ FORCENOINLINE static void OnLogError() {
+ OnLogError_V = 0;
+ }
+}
+
void StaticFailDebugV(const TCHAR* Error, const ANSICHAR* Expression, const ANSICHAR* File, int32 Line, bool bIsEnsure, void* ProgramCounter, const TCHAR* DescriptionFormat, va_list DescriptionArgs);
CSV_DEFINE_CATEGORY(FMsgLogf, true);
@@ -35,6 +42,9 @@ void FMsg::LogfImpl(const ANSICHAR* File, int32 Line, const FLogCategoryName& Ca
}
GROWABLE_LOGF(LogOverride ? LogOverride->Log(Category, Verbosity, Buffer)
: GLog->RedirectLog(Category, Verbosity, Buffer))
+ if (Verbosity == ELogVerbosity::Error) {
+ UBreakPoint::OnLogError();
+ }
}
else
{
@@ -79,6 +89,9 @@ void FMsg::LogV(const ANSICHAR* File, int32 Line, const FLogCategoryName& Catego
{
(OutputDevice ? OutputDevice : GLog)->Serialize(Message, Verbosity, Category);
});
+ if (Verbosity == ELogVerbosity::Error) {
+ UBreakPoint::OnLogError();
+ }
}
else
{

122
EnginePatches/LogMacros.cpp
View File

@@ -1,122 +0,0 @@
// Copyright Epic Games, Inc. All Rights Reserved.
#include "Logging/LogMacros.h"
#include "CoreGlobals.h"
#include "HAL/Platform.h"
#include "Misc/ScopeLock.h"
#include "Misc/OutputDeviceRedirector.h"
#include "Misc/FeedbackContext.h"
#include "Misc/VarargsHelper.h"
#include "Stats/Stats.h"
#include "ProfilingDebugging/CsvProfiler.h"
namespace UBreakPoint {
volatile int OnLogError_V;
FORCENOINLINE static void OnLogError() {
OnLogError_V = 0;
}
}
void StaticFailDebugV(const TCHAR* Error, const ANSICHAR* Expression, const ANSICHAR* File, int32 Line, bool bIsEnsure, void* ProgramCounter, const TCHAR* DescriptionFormat, va_list DescriptionArgs);
CSV_DEFINE_CATEGORY(FMsgLogf, true);
void FMsg::LogfImpl(const ANSICHAR* File, int32 Line, const FLogCategoryName& Category, ELogVerbosity::Type Verbosity, const TCHAR* Fmt, ...)
{
#if !NO_LOGGING
if (LIKELY(Verbosity != ELogVerbosity::Fatal))
{
// SetColour is routed to GWarn just like the other verbosities and handled in the
// device that does the actual printing.
FOutputDevice* LogOverride = nullptr;
switch (Verbosity)
{
case ELogVerbosity::Error:
case ELogVerbosity::Warning:
case ELogVerbosity::Display:
case ELogVerbosity::SetColor:
LogOverride = GWarn;
break;
default:
break;
}
GROWABLE_LOGF(LogOverride ? LogOverride->Log(Category, Verbosity, Buffer)
: GLog->RedirectLog(Category, Verbosity, Buffer))
if (Verbosity == ELogVerbosity::Error) {
UBreakPoint::OnLogError();
}
}
else
{
va_list Args;
va_start(Args, Fmt);
StaticFailDebugV(TEXT("Fatal error:"), "", File, Line, /*bIsEnsure*/ false, PLATFORM_RETURN_ADDRESS(), Fmt, Args);
va_end(Args);
va_start(Args, Fmt);
FDebug::AssertFailedV("", File, Line, Fmt, Args);
va_end(Args);
}
#endif
}
void FMsg::LogV(const ANSICHAR* File, int32 Line, const FLogCategoryName& Category, ELogVerbosity::Type Verbosity, const TCHAR* Fmt, va_list Args)
{
#if !NO_LOGGING
LLM_SCOPE_BYNAME("EngineMisc/FMsgLogf")
QUICK_SCOPE_CYCLE_COUNTER(STAT_FMsgLogf);
CSV_CUSTOM_STAT(FMsgLogf, FMsgLogfCount, 1, ECsvCustomStatOp::Accumulate);
if (LIKELY(Verbosity != ELogVerbosity::Fatal))
{
TStringBuilder<512> Buffer;
Buffer.AppendV(Fmt, Args);
const TCHAR* Message = *Buffer;
FOutputDevice* OutputDevice = nullptr;
switch (Verbosity)
{
case ELogVerbosity::Error:
case ELogVerbosity::Warning:
case ELogVerbosity::Display:
case ELogVerbosity::SetColor:
OutputDevice = GWarn;
break;
default:
break;
}
// Logging is always done in the open as we want logs even with transactionalized code.
AutoRTFM::Open([OutputDevice, Message, Verbosity, Category]
{
(OutputDevice ? OutputDevice : GLog)->Serialize(Message, Verbosity, Category);
});
if (Verbosity == ELogVerbosity::Error) {
UBreakPoint::OnLogError();
}
}
else
{
StaticFailDebugV(TEXT("Fatal error:"), "", File, Line, /*bIsEnsure*/ false, PLATFORM_RETURN_ADDRESS(), Fmt, Args);
}
#endif
}
void FMsg::Logf_InternalImpl(const ANSICHAR* File, int32 Line, const FLogCategoryName& Category, ELogVerbosity::Type Verbosity, const TCHAR* Fmt, ...)
{
#if !NO_LOGGING
va_list Args;
va_start(Args, Fmt);
LogV(File, Line, Category, Verbosity, Fmt, Args);
va_end(Args);
#endif
}
/** Sends a formatted message to a remote tool. */
void VARARGS FMsg::SendNotificationStringfImpl( const TCHAR *Fmt, ... )
{
GROWABLE_LOGF(SendNotificationString(Buffer));
}
void FMsg::SendNotificationString( const TCHAR* Message )
{
FPlatformMisc::LowLevelOutputDebugString(Message);
}