GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

removal of old XboxOneStuff

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/GraphicsDevice/DirectX/DX12/GPUBufferDX12.cpp
View File

@@ -109,7 +109,7 @@ bool GPUBufferDX12::OnInit()
resourceDesc.Flags |= D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE;
if (useUAV)
resourceDesc.Flags |= D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS;
#if PLATFORM_XBOX_SCARLETT
#if PLATFORM_XBOX_SCARLETT || PLATFORM_XBOX_ONE
if (_desc.Flags & GPUBufferFlags::Argument)
resourceDesc.Flags |= D3D12XBOX_RESOURCE_FLAG_ALLOW_INDIRECT_BUFFER;
#endif

2
Source/Engine/GraphicsDevice/DirectX/DX12/GPUContextDX12.cpp
View File

@@ -904,7 +904,7 @@ void GPUContextDX12::BindVB(const Span<GPUBuffer*>& vertexBuffers, const uint32*
{
_vbCount = vertexBuffers.Length();
Platform::MemoryCopy(_vbViews, views, sizeof(views));
#if PLATFORM_XBOX_SCARLETT
#if PLATFORM_XBOX_SCARLETT || PLATFORM_XBOX_ONE
if (vertexBuffers.Length() == 0)
return;
#endif

20
Source/Engine/GraphicsDevice/DirectX/DX12/GPUDeviceDX12.cpp
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()
{

4
Source/Engine/GraphicsDevice/DirectX/DX12/GPUDeviceDX12.h
View File

@@ -157,14 +157,14 @@ public:
return 0xffffffff;
}
#if PLATFORM_XBOX_SCARLETT
#if PLATFORM_XBOX_SCARLETT ||PLATFORM_XBOX_ONE
void OnSuspend();
void OnResume();
#endif
private:
#if PLATFORM_XBOX_SCARLETT
#if PLATFORM_XBOX_SCARLETT ||PLATFORM_XBOX_ONE
void updateFrameEvents();
#endif
void updateRes2Dispose();

10
Source/Engine/GraphicsDevice/DirectX/DX12/GPUSwapChainDX12.cpp
View File

@@ -89,7 +89,7 @@ void GPUSwapChainDX12::releaseBackBuffer()
bool GPUSwapChainDX12::IsFullscreen()
{
#if PLATFORM_XBOX_SCARLETT
#if PLATFORM_XBOX_SCARLETT || PLATFORM_XBOX_ONE
return true;
#else
// Check if has no swap chain created
@@ -154,7 +154,7 @@ bool GPUSwapChainDX12::Resize(int32 width, int32 height)
_allowTearing = _device->AllowTearing;
_format = GPU_BACK_BUFFER_PIXEL_FORMAT;
#if PLATFORM_XBOX_SCARLETT
#if PLATFORM_XBOX_SCARLETT || PLATFORM_XBOX_ONE
ReleaseGPU();
_currentFrameIndex = 0;
@@ -283,7 +283,7 @@ void GPUSwapChainDX12::getBackBuffer()
for (int32 i = 0; i < _backBuffers.Count(); i++)
{
ID3D12Resource* backbuffer;
#if PLATFORM_XBOX_SCARLETT
#if PLATFORM_XBOX_SCARLETT || PLATFORM_XBOX_ONE
D3D12_HEAP_PROPERTIES swapChainHeapProperties;
swapChainHeapProperties.Type = D3D12_HEAP_TYPE_DEFAULT;
swapChainHeapProperties.CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_UNKNOWN;
@@ -319,7 +319,7 @@ void GPUSwapChainDX12::getBackBuffer()
}
}
#if PLATFORM_XBOX_SCARLETT
#if PLATFORM_XBOX_SCARLETT || PLATFORM_XBOX_ONE
void GPUSwapChainDX12::Begin(RenderTask* task)
{
@@ -348,7 +348,7 @@ void GPUSwapChainDX12::End(RenderTask* task)
void GPUSwapChainDX12::Present(bool vsync)
{
#if PLATFORM_XBOX_SCARLETT
#if PLATFORM_XBOX_SCARLETT || PLATFORM_XBOX_ONE
ID3D12Resource* backBuffer = _backBuffers[_currentFrameIndex].GetResource();
D3D12XBOX_PRESENT_PLANE_PARAMETERS planeParameters = {};
planeParameters.Token = _framePipelineToken;

4
Source/Engine/GraphicsDevice/DirectX/DX12/GPUSwapChainDX12.h
View File

@@ -62,7 +62,7 @@ private:
HWND _windowHandle;
IDXGISwapChain3* _swapChain;
int32 _currentFrameIndex;
#if PLATFORM_XBOX_SCARLETT
#if PLATFORM_XBOX_SCARLETT || PLATFORM_XBOX_ONE
D3D12XBOX_FRAME_PIPELINE_TOKEN _framePipelineToken;
#endif
Array<BackBufferDX12, FixedAllocation<4>> _backBuffers;
@@ -102,7 +102,7 @@ public:
bool IsFullscreen() override;
void SetFullscreen(bool isFullscreen) override;
GPUTextureView* GetBackBufferView() override;
#if PLATFORM_XBOX_SCARLETT
#if PLATFORM_XBOX_SCARLETT || PLATFORM_XBOX_ONE
void Begin(RenderTask* task) override;
#endif
void End(RenderTask* task) override;

17
Source/Engine/GraphicsDevice/DirectX/DX12/GraphicsDeviceDX12.Build.cs
View File

@@ -22,13 +22,16 @@ public class GraphicsDeviceDX12 : GraphicsDeviceBaseModule
options.PublicDefinitions.Add("GRAPHICS_API_DIRECTX12");
switch (options.Platform.Target)
{
case TargetPlatform.Windows:
options.OutputFiles.Add("d3d12.lib");
options.DelayLoadLibraries.Add("d3d12.dll");
break;
case TargetPlatform.XboxScarlett:
options.OutputFiles.Add("d3d12_xs.lib");
break;
case TargetPlatform.Windows:
options.OutputFiles.Add("d3d12.lib");
options.DelayLoadLibraries.Add("d3d12.dll");
break;
case TargetPlatform.XboxOne:
options.OutputFiles.Add("d3d12_x.lib");
break;
case TargetPlatform.XboxScarlett:
options.OutputFiles.Add("d3d12_xs.lib");
break;
}
if (UseWinPixEventRuntime)