Skip to content

5.0にアップグレード #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
tomotaco wants to merge 1 commit into
base: master
Choose a base branch
from
Open

5.0にアップグレード #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
2 changes: 1 addition & 1 deletion UsfPluginProject/Plugins/Sketch/Source/Sketch/Private/Sketch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

void FSketchModule::StartupModule()
{
#if (ENGINE_MINOR_VERSION >= 21)
#if (ENGINE_MINOR_VERSION >= 21 || ENGINE_MAJOR_VERSION >= 5)
FString PluginDirectory = IPluginManager::Get().FindPlugin(TEXT("Sketch"))->GetBaseDir();
if(!AllShaderSourceDirectoryMappings().Contains("/Plugins/Sketch"))
AddShaderSourceDirectoryMapping("/Plugins/Sketch", PluginDirectory);
Expand Down
31 changes: 15 additions & 16 deletions UsfPluginProject/Plugins/Sketch/Source/Sketch/Private/SketchComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,18 @@ void USketchComponent::ExecuteInRenderThread(FRHICommandListImmediate& RHICmdLis
RHICmdList.ApplyCachedRenderTargets(PSOInitializer);
PSOInitializer.PrimitiveType = PT_TriangleList;
PSOInitializer.BoundShaderState.VertexDeclarationRHI = VertexDec.VertexDeclarationRHI;
PSOInitializer.BoundShaderState.VertexShaderRHI = GETSAFERHISHADER_VERTEX(*shaderVS);
PSOInitializer.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*shaderPS);
PSOInitializer.BoundShaderState.VertexShaderRHI = shaderVS.GetVertexShader();
PSOInitializer.BoundShaderState.PixelShaderRHI = shaderPS.GetPixelShader();
PSOInitializer.RasterizerState = TStaticRasterizerState<FM_Solid, CM_None>::GetRHI();
PSOInitializer.BlendState = TStaticBlendState<>::GetRHI();
PSOInitializer.DepthStencilState = TStaticDepthStencilState<false, CF_Always>::GetRHI();
SetGraphicsPipelineState(RHICmdList, PSOInitializer);
SetGraphicsPipelineState(RHICmdList, PSOInitializer, 0);

static const FSketchVertex Vertices[4] = {
{ FVector4(-1.0f, 1.0f, 0.0f, 1.0f), FVector2D(0.0f, 0.0f)},
{ FVector4( 1.0f, 1.0f, 0.0f, 1.0f), FVector2D(1.0f, 0.0f)},
{ FVector4(-1.0f, -1.0f, 0.0f, 1.0f), FVector2D(0.0f, 1.0f)},
{ FVector4( 1.0f, -1.0f, 0.0f, 1.0f), FVector2D(1.0f, 1.0f)},
{ FVector4f(-1.0f, 1.0f, 0.0f, 1.0f), FVector2f(0.0f, 0.0f)},
{ FVector4f( 1.0f, 1.0f, 0.0f, 1.0f), FVector2f(1.0f, 0.0f)},
{ FVector4f(-1.0f, -1.0f, 0.0f, 1.0f), FVector2f(0.0f, 1.0f)},
{ FVector4f( 1.0f, -1.0f, 0.0f, 1.0f), FVector2f(1.0f, 1.0f)},
};

static const uint16 Indices[6] =
Expand All @@ -78,8 +78,7 @@ void USketchComponent::ExecuteInRenderThread(FRHICommandListImmediate& RHICmdLis
2, 1, 3
};

DrawIndexedPrimitiveUP(RHICmdList, PT_TriangleList, 0, ARRAY_COUNT(Vertices), 2, Indices, sizeof(Indices[0]), Vertices, sizeof(Vertices[0]));

DrawIndexedPrimitiveUP(RHICmdList, PT_TriangleList, 0, UE_ARRAY_COUNT(Vertices), 2, Indices, sizeof(Indices[0]), Vertices, sizeof(Vertices[0]));
// Resolve render target.
RHICmdList.CopyToResolveTarget(
OutputRenderTargetResource->GetRenderTargetTexture(),
Expand All @@ -102,16 +101,16 @@ void USketchComponent::DrawIndexedPrimitiveUP(
{
const uint32 NumIndices = GetVertexCountForPrimitiveCount( NumPrimitives, PrimitiveType );

FRHIResourceCreateInfo CreateInfo;
FVertexBufferRHIRef VertexBufferRHI = RHICreateVertexBuffer(VertexDataStride * NumVertices, BUF_Volatile, CreateInfo);
void* VoidPtr = RHILockVertexBuffer(VertexBufferRHI, 0, VertexDataStride * NumVertices, RLM_WriteOnly);
FRHIResourceCreateInfo CreateInfo(TEXT("FRHIResourceCreateInfo"));
FBufferRHIRef VertexBufferRHI = RHICreateVertexBuffer(VertexDataStride * NumVertices, BUF_Volatile, CreateInfo);
void* VoidPtr = RHILockBuffer(VertexBufferRHI, 0, VertexDataStride * NumVertices, RLM_WriteOnly);
FPlatformMemory::Memcpy(VoidPtr, VertexData, VertexDataStride * NumVertices);
RHIUnlockVertexBuffer(VertexBufferRHI);
RHIUnlockBuffer(VertexBufferRHI);

FIndexBufferRHIRef IndexBufferRHI = RHICreateIndexBuffer(IndexDataStride, IndexDataStride * NumIndices, BUF_Volatile, CreateInfo);
void* VoidPtr2 = RHILockIndexBuffer(IndexBufferRHI, 0, IndexDataStride * NumIndices, RLM_WriteOnly);
FBufferRHIRef IndexBufferRHI = RHICreateIndexBuffer(IndexDataStride, IndexDataStride * NumIndices, BUF_Volatile, CreateInfo);
void* VoidPtr2 = RHILockBuffer(IndexBufferRHI, 0, IndexDataStride * NumIndices, RLM_WriteOnly);
FPlatformMemory::Memcpy(VoidPtr2, IndexData, IndexDataStride * NumIndices);
RHIUnlockIndexBuffer(IndexBufferRHI);
RHIUnlockBuffer(IndexBufferRHI);

RHICmdList.SetStreamSource(0, VertexBufferRHI, 0);
RHICmdList.DrawIndexedPrimitive(IndexBufferRHI, MinVertexIndex, 0, NumVertices, 0, NumPrimitives, 1);
Expand Down
14 changes: 1 addition & 13 deletions UsfPluginProject/Plugins/Sketch/Source/Sketch/Private/SketchShader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "SketchShader.h"

#include <Runtime/RenderCore/Public/ShaderCompilerCore.h>

FSketchShaderVS::FSketchShaderVS(const ShaderMetaType::CompiledShaderInitializerType& Initializer)
: FGlobalShader(Initializer)
Expand All @@ -12,13 +12,6 @@ void FSketchShaderVS::ModifyCompilationEnvironment(const FGlobalShaderPermutatio
OutEnvironment.CompilerFlags.Add(CFLAG_StandardOptimization);
}

bool FSketchShaderVS::Serialize(FArchive& Ar)
{
return FGlobalShader::Serialize(Ar);
}



FSketchShaderPS::FSketchShaderPS(const ShaderMetaType::CompiledShaderInitializerType& Initializer)
: FGlobalShader(Initializer)
{
Expand All @@ -30,11 +23,6 @@ void FSketchShaderPS::ModifyCompilationEnvironment(const FGlobalShaderPermutatio
OutEnvironment.CompilerFlags.Add(CFLAG_StandardOptimization);
}

bool FSketchShaderPS::Serialize(FArchive& Ar)
{
return FGlobalShader::Serialize(Ar);
}

////////////////////////////////////////////////////////////////////////////////////////////////
IMPLEMENT_SHADER_TYPE(, FSketchShaderVS, TEXT("/Plugins/Sketch/Shaders/SketchShader.usf"), TEXT("MainVS"), SF_Vertex);
IMPLEMENT_SHADER_TYPE(, FSketchShaderPS, TEXT("/Plugins/Sketch/Shaders/SketchShader.usf"), TEXT("MainPS"), SF_Pixel);
10 changes: 4 additions & 6 deletions UsfPluginProject/Plugins/Sketch/Source/Sketch/Public/SketchShader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ class FSketchShaderVS : public FGlobalShader
FSketchShaderVS() {}
explicit FSketchShaderVS(const ShaderMetaType::CompiledShaderInitializerType& Initializer);

static bool ShouldCache(EShaderPlatform Platform) { return IsFeatureLevelSupported(Platform, ERHIFeatureLevel::ES2); }
static bool ShouldCache(EShaderPlatform Platform) { return IsFeatureLevelSupported(Platform, ERHIFeatureLevel::ES3_1); }
static bool ShouldCompilePermutation(const FGlobalShaderPermutationParameters& PermutationParams) { return true; }
static void ModifyCompilationEnvironment(const FGlobalShaderPermutationParameters& Parameters, FShaderCompilerEnvironment& OutEnvironment);
virtual bool Serialize(FArchive& Ar) override;
};


Expand All @@ -27,16 +26,15 @@ class FSketchShaderPS : public FGlobalShader
FSketchShaderPS() {}
explicit FSketchShaderPS(const ShaderMetaType::CompiledShaderInitializerType& Initializer);

static bool ShouldCache(EShaderPlatform Platform) { return IsFeatureLevelSupported(Platform, ERHIFeatureLevel::ES2); }
static bool ShouldCache(EShaderPlatform Platform) { return IsFeatureLevelSupported(Platform, ERHIFeatureLevel::ES3_1); }
static bool ShouldCompilePermutation(const FGlobalShaderPermutationParameters& PermutationParams) { return true; }
static void ModifyCompilationEnvironment(const FGlobalShaderPermutationParameters& Parameters, FShaderCompilerEnvironment& OutEnvironment);
virtual bool Serialize(FArchive& Ar) override;
};

struct FSketchVertex
{
FVector4 Position;
FVector2D UV;
FVector4f Position;
FVector2f UV;
};

class FSketchVertexDeclaration : public FRenderResource
Expand Down
2 changes: 1 addition & 1 deletion UsfPluginProject/UsfPluginProject.uproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"FileVersion": 3,
"EngineAssociation": "4.22",
"EngineAssociation": "5.0",
"Category": "",
"Description": "",
"Modules": [
Expand Down
2 changes: 1 addition & 1 deletion UsfProject/Source/ShaderModule/ShaderModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

void FShaderModule::StartupModule()
{
#if (ENGINE_MINOR_VERSION >= 21)
#if (ENGINE_MINOR_VERSION >= 21 || ENGINE_MAJOR_VERSION >= 5)
FString ShaderDirectory = FPaths::Combine(FPaths::ProjectDir(), TEXT("Shader"));
if(!AllShaderSourceDirectoryMappings().Contains("/Project"))
AddShaderSourceDirectoryMapping("/Project", ShaderDirectory);
Expand Down
33 changes: 17 additions & 16 deletions UsfProject/Source/ShaderModule/SketchComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "SketchComponent.h"
#include "SketchShader.h"
#include "Classes/Engine/TextureRenderTarget2D.h"
#include "Engine/TextureRenderTarget2D.h"
#include "RHI.h"
//#include "RHICommandList.h" // RHI module
#include "RHIResources.h"

Expand Down Expand Up @@ -58,18 +59,18 @@ void USketchComponent::ExecuteInRenderThread(FRHICommandListImmediate& RHICmdLis
RHICmdList.ApplyCachedRenderTargets(PSOInitializer);
PSOInitializer.PrimitiveType = PT_TriangleList;
PSOInitializer.BoundShaderState.VertexDeclarationRHI = VertexDec.VertexDeclarationRHI;
PSOInitializer.BoundShaderState.VertexShaderRHI = GETSAFERHISHADER_VERTEX(*shaderVS);
PSOInitializer.BoundShaderState.PixelShaderRHI = GETSAFERHISHADER_PIXEL(*shaderPS);
PSOInitializer.BoundShaderState.VertexShaderRHI = shaderVS.GetVertexShader();
PSOInitializer.BoundShaderState.PixelShaderRHI = shaderPS.GetPixelShader();
PSOInitializer.RasterizerState = TStaticRasterizerState<FM_Solid, CM_None>::GetRHI();
PSOInitializer.BlendState = TStaticBlendState<>::GetRHI();
PSOInitializer.DepthStencilState = TStaticDepthStencilState<false, CF_Always>::GetRHI();
SetGraphicsPipelineState(RHICmdList, PSOInitializer);
SetGraphicsPipelineState(RHICmdList, PSOInitializer, 0);

static const FSketchVertex Vertices[4] = {
{ FVector4(-1.0f, 1.0f, 0.0f, 1.0f), FVector2D(0.0f, 0.0f)},
{ FVector4( 1.0f, 1.0f, 0.0f, 1.0f), FVector2D(1.0f, 0.0f)},
{ FVector4(-1.0f, -1.0f, 0.0f, 1.0f), FVector2D(0.0f, 1.0f)},
{ FVector4( 1.0f, -1.0f, 0.0f, 1.0f), FVector2D(1.0f, 1.0f)},
{ FVector4f(-1.0f, 1.0f, 0.0f, 1.0f), FVector2f(0.0f, 0.0f)},
{ FVector4f( 1.0f, 1.0f, 0.0f, 1.0f), FVector2f(1.0f, 0.0f)},
{ FVector4f(-1.0f, -1.0f, 0.0f, 1.0f), FVector2f(0.0f, 1.0f)},
{ FVector4f( 1.0f, -1.0f, 0.0f, 1.0f), FVector2f(1.0f, 1.0f)},
};

static const uint16 Indices[6] =
Expand All @@ -78,7 +79,7 @@ void USketchComponent::ExecuteInRenderThread(FRHICommandListImmediate& RHICmdLis
2, 1, 3
};

DrawIndexedPrimitiveUP(RHICmdList, PT_TriangleList, 0, ARRAY_COUNT(Vertices), 2, Indices, sizeof(Indices[0]), Vertices, sizeof(Vertices[0]));
DrawIndexedPrimitiveUP(RHICmdList, PT_TriangleList, 0, UE_ARRAY_COUNT(Vertices), 2, Indices, sizeof(Indices[0]), Vertices, sizeof(Vertices[0]));

// Resolve render target.
RHICmdList.CopyToResolveTarget(
Expand All @@ -102,16 +103,16 @@ void USketchComponent::DrawIndexedPrimitiveUP(
{
const uint32 NumIndices = GetVertexCountForPrimitiveCount( NumPrimitives, PrimitiveType );

FRHIResourceCreateInfo CreateInfo;
FVertexBufferRHIRef VertexBufferRHI = RHICreateVertexBuffer(VertexDataStride * NumVertices, BUF_Volatile, CreateInfo);
void* VoidPtr = RHILockVertexBuffer(VertexBufferRHI, 0, VertexDataStride * NumVertices, RLM_WriteOnly);
FRHIResourceCreateInfo CreateInfo(TEXT("FRHIResourceCreateInfo"));
FBufferRHIRef VertexBufferRHI = RHICreateVertexBuffer(VertexDataStride * NumVertices, BUF_Volatile, CreateInfo);
void* VoidPtr = RHILockBuffer(VertexBufferRHI, 0, VertexDataStride * NumVertices, RLM_WriteOnly);
FPlatformMemory::Memcpy(VoidPtr, VertexData, VertexDataStride * NumVertices);
RHIUnlockVertexBuffer(VertexBufferRHI);
RHIUnlockBuffer(VertexBufferRHI);

FIndexBufferRHIRef IndexBufferRHI = RHICreateIndexBuffer(IndexDataStride, IndexDataStride * NumIndices, BUF_Volatile, CreateInfo);
void* VoidPtr2 = RHILockIndexBuffer(IndexBufferRHI, 0, IndexDataStride * NumIndices, RLM_WriteOnly);
FBufferRHIRef IndexBufferRHI = RHICreateIndexBuffer(IndexDataStride, IndexDataStride * NumIndices, BUF_Volatile, CreateInfo);
void* VoidPtr2 = RHILockBuffer(IndexBufferRHI, 0, IndexDataStride * NumIndices, RLM_WriteOnly);
FPlatformMemory::Memcpy(VoidPtr2, IndexData, IndexDataStride * NumIndices);
RHIUnlockIndexBuffer(IndexBufferRHI);
RHIUnlockBuffer(IndexBufferRHI);

RHICmdList.SetStreamSource(0, VertexBufferRHI, 0);
RHICmdList.DrawIndexedPrimitive(IndexBufferRHI, MinVertexIndex, 0, NumVertices, 0, NumPrimitives, 1);
Expand Down
13 changes: 1 addition & 12 deletions UsfProject/Source/ShaderModule/SketchShader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "SketchShader.h"
#include <Runtime/RenderCore/Public/ShaderCompilerCore.h>


FSketchShaderVS::FSketchShaderVS(const ShaderMetaType::CompiledShaderInitializerType& Initializer)
Expand All @@ -12,13 +13,6 @@ void FSketchShaderVS::ModifyCompilationEnvironment(const FGlobalShaderPermutatio
OutEnvironment.CompilerFlags.Add(CFLAG_StandardOptimization);
}

bool FSketchShaderVS::Serialize(FArchive& Ar)
{
return FGlobalShader::Serialize(Ar);
}



FSketchShaderPS::FSketchShaderPS(const ShaderMetaType::CompiledShaderInitializerType& Initializer)
: FGlobalShader(Initializer)
{
Expand All @@ -30,11 +24,6 @@ void FSketchShaderPS::ModifyCompilationEnvironment(const FGlobalShaderPermutatio
OutEnvironment.CompilerFlags.Add(CFLAG_StandardOptimization);
}

bool FSketchShaderPS::Serialize(FArchive& Ar)
{
return FGlobalShader::Serialize(Ar);
}

////////////////////////////////////////////////////////////////////////////////////////////////
IMPLEMENT_SHADER_TYPE(, FSketchShaderVS, TEXT("/Project/SketchShader.usf"), TEXT("MainVS"), SF_Vertex);
IMPLEMENT_SHADER_TYPE(, FSketchShaderPS, TEXT("/Project/SketchShader.usf"), TEXT("MainPS"), SF_Pixel);
12 changes: 4 additions & 8 deletions UsfProject/Source/ShaderModule/SketchShader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,9 @@ class FSketchShaderVS : public FGlobalShader
FSketchShaderVS() {}
explicit FSketchShaderVS(const ShaderMetaType::CompiledShaderInitializerType& Initializer);

static bool ShouldCache(EShaderPlatform Platform) { return true; }
//static bool ShouldCache(EShaderPlatform Platform) { return IsFeatureLevelSupported(Platform, ERHIFeatureLevel::ES2); }
static bool ShouldCache(EShaderPlatform Platform) { return IsFeatureLevelSupported(Platform, ERHIFeatureLevel::ES3_1); }
static bool ShouldCompilePermutation(const FGlobalShaderPermutationParameters& PermutationParams) { return true; }
static void ModifyCompilationEnvironment(const FGlobalShaderPermutationParameters& Parameters, FShaderCompilerEnvironment& OutEnvironment);
virtual bool Serialize(FArchive& Ar) override;
};


Expand All @@ -28,17 +26,15 @@ class FSketchShaderPS : public FGlobalShader
FSketchShaderPS() {}
explicit FSketchShaderPS(const ShaderMetaType::CompiledShaderInitializerType& Initializer);

static bool ShouldCache(EShaderPlatform Platform) { return true; }
//static bool ShouldCache(EShaderPlatform Platform) { return IsFeatureLevelSupported(Platform, ERHIFeatureLevel::ES2); }
static bool ShouldCache(EShaderPlatform Platform) { return IsFeatureLevelSupported(Platform, ERHIFeatureLevel::ES3_1); }
static bool ShouldCompilePermutation(const FGlobalShaderPermutationParameters& PermutationParams) { return true; }
static void ModifyCompilationEnvironment(const FGlobalShaderPermutationParameters& Parameters, FShaderCompilerEnvironment& OutEnvironment);
virtual bool Serialize(FArchive& Ar) override;
};

struct FSketchVertex
{
FVector4 Position;
FVector2D UV;
FVector4f Position;
FVector2f UV;
};

class FSketchVertexDeclaration : public FRenderResource
Expand Down
2 changes: 1 addition & 1 deletion UsfProject/UsfProject.uproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"FileVersion": 3,
"EngineAssociation": "4.22",
"EngineAssociation": "5.0",
"Category": "",
"Description": "",
"Modules": [
Expand Down