Book a Demo!
CoCalc Logo Icon
StoreFeaturesDocsShareSupportNewsAboutPoliciesSign UpSign In
godotengine
GitHub Repository: godotengine/godot
 Path: blob/master/thirdparty/directx_headers/patches/0001-mingw-pragma.patch
9898 views
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
 

9
+#if defined(_MSC_VER)

10
 #pragma warning(push)

11
 #pragma warning(disable : 4324)

12
+#endif

13
 template <typename InnerStructType, D3D12_PIPELINE_STATE_SUBOBJECT_TYPE Type, typename DefaultArg = InnerStructType>

14
 class alignas(void*) CD3DX12_PIPELINE_STATE_STREAM_SUBOBJECT

15
 {

16
@@ -42,7 +44,9 @@ public:

17
     InnerStructType* operator&() noexcept { return &pssInner; }

18
     InnerStructType const* operator&() const noexcept { return &pssInner; }

19
 };

20
+#if defined(_MSC_VER)

21
 #pragma warning(pop)

22
+#endif

23
 typedef CD3DX12_PIPELINE_STATE_STREAM_SUBOBJECT< D3D12_PIPELINE_STATE_FLAGS,         D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_FLAGS>                             CD3DX12_PIPELINE_STATE_STREAM_FLAGS;

24
 typedef CD3DX12_PIPELINE_STATE_STREAM_SUBOBJECT< UINT,                               D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_NODE_MASK>                         CD3DX12_PIPELINE_STATE_STREAM_NODE_MASK;

25
 typedef CD3DX12_PIPELINE_STATE_STREAM_SUBOBJECT< ID3D12RootSignature*,               D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_ROOT_SIGNATURE>                    CD3DX12_PIPELINE_STATE_STREAM_ROOT_SIGNATURE;

26


27