0001-mingw-pragma.patch 1.6 KB

12345678910111213141516171819202122232425
  1. diff --git a/thirdparty/directx_headers/include/directx/d3dx12_pipeline_state_stream.h b/thirdparty/directx_headers/include/directx/d3dx12_pipeline_state_stream.h
  2. index f061e79596..27c7f20448 100644
  3. --- a/thirdparty/directx_headers/include/directx/d3dx12_pipeline_state_stream.h
  4. +++ b/thirdparty/directx_headers/include/directx/d3dx12_pipeline_state_stream.h
  5. @@ -25,8 +25,10 @@
  6. struct DefaultSampleMask { operator UINT() noexcept { return UINT_MAX; } };
  7. struct DefaultSampleDesc { operator DXGI_SAMPLE_DESC() noexcept { return DXGI_SAMPLE_DESC{1, 0}; } };
  8. +#if defined(_MSC_VER)
  9. #pragma warning(push)
  10. #pragma warning(disable : 4324)
  11. +#endif
  12. template <typename InnerStructType, D3D12_PIPELINE_STATE_SUBOBJECT_TYPE Type, typename DefaultArg = InnerStructType>
  13. class alignas(void*) CD3DX12_PIPELINE_STATE_STREAM_SUBOBJECT
  14. {
  15. @@ -42,7 +44,9 @@ public:
  16. InnerStructType* operator&() noexcept { return &pssInner; }
  17. InnerStructType const* operator&() const noexcept { return &pssInner; }
  18. };
  19. +#if defined(_MSC_VER)
  20. #pragma warning(pop)
  21. +#endif
  22. typedef CD3DX12_PIPELINE_STATE_STREAM_SUBOBJECT< D3D12_PIPELINE_STATE_FLAGS, D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_FLAGS> CD3DX12_PIPELINE_STATE_STREAM_FLAGS;
  23. typedef CD3DX12_PIPELINE_STATE_STREAM_SUBOBJECT< UINT, D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_NODE_MASK> CD3DX12_PIPELINE_STATE_STREAM_NODE_MASK;
  24. typedef CD3DX12_PIPELINE_STATE_STREAM_SUBOBJECT< ID3D12RootSignature*, D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_ROOT_SIGNATURE> CD3DX12_PIPELINE_STATE_STREAM_ROOT_SIGNATURE;