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

UAV overlap was accidentally never enabled

Browse Source 
fix renderdoc check happening too late for certain SLI settings
Both changes proposed by ikrima/kite&lighting.
#rb rolando.caloca
#jira none

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: jonas.meyer
#ROBOMERGE-SOURCE: CL 7099898 in //UE4/Release-4.23/... via CL 7099899
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v367-6836689)

[CL 7126514 by jonas meyer in Dev-Anim branch]
This commit is contained in:
jonas meyer
2019-06-21 02:26:26 -04:00
parent e51c300ac1
commit 383704078b
3 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Engine/Source/Runtime/Windows/D3D11RHI/Private/D3D11Commands.cpp
View File

@@ -1960,8 +1960,8 @@ static bool GOverlapUAVOBegin = false;
static bool IsUAVOverlapSupported()
{
if (!GAllowUAVFlushExt ||
!IsRHIDeviceNVIDIA() ||
!IsRHIDeviceAMD())
(!IsRHIDeviceNVIDIA() &&
!IsRHIDeviceAMD()))
{
return false;
}

24
Engine/Source/Runtime/Windows/D3D11RHI/Private/D3D11Device.cpp
View File

@@ -417,30 +417,6 @@ void FD3D11DynamicRHI::SetupAfterDeviceCreation()
D3D11RHI_ShouldAllowAsyncResourceCreation() ? TEXT("no driver support") : TEXT("disabled by user"));
}
#if PLATFORM_WINDOWS
IUnknown* RenderDoc;
IID RenderDocID;
if (SUCCEEDED(IIDFromString(L"{A7AA6116-9C8D-4BBA-9083-B4D816B71B78}", &RenderDocID)))
{
if (SUCCEEDED(Direct3DDevice->QueryInterface(RenderDocID, (void**)(&RenderDoc))))
{
bRenderDoc = true;
// Running under RenderDoc, so enable capturing mode
GDynamicRHI->EnableIdealGPUCaptureOptions(true);
}
}
IUnknown* IntelGPA;
static const IID IntelGPAID = { 0xCCFFEF16, 0x7B69, 0x468F, {0xBC, 0xE3, 0xCD, 0x95, 0x33, 0x69, 0xA3, 0x9A} };
if (SUCCEEDED(Direct3DDevice->QueryInterface(IntelGPAID, (void**)(&IntelGPA))))
{
// Running under Intel GPA, so enable capturing mode
GDynamicRHI->EnableIdealGPUCaptureOptions(true);
}
#endif
// Check for typed UAV load support
for (uint32 PF = 0; PF < PF_MAX; ++PF)
{

27
Engine/Source/Runtime/Windows/D3D11RHI/Private/Windows/WindowsD3D11Device.cpp
View File

@@ -1630,7 +1630,32 @@ void FD3D11DynamicRHI::InitD3DDevice()
#endif //NVAPI_INTERFACE
CACHE_NV_AFTERMATH_ENABLED();
#if PLATFORM_WINDOWS
IUnknown* RenderDoc;
IID RenderDocID;
if (SUCCEEDED(IIDFromString(L"{A7AA6116-9C8D-4BBA-9083-B4D816B71B78}", &RenderDocID)))
{
if (SUCCEEDED(Direct3DDevice->QueryInterface(RenderDocID, (void**)(&RenderDoc))))
{
bRenderDoc = true;
// Running under RenderDoc, so enable capturing mode
GDynamicRHI->EnableIdealGPUCaptureOptions(true);
}
}
IUnknown* IntelGPA;
static const IID IntelGPAID = { 0xCCFFEF16, 0x7B69, 0x468F, {0xBC, 0xE3, 0xCD, 0x95, 0x33, 0x69, 0xA3, 0x9A} };
if (SUCCEEDED(Direct3DDevice->QueryInterface(IntelGPAID, (void**)(&IntelGPA))))
{
// Running under Intel GPA, so enable capturing mode
GDynamicRHI->EnableIdealGPUCaptureOptions(true);
}
#endif
#if WITH_SLI
GNumAlternateFrameRenderingGroups = 1;