commit a435bb3da700db9648f6a9d8b81e6680155e8bd0
author Chuck Walbourn <walbourn@users.noreply.github.com> Fri Jul 22 23:15:10 2022
committer GitHub <noreply@github.com> Fri Jul 22 23:15:10 2022
tree 8bb8d69876e7015d9d577cea8f6771a59a3223d5
parent fd329244e62201bf959331d28514928fc1d45005

Update D3DX12.H to support new ABI for MinGW (#73)

include/directx/d3dx12.h

diff --git a/include/directx/d3dx12.h b/include/directx/d3dx12.h
index 8afd08c..8625b30 100644
--- a/include/directx/d3dx12.h
+++ b/include/directx/d3dx12.h
@@ -76,7 +76,12 @@
         FLOAT minDepth = D3D12_MIN_DEPTH,

         FLOAT maxDepth = D3D12_MAX_DEPTH ) noexcept

     {

+#if defined(_MSC_VER) || !defined(_WIN32)

         const auto Desc = pResource->GetDesc();

+#else

+        D3D12_RESOURCE_DESC tmpDesc;

+        const auto& Desc = *pResource->GetDesc(&tmpDesc);

+#endif

         const UINT64 SubresourceWidth = Desc.Width >> mipSlice;

         const UINT64 SubresourceHeight = Desc.Height >> mipSlice;

         switch (Desc.Dimension)

@@ -2165,7 +2170,12 @@
     _In_range_(0,D3D12_REQ_SUBRESOURCES) UINT FirstSubresource,

     _In_range_(0,D3D12_REQ_SUBRESOURCES-FirstSubresource) UINT NumSubresources) noexcept

 {

+#if defined(_MSC_VER) || !defined(_WIN32)

     const auto Desc = pDestinationResource->GetDesc();

+#else

+    D3D12_RESOURCE_DESC tmpDesc;

+    const auto& Desc = *pDestinationResource->GetDesc(&tmpDesc);

+#endif

     UINT64 RequiredSize = 0;

 

     ID3D12Device* pDevice = nullptr;

@@ -2191,8 +2201,14 @@
     _In_reads_(NumSubresources) const D3D12_SUBRESOURCE_DATA* pSrcData) noexcept

 {

     // Minor validation

+#if defined(_MSC_VER) || !defined(_WIN32)

     const auto IntermediateDesc = pIntermediate->GetDesc();

     const auto DestinationDesc = pDestinationResource->GetDesc();

+#else

+    D3D12_RESOURCE_DESC tmpDesc1, tmpDesc2;

+    const auto& IntermediateDesc = *pIntermediate->GetDesc(&tmpDesc1);

+    const auto& DestinationDesc = *pDestinationResource->GetDesc(&tmpDesc2);

+#endif

     if (IntermediateDesc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER ||

         IntermediateDesc.Width < RequiredSize + pLayouts[0].Offset ||

         RequiredSize > SIZE_T(-1) ||

@@ -2250,8 +2266,14 @@
     _In_reads_(NumSubresources) const D3D12_SUBRESOURCE_INFO* pSrcData) noexcept

 {

     // Minor validation

+#if defined(_MSC_VER) || !defined(_WIN32)

     const auto IntermediateDesc = pIntermediate->GetDesc();

     const auto DestinationDesc = pDestinationResource->GetDesc();

+#else

+    D3D12_RESOURCE_DESC tmpDesc1, tmpDesc2;

+    const auto& IntermediateDesc = *pIntermediate->GetDesc(&tmpDesc1);

+    const auto& DestinationDesc = *pDestinationResource->GetDesc(&tmpDesc2);

+#endif

     if (IntermediateDesc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER ||

         IntermediateDesc.Width < RequiredSize + pLayouts[0].Offset ||

         RequiredSize > SIZE_T(-1) ||

@@ -2319,7 +2341,12 @@
     auto pRowSizesInBytes = reinterpret_cast<UINT64*>(pLayouts + NumSubresources);

     auto pNumRows = reinterpret_cast<UINT*>(pRowSizesInBytes + NumSubresources);

 

+#if defined(_MSC_VER) || !defined(_WIN32)

     const auto Desc = pDestinationResource->GetDesc();

+#else

+    D3D12_RESOURCE_DESC tmpDesc;

+    const auto& Desc = *pDestinationResource->GetDesc(&tmpDesc);

+#endif

     ID3D12Device* pDevice = nullptr;

     pDestinationResource->GetDevice(IID_ID3D12Device, reinterpret_cast<void**>(&pDevice));

     pDevice->GetCopyableFootprints(&Desc, FirstSubresource, NumSubresources, IntermediateOffset, pLayouts, pNumRows, pRowSizesInBytes, &RequiredSize);

@@ -2357,7 +2384,12 @@
     auto pRowSizesInBytes = reinterpret_cast<UINT64*>(pLayouts + NumSubresources);

     auto pNumRows = reinterpret_cast<UINT*>(pRowSizesInBytes + NumSubresources);

 

+#if defined(_MSC_VER) || !defined(_WIN32)

     const auto Desc = pDestinationResource->GetDesc();

+#else

+    D3D12_RESOURCE_DESC tmpDesc;

+    const auto& Desc = *pDestinationResource->GetDesc(&tmpDesc);

+#endif

     ID3D12Device* pDevice = nullptr;

     pDestinationResource->GetDevice(IID_ID3D12Device, reinterpret_cast<void**>(&pDevice));

     pDevice->GetCopyableFootprints(&Desc, FirstSubresource, NumSubresources, IntermediateOffset, pLayouts, pNumRows, pRowSizesInBytes, &RequiredSize);

@@ -2385,7 +2417,12 @@
     UINT NumRows[MaxSubresources];

     UINT64 RowSizesInBytes[MaxSubresources];

 

+#if defined(_MSC_VER) || !defined(_WIN32)

     const auto Desc = pDestinationResource->GetDesc();

+#else

+    D3D12_RESOURCE_DESC tmpDesc;

+    const auto& Desc = *pDestinationResource->GetDesc(&tmpDesc);

+#endif

     ID3D12Device* pDevice = nullptr;

     pDestinationResource->GetDevice(IID_ID3D12Device, reinterpret_cast<void**>(&pDevice));

     pDevice->GetCopyableFootprints(&Desc, FirstSubresource, NumSubresources, IntermediateOffset, Layouts, NumRows, RowSizesInBytes, &RequiredSize);

@@ -2412,7 +2449,12 @@
     UINT NumRows[MaxSubresources];

     UINT64 RowSizesInBytes[MaxSubresources];

 

+#if defined(_MSC_VER) || !defined(_WIN32)

     const auto Desc = pDestinationResource->GetDesc();

+#else

+    D3D12_RESOURCE_DESC tmpDesc;

+    const auto& Desc = *pDestinationResource->GetDesc(&tmpDesc);

+#endif

     ID3D12Device* pDevice = nullptr;

     pDestinationResource->GetDevice(IID_ID3D12Device, reinterpret_cast<void**>(&pDevice));

     pDevice->GetCopyableFootprints(&Desc, FirstSubresource, NumSubresources, IntermediateOffset, Layouts, NumRows, RowSizesInBytes, &RequiredSize);