From 979fe2d91ec86283665d5637ca92bff6a094f1ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Tue, 27 Nov 2018 18:14:06 -0800 Subject: [PATCH] dxsdk: Removed region pragmas. --- 3rdparty/dxsdk/include/d3d12.h | 4 ++-- 3rdparty/dxsdk/include/d3d12_1.h | 4 ++-- 3rdparty/dxsdk/include/d3d12sdklayers.h | 4 ++-- 3rdparty/dxsdk/include/d3d12video.h | 4 ++-- 3rdparty/dxsdk/include/d3dcompiler.h | 8 ++++---- 3rdparty/dxsdk/include/dxgi1_2.h | 8 ++++---- 3rdparty/dxsdk/include/dxgi1_3.h | 12 ++++++------ 3rdparty/dxsdk/include/dxgi1_4.h | 4 ++-- 3rdparty/dxsdk/include/dxgi1_5.h | 4 ++-- 3rdparty/dxsdk/include/dxgi1_6.h | 4 ++-- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/3rdparty/dxsdk/include/d3d12.h b/3rdparty/dxsdk/include/d3d12.h index 0c2e7cea8..2f9bdcc7a 100644 --- a/3rdparty/dxsdk/include/d3d12.h +++ b/3rdparty/dxsdk/include/d3d12.h @@ -346,7 +346,7 @@ extern "C"{ /* [local] */ #include -#pragma region App Family +// BK - pragma region App Family #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) #ifndef _D3D12_CONSTANTS #define _D3D12_CONSTANTS @@ -15345,7 +15345,7 @@ static const UUID D3D12MetaCommand = { /* C734C97E-8077-48C8-9FDC-D9D1DD31DD77 * { 0x9f, 0xdc, 0xd9, 0xd1, 0xdd, 0x31, 0xdd, 0x77 } }; #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ -#pragma endregion +// BK - pragma endregion DEFINE_GUID(IID_ID3D12Object,0xc4fec28f,0x7966,0x4e95,0x9f,0x94,0xf4,0x31,0xcb,0x56,0xc3,0xb8); DEFINE_GUID(IID_ID3D12DeviceChild,0x905db94b,0xa00c,0x4140,0x9d,0xf5,0x2b,0x64,0xca,0x9e,0xa3,0x57); DEFINE_GUID(IID_ID3D12RootSignature,0xc54a6b66,0x72df,0x4ee8,0x8b,0xe5,0xa9,0x46,0xa1,0x42,0x92,0x14); diff --git a/3rdparty/dxsdk/include/d3d12_1.h b/3rdparty/dxsdk/include/d3d12_1.h index d947cbc2a..2f2158706 100644 --- a/3rdparty/dxsdk/include/d3d12_1.h +++ b/3rdparty/dxsdk/include/d3d12_1.h @@ -144,7 +144,7 @@ extern "C"{ /* [local] */ #include -#pragma region App Family +// BK - pragma region App Family #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) #define D3D12_FEATURE_VIDEO_DECODE_BITSTREAM_ENCRYPTION_SCHEMES static_cast(4) #define D3D12_FEATURE_VIDEO_DECODE_BITSTREAM_ENCRYPTION_SCHEME_COUNT static_cast(12) @@ -2508,7 +2508,7 @@ EXTERN_C const IID IID_ID3D12CommandListMetaCommand; /* [local] */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ -#pragma endregion +// BK - pragma endregion DEFINE_GUID(IID_ID3D12CryptoSession,0xFC7C6C9D,0xC27D,0x4904,0x83,0x5D,0xA5,0xF2,0x09,0x6E,0xC6,0x5F); DEFINE_GUID(IID_ID3D12CryptoSessionPolicy,0x69FE3108,0x01A4,0x4AC3,0xAB,0x91,0xF5,0x1E,0x37,0x7A,0x62,0xAC); DEFINE_GUID(IID_ID3D12ContentProtectionDevice,0x59975f53,0xbf5f,0x42f2,0xb8,0x4f,0x5e,0x34,0x7c,0x1e,0x3d,0x43); diff --git a/3rdparty/dxsdk/include/d3d12sdklayers.h b/3rdparty/dxsdk/include/d3d12sdklayers.h index 5257d44b0..786551677 100644 --- a/3rdparty/dxsdk/include/d3d12sdklayers.h +++ b/3rdparty/dxsdk/include/d3d12sdklayers.h @@ -148,7 +148,7 @@ extern "C"{ /* [local] */ #include -#pragma region App Family +// BK - pragma region App Family #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) @@ -3169,7 +3169,7 @@ EXTERN_C const IID IID_ID3D12InfoQueue; /* [local] */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ -#pragma endregion +// BK - pragma endregion DEFINE_GUID(IID_ID3D12Debug,0x344488b7,0x6846,0x474b,0xb9,0x89,0xf0,0x27,0x44,0x82,0x45,0xe0); DEFINE_GUID(IID_ID3D12Debug1,0xaffaa4ca,0x63fe,0x4d8e,0xb8,0xad,0x15,0x90,0x00,0xaf,0x43,0x04); DEFINE_GUID(IID_ID3D12Debug2,0x93a665c4,0xa3b2,0x4e5d,0xb6,0x92,0xa2,0x6a,0xe1,0x4e,0x33,0x74); diff --git a/3rdparty/dxsdk/include/d3d12video.h b/3rdparty/dxsdk/include/d3d12video.h index e7582bd52..0e1f85fd7 100644 --- a/3rdparty/dxsdk/include/d3d12video.h +++ b/3rdparty/dxsdk/include/d3d12video.h @@ -114,7 +114,7 @@ extern "C"{ /* [local] */ #include -#pragma region App Family +// BK - pragma region App Family #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) typedef enum D3D12_VIDEO_FIELD_TYPE @@ -2425,7 +2425,7 @@ DEFINE_GUID(D3D12_VIDEO_DECODE_PROFILE_VP9, 0x463707f8, 0xa1d0, 0x4585, 0x87, 0x DEFINE_GUID(D3D12_VIDEO_DECODE_PROFILE_VP9_10BIT_PROFILE2, 0xa4c749ef, 0x6ecf, 0x48aa, 0x84, 0x48, 0x50, 0xa7, 0xa1, 0x16, 0x5f, 0xf7); DEFINE_GUID(D3D12_VIDEO_DECODE_PROFILE_VP8, 0x90b899ea, 0x3a62, 0x4705, 0x88, 0xb3, 0x8d, 0xf0, 0x4b, 0x27, 0x44, 0xe7); #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ -#pragma endregion +// BK - pragma endregion DEFINE_GUID(IID_ID3D12VideoDecoderHeap,0x0946B7C9,0xEBF6,0x4047,0xBB,0x73,0x86,0x83,0xE2,0x7D,0xBB,0x1F); DEFINE_GUID(IID_ID3D12VideoDevice,0x1F052807,0x0B46,0x4ACC,0x8A,0x89,0x36,0x4F,0x79,0x37,0x18,0xA4); DEFINE_GUID(IID_ID3D12VideoDecoder,0xC59B6BDC,0x7720,0x4074,0xA1,0x36,0x17,0xA1,0x56,0x03,0x74,0x70); diff --git a/3rdparty/dxsdk/include/d3dcompiler.h b/3rdparty/dxsdk/include/d3dcompiler.h index 96574d08f..881ae755b 100644 --- a/3rdparty/dxsdk/include/d3dcompiler.h +++ b/3rdparty/dxsdk/include/d3dcompiler.h @@ -41,7 +41,7 @@ extern "C" { #endif //__cplusplus -#pragma region Application Family +// BK - pragma region Application Family #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) //---------------------------------------------------------------------------- @@ -557,10 +557,10 @@ D3DDecompressShaders(_In_reads_bytes_(SrcDataSize) LPCVOID pSrcData, _Out_opt_ UINT* pTotalShaders); #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ -#pragma endregion +// BK - pragma endregion -#pragma region Desktop Family +// BK - pragma region Desktop Family #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) //---------------------------------------------------------------------------- @@ -576,7 +576,7 @@ D3DDisassemble10Effect(_In_ interface ID3D10Effect *pEffect, _Out_ ID3DBlob** ppDisassembly); #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ -#pragma endregion +// BK - pragma endregion #ifdef __cplusplus diff --git a/3rdparty/dxsdk/include/dxgi1_2.h b/3rdparty/dxsdk/include/dxgi1_2.h index b855f80a6..b324a1383 100644 --- a/3rdparty/dxsdk/include/dxgi1_2.h +++ b/3rdparty/dxsdk/include/dxgi1_2.h @@ -114,7 +114,7 @@ extern "C"{ /* [local] */ #include -#pragma region Desktop Family +// BK - pragma region Desktop Family #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) @@ -507,8 +507,8 @@ EXTERN_C const IID IID_IDXGIOutputDuplication; /* [local] */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ -#pragma endregion -#pragma region App Family +// BK - pragma endregion +// BK - pragma region App Family #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) typedef enum DXGI_ALPHA_MODE @@ -2447,7 +2447,7 @@ EXTERN_C const IID IID_IDXGIOutput1; /* [local] */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ -#pragma endregion +// BK - pragma endregion DEFINE_GUID(IID_IDXGIDisplayControl,0xea9dbf1a,0xc88e,0x4486,0x85,0x4a,0x98,0xaa,0x01,0x38,0xf3,0x0c); DEFINE_GUID(IID_IDXGIOutputDuplication,0x191cfac3,0xa341,0x470d,0xb2,0x6e,0xa8,0x64,0xf4,0x28,0x31,0x9c); DEFINE_GUID(IID_IDXGISurface2,0xaba496dd,0xb617,0x4cb8,0xa8,0x66,0xbc,0x44,0xd7,0xeb,0x1f,0xa2); diff --git a/3rdparty/dxsdk/include/dxgi1_3.h b/3rdparty/dxsdk/include/dxgi1_3.h index 6a9462dcd..3cedf32a0 100644 --- a/3rdparty/dxsdk/include/dxgi1_3.h +++ b/3rdparty/dxsdk/include/dxgi1_3.h @@ -107,7 +107,7 @@ extern "C"{ /* [local] */ #include -#pragma region App Family +// BK - pragma region App Family #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) #define DXGI_CREATE_FACTORY_DEBUG 0x1 HRESULT WINAPI CreateDXGIFactory2(UINT Flags, REFIID riid, _COM_Outptr_ void **ppFactory); @@ -1322,8 +1322,8 @@ EXTERN_C const IID IID_IDXGIFactory3; /* [local] */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ -#pragma endregion -#pragma region App Family +// BK - pragma endregion +// BK - pragma region App Family #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) typedef struct DXGI_DECODE_SWAP_CHAIN_DESC { @@ -1796,8 +1796,8 @@ enum DXGI_OVERLAY_SUPPORT_FLAG } DXGI_OVERLAY_SUPPORT_FLAG; #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ -#pragma endregion -#pragma region App Family +// BK - pragma endregion +// BK - pragma region App Family #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) @@ -2094,7 +2094,7 @@ EXTERN_C const IID IID_IDXGIOutput3; /* [local] */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ -#pragma endregion +// BK - pragma endregion DEFINE_GUID(IID_IDXGIDevice3,0x6007896c,0x3244,0x4afd,0xbf,0x18,0xa6,0xd3,0xbe,0xda,0x50,0x23); DEFINE_GUID(IID_IDXGISwapChain2,0xa8be2ac4,0x199f,0x4946,0xb3,0x31,0x79,0x59,0x9f,0xb9,0x8d,0xe7); DEFINE_GUID(IID_IDXGIOutput2,0x595e39d1,0x2724,0x4663,0x99,0xb1,0xda,0x96,0x9d,0xe2,0x83,0x64); diff --git a/3rdparty/dxsdk/include/dxgi1_4.h b/3rdparty/dxsdk/include/dxgi1_4.h index 5ff289c0e..f6d151b7c 100644 --- a/3rdparty/dxsdk/include/dxgi1_4.h +++ b/3rdparty/dxsdk/include/dxgi1_4.h @@ -79,7 +79,7 @@ extern "C"{ /* [local] */ #include -#pragma region App Family +// BK - pragma region App Family #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) typedef enum DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG @@ -1471,7 +1471,7 @@ EXTERN_C const IID IID_IDXGIAdapter3; /* [local] */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ -#pragma endregion +// BK - pragma endregion DEFINE_GUID(IID_IDXGISwapChain3,0x94d99bdb,0xf1f8,0x4ab0,0xb2,0x36,0x7d,0xa0,0x17,0x0e,0xda,0xb1); DEFINE_GUID(IID_IDXGIOutput4,0xdc7dca35,0x2196,0x414d,0x9F,0x53,0x61,0x78,0x84,0x03,0x2a,0x60); DEFINE_GUID(IID_IDXGIFactory4,0x1bc6ea02,0xef36,0x464f,0xbf,0x0c,0x21,0xca,0x39,0xe5,0x16,0x8a); diff --git a/3rdparty/dxsdk/include/dxgi1_5.h b/3rdparty/dxsdk/include/dxgi1_5.h index 1fd626742..81ab76016 100644 --- a/3rdparty/dxsdk/include/dxgi1_5.h +++ b/3rdparty/dxsdk/include/dxgi1_5.h @@ -79,7 +79,7 @@ extern "C"{ /* [local] */ #include -#pragma region App Family +// BK - pragma region App Family #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) typedef enum DXGI_OUTDUPL_FLAG @@ -1522,7 +1522,7 @@ EXTERN_C const IID IID_IDXGIFactory5; /* [local] */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ -#pragma endregion +// BK - pragma endregion DEFINE_GUID(IID_IDXGIOutput5,0x80A07424,0xAB52,0x42EB,0x83,0x3C,0x0C,0x42,0xFD,0x28,0x2D,0x98); DEFINE_GUID(IID_IDXGISwapChain4,0x3D585D5A,0xBD4A,0x489E,0xB1,0xF4,0x3D,0xBC,0xB6,0x45,0x2F,0xFB); DEFINE_GUID(IID_IDXGIDevice4,0x95B4F95F,0xD8DA,0x4CA4,0x9E,0xE6,0x3B,0x76,0xD5,0x96,0x8A,0x10); diff --git a/3rdparty/dxsdk/include/dxgi1_6.h b/3rdparty/dxsdk/include/dxgi1_6.h index 16492f06a..4e0778bd2 100644 --- a/3rdparty/dxsdk/include/dxgi1_6.h +++ b/3rdparty/dxsdk/include/dxgi1_6.h @@ -80,7 +80,7 @@ extern "C"{ // Copyright (c) Microsoft Corporation. All Rights Reserved #include -#pragma region App Family +// BK - pragma region App Family #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) HRESULT WINAPI DXGIDeclareAdapterRemovalSupport(); typedef @@ -1493,7 +1493,7 @@ EXTERN_C const IID IID_IDXGIFactory7; /* [local] */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ -#pragma endregion +// BK - pragma endregion DEFINE_GUID(IID_IDXGIAdapter4,0x3c8d99d1,0x4fbf,0x4181,0xa8,0x2c,0xaf,0x66,0xbf,0x7b,0xd2,0x4e); DEFINE_GUID(IID_IDXGIOutput6,0x068346e8,0xaaec,0x4b84,0xad,0xd7,0x13,0x7f,0x51,0x3f,0x77,0xa1); DEFINE_GUID(IID_IDXGIFactory6,0xc1b6694f,0xff09,0x44a9,0xb0,0x3c,0x77,0x90,0x0a,0x0a,0x1d,0x17);