removal of old XboxOneStuff

This commit is contained in:
honzapatCZ
2021-07-21 15:10:39 +02:00
parent 36456bfe74
commit c17d86a134
308 changed files with 225 additions and 26405 deletions

View File

@@ -37,7 +37,7 @@ static bool CheckDX12Support(IDXGIAdapter* adapter)
GPUDevice* GPUDeviceDX12::Create()
{
#if PLATFORM_XBOX_SCARLETT
#if PLATFORM_XBOX_SCARLETT || PLATFORM_XBOX_ONE
IDXGIFactory4* dxgiFactory = nullptr;
GPUAdapterDX selectedAdapter;
selectedAdapter.Index = 0;
@@ -204,11 +204,17 @@ namespace XboxScarlett
extern Action OnSuspend;
extern Action OnResume;
}
#elif PLATFORM_XBOX_ONE
namespace XboxOne
{
extern Action OnSuspend;
extern Action OnResume;
}
#endif
bool GPUDeviceDX12::Init()
{
#if PLATFORM_XBOX_SCARLETT
#if PLATFORM_XBOX_SCARLETT || PLATFORM_XBOX_ONE
// Create DirectX device
D3D12XBOX_CREATE_DEVICE_PARAMETERS params = {};
params.Version = D3D12_SDK_VERSION;
@@ -220,7 +226,9 @@ bool GPUDeviceDX12::Init()
params.GraphicsCommandQueueRingSizeBytes = static_cast<UINT>(D3D12XBOX_DEFAULT_SIZE_BYTES);
params.GraphicsScratchMemorySizeBytes = static_cast<UINT>(D3D12XBOX_DEFAULT_SIZE_BYTES);
params.ComputeScratchMemorySizeBytes = static_cast<UINT>(D3D12XBOX_DEFAULT_SIZE_BYTES);
#if PLATFORM_XBOX_SCARLETT
params.DisableDXR = TRUE;
#endif
VALIDATE_DIRECTX_RESULT(D3D12XboxCreateDevice(nullptr, &params, IID_GRAPHICS_PPV_ARGS(&_device)));
// Setup adapter
@@ -255,8 +263,14 @@ bool GPUDeviceDX12::Init()
}
LOG(Info, "Hardware Version: {0}", hwVer);
updateFrameEvents();
#if PLATFORM_XBOX_SCARLETT
XboxScarlett::OnSuspend.Bind<GPUDeviceDX12, &GPUDeviceDX12::OnSuspend>(this);
XboxScarlett::OnResume.Bind<GPUDeviceDX12, &GPUDeviceDX12::OnResume>(this);
#elif PLATFORM_XBOX_ONE
XboxOne::OnSuspend.Bind<GPUDeviceDX12, &GPUDeviceDX12::OnSuspend>(this);
XboxOne::OnResume.Bind<GPUDeviceDX12, &GPUDeviceDX12::OnResume>(this);
#endif
#else
// Get DXGI adapter
IDXGIAdapter1* adapter;
@@ -839,7 +853,7 @@ void GPUDeviceDX12::updateRes2Dispose()
_res2DisposeLock.Unlock();
}
#if PLATFORM_XBOX_SCARLETT
#if PLATFORM_XBOX_SCARLETT || PLATFORM_XBOX_ONE
void GPUDeviceDX12::OnSuspend()
{