ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

3rdparty: Error fixes for clang-cl

This commit is contained in:
Stenzek 2022-12-25 18:20:47 +10:00 committed by refractionpcsx2
parent 7aa3322a04
commit 8e0e4cf25d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/d3d12memalloc/include/D3D12MemAlloc.h vendored
View File

@ -144,7 +144,7 @@ public:
protected: protected:
virtual void ReleaseThis() { delete this; } virtual void ReleaseThis() { delete this; }
private: private:
D3D12MA_ATOMIC_UINT32 m_RefCount = 1; D3D12MA_ATOMIC_UINT32 m_RefCount{1};
}; };
} // namespace D3D12MA } // namespace D3D12MA

4
3rdparty/d3d12memalloc/src/D3D12MemAlloc.cpp vendored
View File

@ -6082,7 +6082,7 @@ private:
D3D12MA_ATOMIC_UINT64 m_BlockBytes[DXGI_MEMORY_SEGMENT_GROUP_COUNT] = {}; D3D12MA_ATOMIC_UINT64 m_BlockBytes[DXGI_MEMORY_SEGMENT_GROUP_COUNT] = {};
D3D12MA_ATOMIC_UINT64 m_AllocationBytes[DXGI_MEMORY_SEGMENT_GROUP_COUNT] = {}; D3D12MA_ATOMIC_UINT64 m_AllocationBytes[DXGI_MEMORY_SEGMENT_GROUP_COUNT] = {};
D3D12MA_ATOMIC_UINT32 m_OperationsSinceBudgetFetch = 0; D3D12MA_ATOMIC_UINT32 m_OperationsSinceBudgetFetch{0};
D3D12MA_RW_MUTEX m_BudgetMutex; D3D12MA_RW_MUTEX m_BudgetMutex;
UINT64 m_D3D12Usage[DXGI_MEMORY_SEGMENT_GROUP_COUNT] = {}; UINT64 m_D3D12Usage[DXGI_MEMORY_SEGMENT_GROUP_COUNT] = {};
UINT64 m_D3D12Budget[DXGI_MEMORY_SEGMENT_GROUP_COUNT] = {}; UINT64 m_D3D12Budget[DXGI_MEMORY_SEGMENT_GROUP_COUNT] = {};
@ -6317,7 +6317,7 @@ class AllocatorPimpl
friend class Allocator; friend class Allocator;
friend class Pool; friend class Pool;
public: public:
std::atomic_uint32_t m_RefCount = 1; std::atomic_uint32_t m_RefCount{1};
CurrentBudgetData m_Budget; CurrentBudgetData m_Budget;
AllocatorPimpl(const ALLOCATION_CALLBACKS& allocationCallbacks, const ALLOCATOR_DESC& desc); AllocatorPimpl(const ALLOCATION_CALLBACKS& allocationCallbacks, const ALLOCATOR_DESC& desc);

2
3rdparty/lzma/src/LzFind.c vendored
View File

@ -506,7 +506,7 @@ void MatchFinder_Init(CMatchFinder *p)
#ifdef MY_CPU_X86_OR_AMD64 #if defined(MY_CPU_X86_OR_AMD64) && (!defined(_MSC_VER) || !defined(__clang__))
#if defined(__clang__) && (__clang_major__ >= 8) \ #if defined(__clang__) && (__clang_major__ >= 8) \
|| defined(__GNUC__) && (__GNUC__ >= 8) \ || defined(__GNUC__) && (__GNUC__ >= 8) \
|| defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 1900) || defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 1900)