upgrade UE 5.3

tools/lvmon/Lib/src/serverconnectiontcp.cpp

@@ -3,6 +3,8 @@
 
 // MIT License. All rights reserved.
 
+#include <cstdarg>
+#include <cstdio>
 #include "serverconnectiontcp.h"
 
 #include <LVMon/lvmonprotocol.h>

unreal-linux-toolchain.cmake

@@ -19,7 +19,7 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_PROCESSOR x86_64)
 
 # Set include and link dir paths to UE 4.27's bundled toolchain
-set(UE_TOOLCHAIN "Engine/Extras/ThirdPartyNotUE/SDKs/HostLinux/Linux_x64/v21_clang-15.0.1-centos7")
+set(UE_TOOLCHAIN "Engine/Extras/ThirdPartyNotUE/SDKs/HostLinux/Linux_x64/v22_clang-16.0.6-centos7")
 set(CMAKE_SYSROOT "$ENV{UE_ROOT}/${UE_TOOLCHAIN}/x86_64-unknown-linux-gnu")
 set(CMAKE_C_COMPILER "${CMAKE_SYSROOT}/bin/clang")
 set(CMAKE_CXX_COMPILER "${CMAKE_SYSROOT}/bin/clang++")

unreal/Blocks/Blocks.uproject

@@ -1,6 +1,6 @@
 {
 	"FileVersion": 3,
-	"EngineAssociation": "5.1",
+	"EngineAssociation": "5.3",
 	"Category": "",
 	"Description": "",
 	"Modules": [

unreal/Blocks/Plugins/ProjectAirSim/Source/ProjectAirSim/Private/LightActorBase.cpp

@@ -4,6 +4,7 @@
 // MIT License. All rights reserved.
 
 #include "LightActorBase.h"
+#include "Components/LocalLightComponent.h"
 
 // Returns true if able to set intensity on all light components
 // False if any item is nullptr
@@ -41,7 +42,7 @@ bool ALightActorBase::SetRadius(float NewRadius) {
   for(int i = 0; i < lightComponents.Num(); i++)
   {
     ULocalLightComponent* localLightComponent =
-        dynamic_cast<ULocalLightComponent*>(lightComponents[i]);
+        Cast<ULocalLightComponent>(lightComponents[i]);
 
     if (localLightComponent != nullptr) {
       localLightComponent->SetAttenuationRadius(NewRadius);

unreal/Blocks/Plugins/ProjectAirSim/Source/ProjectAirSim/Private/Sensors/LidarIntensitySceneViewExtension.cpp

@@ -11,6 +11,7 @@
 #include "SceneRendering.h"
 
 #include "LidarIntensityShader.h"
+#include "PostProcess/SceneFilterRendering.h"
 
 static const bool DEBUG_RENDER_TO_VIEWPORT = false;
 
@@ -196,12 +197,12 @@ void FLidarIntensitySceneViewExtension::PrePostProcessPass_RenderThread(
             FScreenPassPipelineState(VertexShader, PixelShader,
                                      DefaultBlendState, DepthStencilState),
             [&](FRHICommandListImmediate& RHICmdList) {
-              VertexShader->SetParameters(RHICmdList, View);
+              VertexShader->SetParameters(RHICmdList.GetScratchShaderParameters(), View);
               SetShaderParameters(RHICmdList, VertexShader,
                                   VertexShader.GetVertexShader(),
                                   *PostProcessMaterialParameters);
 
-              PixelShader->SetParameters(RHICmdList, View);
+              PixelShader->SetParameters(RHICmdList.GetScratchShaderParameters(), View);
               SetShaderParameters(RHICmdList, PixelShader,
                                   PixelShader.GetPixelShader(),
                                   *PostProcessMaterialParameters);
@@ -288,12 +289,12 @@ void FLidarIntensitySceneViewExtension::PrePostProcessPass_RenderThread(
         RDG_EVENT_NAME("FCopyBufferToCPUPass"), CopyPassParameters,
         ERDGPassFlags::Readback,
         [this, &InitialData, PointCloudBufferRDG, BufferSize](FRHICommandList& RHICmdList) {
-          InitialData = (float*)RHILockBuffer(PointCloudBufferRDG->GetRHI(), 0,
+          InitialData = (float*)RHICmdList.LockBuffer(PointCloudBufferRDG->GetRHI(), 0,
                                               BufferSize, RLM_ReadOnly);
 
           FMemory::Memcpy(LidarPointCloudData.data(), InitialData, BufferSize);
 
-          RHIUnlockBuffer(PointCloudBufferRDG->GetRHI());
+          RHICmdList.UnlockBuffer(PointCloudBufferRDG->GetRHI());
         });
 }
 

unreal/Blocks/Plugins/ProjectAirSim/Source/ProjectAirSim/Private/Sensors/LidarIntensitySceneViewExtension.h

@@ -17,9 +17,9 @@ class FLidarIntensitySceneViewExtension : public FSceneViewExtensionBase {
                          FSceneView& InView) override {};
   virtual void BeginRenderViewFamily(FSceneViewFamily& InViewFamily) override {};
   virtual void PreRenderViewFamily_RenderThread(
-      FRHICommandListImmediate& RHICmdList,
+      FRDGBuilder& GraphBuilder,
       FSceneViewFamily& InViewFamily) override {};
-  virtual void PreRenderView_RenderThread(FRHICommandListImmediate& RHICmdList,
+  virtual void PreRenderView_RenderThread(FRDGBuilder& GraphBuilder,
                                           FSceneView& InView) override {};
   virtual void PostRenderBasePass_RenderThread(
       FRHICommandListImmediate& RHICmdList, FSceneView& InView) override {};

unreal/Blocks/Plugins/ProjectAirSim/Source/ProjectAirSim/Private/Sensors/LidarIntensityShader.h

@@ -2,18 +2,18 @@
 
 #include "CoreMinimal.h"
 #include "UnrealCameraRenderRequest.h"
-#include "Runtime/Engine/Classes/Engine/TextureRenderTarget2D.h"
+#include "Engine/TextureRenderTarget2D.h"
 
 #include "RHI.h"
 #include "RHIStaticStates.h"
-#include "Runtime/RenderCore/Public/ShaderParameterUtils.h"
-#include "Runtime/RenderCore/Public/RenderResource.h"
-#include "Runtime/Renderer/Public/MaterialShader.h"
-#include "Runtime/RenderCore/Public/RenderGraphResources.h"
+#include "ShaderParameterUtils.h"
+#include "RenderResource.h"
+#include "MaterialShader.h"
+#include "RenderGraphResources.h"
 
 // FScreenPassTextureViewportParameters and FScreenPassTextureInput
-#include "Runtime/Renderer/Private/ScreenPass.h"
-#include "Runtime/Renderer/Private/SceneTextureParameters.h"
+#include "ScreenPass.h"
+#include "SceneTextureParameters.h"
 
 BEGIN_SHADER_PARAMETER_STRUCT(FLidarIntensityShaderInputParameters, )
   SHADER_PARAMETER_STRUCT_REF(FViewUniformShaderParameters, View)
@@ -51,9 +51,9 @@ class FLidarIntensityPS : public FLidarIntensityShader {
       const ShaderMetaType::CompiledShaderInitializerType& Initializer)
       : FLidarIntensityShader(Initializer) {}
 
-  void SetParameters(FRHICommandList& RHICmdList, const FSceneView& View) {
+  void SetParameters(FRHIBatchedShaderParameters& BatchedParameters, const FSceneView& View) {
     FGlobalShader::SetParameters<FViewUniformShaderParameters>(
-        RHICmdList, RHICmdList.GetBoundPixelShader(), View.ViewUniformBuffer);
+        BatchedParameters, View.ViewUniformBuffer);
   }
 
   static void ModifyCompilationEnvironment(
@@ -73,8 +73,8 @@ class FLidarIntensityVS : public FLidarIntensityShader {
       const ShaderMetaType::CompiledShaderInitializerType& Initializer)
       : FLidarIntensityShader(Initializer) {}
 
-  void SetParameters(FRHICommandList& RHICmdList, const FSceneView& View) {
+  void SetParameters(FRHIBatchedShaderParameters& BatchedParameters, const FSceneView& View) {
     FGlobalShader::SetParameters<FViewUniformShaderParameters>(
-        RHICmdList, RHICmdList.GetBoundVertexShader(), View.ViewUniformBuffer);
+        BatchedParameters, View.ViewUniformBuffer);
   }
 };

unreal/Blocks/Plugins/ProjectAirSim/Source/ProjectAirSim/ProjectAirSim.Build.cs

@@ -3,6 +3,7 @@
 //
 // MIT License. All rights reserved.
 
+using System;
 using System.Collections.Generic;
 using System.IO;
 using UnrealBuildTool;
@@ -11,19 +12,14 @@ public class ProjectAirSim : ModuleRules
 {
     public ProjectAirSim(ReadOnlyTargetRules Target) : base(Target)
     {
-        CppStandard = CppStandardVersion.Cpp17;
         PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
-        PrivatePCHHeaderFile = "Public/ProjectAirSim.h";
 
         // Allow Unreal's default setting for IWYU instead of setting explicitly
         // bEnforceIWYU = true;  // UE <= 5.1
         // IWYUSupport = IWYUSupport.None;  // UE 5.2+
 
         bEnableExceptions = true;
 
-        // Silence MSVC 14.25.28610 deprecation warning from Eigen
-        PublicDefinitions.Add("_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING");
-
         string buildType = (Target.Configuration == UnrealTargetConfiguration.Debug ||
                             Target.Configuration == UnrealTargetConfiguration.DebugGame)
                             ? "Debug"
@@ -47,7 +43,6 @@ public ProjectAirSim(ReadOnlyTargetRules Target) : base(Target)
         if (Target.Platform == UnrealTargetPlatform.Win64)
         {
             List<string> liststrIncludes = new List<string> {
-                    ModuleDirectory + "/Private",
                     PluginDirectory + "/SimLibs/core_sim/include",
                     PluginDirectory + "/SimLibs/simserver/include",
                     PluginDirectory + "/SimLibs/physics/include",

unreal/Blocks/Source/Blocks.Target.cs

@@ -11,7 +11,7 @@ public class BlocksTarget : TargetRules
 	public BlocksTarget(TargetInfo Target) : base(Target)
 	{
 		Type = TargetType.Game;
-		DefaultBuildSettings = BuildSettingsVersion.V2;
+		DefaultBuildSettings = BuildSettingsVersion.V4;
 		IncludeOrderVersion = EngineIncludeOrderVersion.Latest;  // from UE5.1
 		ExtraModuleNames.AddRange(new string[] { "Blocks" });
 

unreal/Blocks/Source/BlocksEditor.Target.cs

@@ -11,7 +11,7 @@ public class BlocksEditorTarget : TargetRules
 	public BlocksEditorTarget(TargetInfo Target) : base(Target)
 	{
 		Type = TargetType.Editor;
-		DefaultBuildSettings = BuildSettingsVersion.V2;
+		DefaultBuildSettings = BuildSettingsVersion.V4;
 		IncludeOrderVersion = EngineIncludeOrderVersion.Latest;  // from UE5.1
 		ExtraModuleNames.AddRange(new string[] { "Blocks" });