izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

[shaders] deprecating old PreprocessShader and IShaderFormat::CompileShader APIs now that all shader formats have been migrated

Browse Source 
#rb Jason.Nadro

[CL 28452658 by dan elksnitis in ue5-main branch]
This commit is contained in:
dan elksnitis
2023-10-04 09:22:36 -04:00
parent d3e2c90a86
commit 5518e3d9f3
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Source/Developer/ShaderPreprocessor/Public/ShaderPreprocessor.h
+1
View File
@@ -34,6 +34,7 @@ enum class EDumpShaderDefines : uint8
* @param bShaderDumpDefinesAsCommentedCode - Whether to add shader definitions as comments.
* @returns true if the shader is preprocessed without error.
*/
UE_DEPRECATED(5.4, "Please use overload of PreprocessShader accepting a FShaderPreprocessOutput struct.")
extern SHADERPREPROCESSOR_API bool PreprocessShader(
FString& OutPreprocessedShader,
FShaderCompilerOutput& ShaderOutput,
Engine/Source/Developer/TargetPlatform/Public/Interfaces/IShaderFormat.h
+1
View File
@@ -28,6 +28,7 @@ public:
* @param Output The output from shader compiler.
* @param WorkingDirectory The working directory.
*/
UE_DEPRECATED(5.4, "Monolithic CompileShader is deprecated. Please implement separate compilation and preprocess via PreprocessShader/CompilePreprocessedShader")
virtual void CompileShader(FName Format, const FShaderCompilerInput& Input, FShaderCompilerOutput& Output, const FString& WorkingDirectory) const {};
/**
Engine/Source/Runtime/RenderCore/Private/ShaderCore.cpp
+1 -8
View File
@@ -1305,14 +1305,7 @@ public:
check(Job.SecondaryPreprocessOutput.IsValid());
Compiler->CompilePreprocessedShader(Job.Input, Job.PreprocessOutput, *Job.SecondaryPreprocessOutput, Job.Output, *Job.SecondaryOutput, WorkingDirectory);
}
else if (Compiler->SupportsIndependentPreprocessing())
{
Compiler->CompilePreprocessedShader(Job.Input, Job.PreprocessOutput, Job.Output, WorkingDirectory);
}
else
{
Compiler->CompileShader(Job.Input.ShaderFormat, Job.Input, Job.Output, WorkingDirectory);
}
Compiler->CompilePreprocessedShader(Job.Input, Job.PreprocessOutput, Job.Output, WorkingDirectory);
}
#if PLATFORM_WINDOWS
__except(HandleShaderCompileException(GetExceptionInformation(), OutExceptionMsg, OutExceptionCallstack))