Skip to content

Update to 5.7 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
franklzt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to 5.7 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions Source/ExtendedGraphicsProgramming/ExtendedGraphicsProgramming.Build.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,33 @@
using UnrealBuildTool;
using System.IO;

public class ExtendedGraphicsProgramming : ModuleRules
{
public ExtendedGraphicsProgramming(ReadOnlyTargetRules Target) : base(Target)
{
PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;

PublicDependencyModuleNames.AddRange(new string[] {
"Core"

PrivateIncludePaths.AddRange(
new string[]
{
// … add other private include paths required here …
Path.Combine(GetModuleDirectory("Renderer"), "Internal"),
Path.Combine(GetModuleDirectory("Renderer"), "Private")
}
);

PublicDependencyModuleNames.AddRange(new string[]
{
"Core", "Engine"
});
PrivateDependencyModuleNames.AddRange(new string[] {
PrivateDependencyModuleNames.AddRange(new string[]
{
"CoreUObject",
"Projects",
"Engine",
"Slate",
"SlateCore",
"SlateCore",
"Renderer", "RenderCore", "RHICore", "RHI"
});
}
}
}
5 changes: 3 additions & 2 deletions Source/ExtendedGraphicsProgramming/Private/EGP_CustomRenderPasses.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#include "EGP_CustomRenderPasses.h"

#include "Engine/TextureRenderTarget.h"
#include "SceneViewExtensionContext.h"
#include "TextureResource.h"
#include "Algo/AllOf.h"
#include "Components/PrimitiveComponent.h"


bool U_EGP_ViewFilter::ShouldRenderFor(const FViewport* viewport) const
Expand Down Expand Up @@ -83,7 +84,7 @@ void U_EGP_ViewFilter::RemoveByRenderTarget(UTextureRenderTarget* rt)
}
else
{
auto* resource = rt->GameThread_GetRenderTargetResource();
FTextureRenderTargetResource* resource = rt->GameThread_GetRenderTargetResource();
//Don't interpret an uninitialized resource as a reference to all null render-targets!
if (resource != nullptr)
RemoveByRenderTarget(resource);
Expand Down
2 changes: 2 additions & 0 deletions Source/ExtendedGraphicsProgramming/Private/ExtendedGraphicsProgramming.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#include "ExtendedGraphicsProgramming.h"

#include "ShaderCore.h"
#include "Interfaces/IPluginManager.h"
#include "Misc/Paths.h"

#define LOCTEXT_NAMESPACE "FExtendedGraphicsProgrammingModule"

Expand Down
3 changes: 3 additions & 0 deletions Source/ExtendedGraphicsProgramming/Public/EGP_CustomRenderPasses.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
#pragma once

#include <memory>

#include "CoreMinimal.h"
#include "SceneViewExtension.h"
#include "Runtime/Renderer/Private/SceneRendering.h"

#include "ExtendedGraphicsProgramming.h"
#include "Engine/TextureRenderTarget.h"

#include "EGP_CustomRenderPasses.generated.h"

Expand Down
5 changes: 4 additions & 1 deletion Source/ExtendedGraphicsProgramming/Public/EGP_GetMaterialShader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
#pragma once

#include "CoreMinimal.h"
#include "MaterialDomain.h"
#include "MaterialShaderType.h"
#include "MaterialShared.h"
#include "Materials/Material.h"
#include "Materials/MaterialRenderProxy.h"


namespace EGP
{
//A potential fallback material that could render your shaders.
Expand Down
1 change: 1 addition & 0 deletions Source/ExtendedGraphicsProgramming/Public/EGP_GetMeshBatches.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include "CoreMinimal.h"
#include "PrimitiveSceneInfo.h"
#include "PrimitiveSceneProxy.h"
#include "Runtime/Renderer/Private/SceneRendering.h"

namespace EGP
Expand Down
2 changes: 1 addition & 1 deletion Source/ExtendedGraphicsProgramming/Public/EGP_PostProcessMaterialShaders.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "MaterialDomain.h"
#include "PostProcess/PostProcessMaterialInputs.h"
#include "Runtime/Renderer/Private/SceneRendering.h"

#include "Runtime/Launch/Resources/Version.h"
#include "EGP_GetMaterialShader.h"

/*
Expand Down