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

Removing D3D12RHI_USE_PIPELINE_STATE_STREAM now that it's confirmed to work on all relevant platforms.

Browse Source 
#jira none
#rb eric.mcdaniel
#preflight 609d45110e81c7000190b0fb

#ROBOMERGE-SOURCE: CL 16315455 in //UE5/Main/... via CL 16315472
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Test -> Release-Engine-Staging) (v804-16311228)

[CL 16315488 by christopher waters in ue5-release-engine-staging branch]
This commit is contained in:
christopher waters
2021-05-13 13:53:29 -04:00
parent 4090a7dfa1 6b8d419cea
commit 667828733d
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Engine/Source/Runtime/D3D12RHI/D3D12RHI.Build.cs
View File

@@ -41,8 +41,6 @@ public class D3D12RHI : ModuleRules
if (Target.Platform.IsInGroup(UnrealPlatformGroup.Windows) ||
Target.Platform == UnrealTargetPlatform.HoloLens)
{
PrivateDefinitions.Add("D3D12RHI_USE_PIPELINE_STATE_STREAM=1");
AddEngineThirdPartyPrivateStaticDependencies(Target, "DX12");
AddEngineThirdPartyPrivateStaticDependencies(Target, "DX11");
AddEngineThirdPartyPrivateStaticDependencies(Target, "AMD_AGS");

8
Engine/Source/Runtime/D3D12RHI/Private/D3D12PipelineState.h
View File

@@ -25,10 +25,6 @@
#endif // D3D12_USE_DERIVED_PSO_SHADER_EXPORTS
#endif // D3D12_USE_DERIVED_PSO
#ifndef D3D12RHI_USE_PIPELINE_STATE_STREAM
#define D3D12RHI_USE_PIPELINE_STATE_STREAM 0
#endif
#if D3D12RHI_USE_HIGH_LEVEL_PSO_CACHE
DECLARE_DWORD_ACCUMULATOR_STAT(TEXT("Graphics: Num high-level cache entries"), STAT_PSOGraphicsNumHighlevelCacheEntries, STATGROUP_D3D12PipelineState);
DECLARE_DWORD_COUNTER_STAT(TEXT("Graphics: High-level cache hit"), STAT_PSOGraphicsHighlevelCacheHit, STATGROUP_D3D12PipelineState);
@@ -75,14 +71,12 @@ struct FD3D12_GRAPHICS_PIPELINE_STATE_DESC
D3D12_CACHED_PIPELINE_STATE CachedPSO;
D3D12_PIPELINE_STATE_FLAGS Flags;
#if D3D12RHI_USE_PIPELINE_STATE_STREAM
inline bool RequiresStream() const { return MS.BytecodeLength > 0; }
FD3D12_GRAPHICS_PIPELINE_STATE_STREAM PipelineStateStream() const;
#if PLATFORM_SUPPORTS_MESH_SHADERS
FD3D12_MESH_PIPELINE_STATE_STREAM MeshPipelineStateStream() const;
#endif
D3D12_GRAPHICS_PIPELINE_STATE_DESC GraphicsDescV0() const;
#endif // PLATFORM_WINDOWS
};
struct FD3D12LowLevelGraphicsPipelineStateDesc
@@ -137,10 +131,8 @@ struct FD3D12LowLevelGraphicsPipelineStateDesc
// Compute pipeline struct that represents the latest versions of PSO subobjects currently supported by the RHI.
struct FD3D12_COMPUTE_PIPELINE_STATE_DESC : public D3D12_COMPUTE_PIPELINE_STATE_DESC
{
#if D3D12RHI_USE_PIPELINE_STATE_STREAM
FD3D12_COMPUTE_PIPELINE_STATE_STREAM PipelineStateStream() const;
D3D12_COMPUTE_PIPELINE_STATE_DESC ComputeDescV0() const;
#endif
};
struct FD3D12ComputePipelineStateDesc