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

Merge remote-tracking branch 'origin/master' into 1.1

Browse Source 
# Conflicts:
#	Source/Engine/Navigation/NavMesh.cpp
#	Source/Engine/Navigation/NavMeshBuilder.cpp
This commit is contained in:
Wojtek Figat
2021-01-22 11:31:22 +01:00
parent cbbfb16628 8680aba897
commit 6cbeac6537
178 changed files with 1163 additions and 864 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/GraphicsDevice/DirectX/DX11/GPUTimerQueryDX11.cpp
View File

@@ -118,7 +118,7 @@ float GPUTimerQueryDX11::GetResult()
if (!SingleShotLog)
{
SingleShotLog = true;
LOG(Warning, "Unrealiable GPU timer query detected.");
LOG(Warning, "Unreliable GPU timer query detected.");
}
#endif
}

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

@@ -216,7 +216,7 @@ uint64 GPUContextDX12::Execute(bool waitForCompletion)
ASSERT(_currentAllocator != nullptr);
auto queue = _device->GetCommandQueue();
// Flush reaming and buffered commands
// Flush remaining and buffered commands
FlushState();
_currentState = nullptr;

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

@@ -391,7 +391,7 @@ bool GPUDeviceDX12::Init()
{
// Descriptor tables
D3D12_DESCRIPTOR_RANGE r[2];
// TODO: separate ranges for pixel/vertex visiblity and one shared for all?
// TODO: separate ranges for pixel/vertex visibility and one shared for all?
{
D3D12_DESCRIPTOR_RANGE& range = r[0];
range.RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV;

2
Source/Engine/GraphicsDevice/DirectX/IncludeDirectXHeaders.h
View File

@@ -8,7 +8,7 @@
#include "Engine/Platform/Win32/IncludeWindowsHeaders.h"
#include "Engine/Platform/Windows/ComPtr.h"
// Helper define to dispose the COM object with reaming references counter checking
// Helper define to dispose the COM object with remaining references counter checking
#define DX_SAFE_RELEASE_CHECK(x, refs) if(x) { auto res = (x)->Release(); (x) = nullptr; CHECK(res == refs); }
#endif