mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor changes to support Clang on Windows (#3216)

Browse Source 
* Minor changes to support Clang on Windows

* Use _MSC_VER instead of BX_PLATFORM_WINDOWS
This commit is contained in:
Justin Boswell 2023-12-06 17:42:01 -08:00 committed by GitHub
parent 07be0f213a
commit db40a04a08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/renderer_d3d12.cpp
View File

@ -474,13 +474,13 @@ namespace bgfx { namespace d3d12
static inline D3D12_HEAP_PROPERTIES ID3D12DeviceGetCustomHeapProperties(ID3D12Device *device, uint32_t nodeMask, D3D12_HEAP_TYPE heapType) static inline D3D12_HEAP_PROPERTIES ID3D12DeviceGetCustomHeapProperties(ID3D12Device *device, uint32_t nodeMask, D3D12_HEAP_TYPE heapType)
{ {
#if BX_COMPILER_MSVC #if BX_COMPILER_MSVC || (BX_COMPILER_CLANG && defined(_MSC_VER))
return device->GetCustomHeapProperties(nodeMask, heapType); return device->GetCustomHeapProperties(nodeMask, heapType);
#else #else
D3D12_HEAP_PROPERTIES ret; D3D12_HEAP_PROPERTIES ret;
device->GetCustomHeapProperties(&ret, nodeMask, heapType); device->GetCustomHeapProperties(&ret, nodeMask, heapType);
return ret; return ret;
#endif // BX_COMPILER_MSVC #endif // BX_COMPILER_MSVC || (BX_COMPILER_CLANG && defined(_MSC_VER))
} }
static void initHeapProperties(ID3D12Device* _device, D3D12_HEAP_PROPERTIES& _properties) static void initHeapProperties(ID3D12Device* _device, D3D12_HEAP_PROPERTIES& _properties)
@ -525,11 +525,11 @@ namespace bgfx { namespace d3d12
void* ptr; void* ptr;
DX_CHECK(resource->Map(0, NULL, &ptr) ); DX_CHECK(resource->Map(0, NULL, &ptr) );
D3D12_RESOURCE_ALLOCATION_INFO rai; D3D12_RESOURCE_ALLOCATION_INFO rai;
#if BX_COMPILER_MSVC #if BX_COMPILER_MSVC || (BX_COMPILER_CLANG && defined(_MSC_VER))
rai = _device->GetResourceAllocationInfo(1, 1, _resourceDesc); rai = _device->GetResourceAllocationInfo(1, 1, _resourceDesc);
#else #else
_device->GetResourceAllocationInfo(&rai, 1, 1, _resourceDesc); _device->GetResourceAllocationInfo(&rai, 1, 1, _resourceDesc);
#endif // BX_COMPILER_MSVC #endif // BX_COMPILER_MSVC || (BX_COMPILER_CLANG && defined(_MSC_VER))
bx::memSet(ptr, 0, size_t(rai.SizeInBytes) ); bx::memSet(ptr, 0, size_t(rai.SizeInBytes) );
resource->Unmap(0, NULL); resource->Unmap(0, NULL);
} }
@ -626,35 +626,35 @@ namespace bgfx { namespace d3d12
inline D3D12_CPU_DESCRIPTOR_HANDLE getCPUHandleHeapStart(ID3D12DescriptorHeap* _heap) inline D3D12_CPU_DESCRIPTOR_HANDLE getCPUHandleHeapStart(ID3D12DescriptorHeap* _heap)
{ {
#if BX_COMPILER_MSVC #if BX_COMPILER_MSVC || (BX_COMPILER_CLANG && defined(_MSC_VER))
return _heap->GetCPUDescriptorHandleForHeapStart(); return _heap->GetCPUDescriptorHandleForHeapStart();
#else #else
D3D12_CPU_DESCRIPTOR_HANDLE handle; D3D12_CPU_DESCRIPTOR_HANDLE handle;
_heap->GetCPUDescriptorHandleForHeapStart(&handle); _heap->GetCPUDescriptorHandleForHeapStart(&handle);
return handle; return handle;
#endif // BX_COMPILER_MSVC #endif // BX_COMPILER_MSVC || (BX_COMPILER_CLANG && defined(_MSC_VER))
} }
inline D3D12_GPU_DESCRIPTOR_HANDLE getGPUHandleHeapStart(ID3D12DescriptorHeap* _heap) inline D3D12_GPU_DESCRIPTOR_HANDLE getGPUHandleHeapStart(ID3D12DescriptorHeap* _heap)
{ {
#if BX_COMPILER_MSVC #if BX_COMPILER_MSVC || (BX_COMPILER_CLANG && defined(_MSC_VER))
return _heap->GetGPUDescriptorHandleForHeapStart(); return _heap->GetGPUDescriptorHandleForHeapStart();
#else #else
D3D12_GPU_DESCRIPTOR_HANDLE handle; D3D12_GPU_DESCRIPTOR_HANDLE handle;
_heap->GetGPUDescriptorHandleForHeapStart(&handle); _heap->GetGPUDescriptorHandleForHeapStart(&handle);
return handle; return handle;
#endif // BX_COMPILER_MSVC #endif // BX_COMPILER_MSVC || (BX_COMPILER_CLANG && defined(_MSC_VER))
} }
inline D3D12_RESOURCE_DESC getResourceDesc(ID3D12Resource* _resource) inline D3D12_RESOURCE_DESC getResourceDesc(ID3D12Resource* _resource)
{ {
#if BX_COMPILER_MSVC #if BX_COMPILER_MSVC || (BX_COMPILER_CLANG && defined(_MSC_VER))
return _resource->GetDesc(); return _resource->GetDesc();
#else #else
D3D12_RESOURCE_DESC desc; D3D12_RESOURCE_DESC desc;
_resource->GetDesc(&desc); _resource->GetDesc(&desc);
return desc; return desc;
#endif // BX_COMPILER_MSVC #endif // BX_COMPILER_MSVC || (BX_COMPILER_CLANG && defined(_MSC_VER))
} }
#if BGFX_CONFIG_DEBUG_ANNOTATION && (BX_PLATFORM_WINDOWS || BX_PLATFORM_WINRT) #if BGFX_CONFIG_DEBUG_ANNOTATION && (BX_PLATFORM_WINDOWS || BX_PLATFORM_WINRT)