Windows 10.0.18362 SDK headers (#2159)

bkaradzic · Jun 4, 2020 · 2a748d6 · 2a748d6
1 parent 10dfece
commit 2a748d6
Show file tree

Hide file tree

Showing 15 changed files with 5,517 additions and 1,108 deletions.
diff --git a/3rdparty/dxsdk/include/d3d11.h b/3rdparty/dxsdk/include/d3d11.h
@@ -1050,6 +1050,10 @@ extern "C"{
 #define _D3D11_2_CONSTANTS
 #define	D3D11_2_TILED_RESOURCE_TILE_SIZE_IN_BYTES	( 65536 )
 
+#define	D3D11_4_VIDEO_DECODER_MAX_HISTOGRAM_COMPONENTS	( 4 )
+
+#define	D3D11_4_VIDEO_DECODER_HISTOGRAM_OFFSET_ALIGNMENT	( 256 )
+
 #endif
 #define	_FACD3D11	( 0x87c )
 
@@ -1289,8 +1293,7 @@ typedef RECT D3D11_RECT;
 }
 struct CD3D11_RECT : public D3D11_RECT
 {
-    CD3D11_RECT()
-    {}
+    CD3D11_RECT() = default;
     explicit CD3D11_RECT( const D3D11_RECT& o ) :
         D3D11_RECT( o )
     {}
@@ -1331,8 +1334,7 @@ typedef struct D3D11_BOX
 }
 struct CD3D11_BOX : public D3D11_BOX
 {
-    CD3D11_BOX()
-    {}
+    CD3D11_BOX() = default;
     explicit CD3D11_BOX( const D3D11_BOX& o ) :
         D3D11_BOX( o )
     {}
@@ -1568,8 +1570,7 @@ typedef struct D3D11_DEPTH_STENCIL_DESC
 }
 struct CD3D11_DEPTH_STENCIL_DESC : public D3D11_DEPTH_STENCIL_DESC
 {
-    CD3D11_DEPTH_STENCIL_DESC()
-    {}
+    CD3D11_DEPTH_STENCIL_DESC() = default;
     explicit CD3D11_DEPTH_STENCIL_DESC( const D3D11_DEPTH_STENCIL_DESC& o ) :
         D3D11_DEPTH_STENCIL_DESC( o )
     {}
@@ -1822,8 +1823,7 @@ typedef struct D3D11_BLEND_DESC
 }
 struct CD3D11_BLEND_DESC : public D3D11_BLEND_DESC
 {
-    CD3D11_BLEND_DESC()
-    {}
+    CD3D11_BLEND_DESC() = default;
     explicit CD3D11_BLEND_DESC( const D3D11_BLEND_DESC& o ) :
         D3D11_BLEND_DESC( o )
     {}
@@ -1997,8 +1997,7 @@ typedef struct D3D11_RASTERIZER_DESC
 }
 struct CD3D11_RASTERIZER_DESC : public D3D11_RASTERIZER_DESC
 {
-    CD3D11_RASTERIZER_DESC()
-    {}
+    CD3D11_RASTERIZER_DESC() = default;
     explicit CD3D11_RASTERIZER_DESC( const D3D11_RASTERIZER_DESC& o ) :
         D3D11_RASTERIZER_DESC( o )
     {}
@@ -2363,8 +2362,7 @@ typedef struct D3D11_BUFFER_DESC
 }
 struct CD3D11_BUFFER_DESC : public D3D11_BUFFER_DESC
 {
-    CD3D11_BUFFER_DESC()
-    {}
+    CD3D11_BUFFER_DESC() = default;
     explicit CD3D11_BUFFER_DESC( const D3D11_BUFFER_DESC& o ) :
         D3D11_BUFFER_DESC( o )
     {}
@@ -2560,8 +2558,7 @@ typedef struct D3D11_TEXTURE1D_DESC
 }
 struct CD3D11_TEXTURE1D_DESC : public D3D11_TEXTURE1D_DESC
 {
-    CD3D11_TEXTURE1D_DESC()
-    {}
+    CD3D11_TEXTURE1D_DESC() = default;
     explicit CD3D11_TEXTURE1D_DESC( const D3D11_TEXTURE1D_DESC& o ) :
         D3D11_TEXTURE1D_DESC( o )
     {}
@@ -2763,8 +2760,7 @@ typedef struct D3D11_TEXTURE2D_DESC
 }
 struct CD3D11_TEXTURE2D_DESC : public D3D11_TEXTURE2D_DESC
 {
-    CD3D11_TEXTURE2D_DESC()
-    {}
+    CD3D11_TEXTURE2D_DESC() = default;
     explicit CD3D11_TEXTURE2D_DESC( const D3D11_TEXTURE2D_DESC& o ) :
         D3D11_TEXTURE2D_DESC( o )
     {}
@@ -2971,8 +2967,7 @@ typedef struct D3D11_TEXTURE3D_DESC
 }
 struct CD3D11_TEXTURE3D_DESC : public D3D11_TEXTURE3D_DESC
 {
-    CD3D11_TEXTURE3D_DESC()
-    {}
+    CD3D11_TEXTURE3D_DESC() = default;
     explicit CD3D11_TEXTURE3D_DESC( const D3D11_TEXTURE3D_DESC& o ) :
         D3D11_TEXTURE3D_DESC( o )
     {}
@@ -3412,8 +3407,7 @@ typedef struct D3D11_SHADER_RESOURCE_VIEW_DESC
 }
 struct CD3D11_SHADER_RESOURCE_VIEW_DESC : public D3D11_SHADER_RESOURCE_VIEW_DESC
 {
-    CD3D11_SHADER_RESOURCE_VIEW_DESC()
-    {}
+    CD3D11_SHADER_RESOURCE_VIEW_DESC() = default;
     explicit CD3D11_SHADER_RESOURCE_VIEW_DESC( const D3D11_SHADER_RESOURCE_VIEW_DESC& o ) :
         D3D11_SHADER_RESOURCE_VIEW_DESC( o )
     {}
@@ -3833,8 +3827,7 @@ typedef struct D3D11_RENDER_TARGET_VIEW_DESC
 }
 struct CD3D11_RENDER_TARGET_VIEW_DESC : public D3D11_RENDER_TARGET_VIEW_DESC
 {
-    CD3D11_RENDER_TARGET_VIEW_DESC()
-    {}
+    CD3D11_RENDER_TARGET_VIEW_DESC() = default;
     explicit CD3D11_RENDER_TARGET_VIEW_DESC( const D3D11_RENDER_TARGET_VIEW_DESC& o ) :
         D3D11_RENDER_TARGET_VIEW_DESC( o )
     {}
@@ -4135,8 +4128,7 @@ EXTERN_C const IID IID_ID3D11RenderTargetView;
 }
 struct CD3D11_VIEWPORT : public D3D11_VIEWPORT
 {
-    CD3D11_VIEWPORT()
-    {}
+    CD3D11_VIEWPORT() = default;
     explicit CD3D11_VIEWPORT( const D3D11_VIEWPORT& o ) :
         D3D11_VIEWPORT( o )
     {}
@@ -4340,8 +4332,7 @@ typedef struct D3D11_DEPTH_STENCIL_VIEW_DESC
 }
 struct CD3D11_DEPTH_STENCIL_VIEW_DESC : public D3D11_DEPTH_STENCIL_VIEW_DESC
 {
-    CD3D11_DEPTH_STENCIL_VIEW_DESC()
-    {}
+    CD3D11_DEPTH_STENCIL_VIEW_DESC() = default;
     explicit CD3D11_DEPTH_STENCIL_VIEW_DESC( const D3D11_DEPTH_STENCIL_VIEW_DESC& o ) :
         D3D11_DEPTH_STENCIL_VIEW_DESC( o )
     {}
@@ -4669,8 +4660,7 @@ typedef struct D3D11_UNORDERED_ACCESS_VIEW_DESC
 }
 struct CD3D11_UNORDERED_ACCESS_VIEW_DESC : public D3D11_UNORDERED_ACCESS_VIEW_DESC
 {
-    CD3D11_UNORDERED_ACCESS_VIEW_DESC()
-    {}
+    CD3D11_UNORDERED_ACCESS_VIEW_DESC() = default;
     explicit CD3D11_UNORDERED_ACCESS_VIEW_DESC( const D3D11_UNORDERED_ACCESS_VIEW_DESC& o ) :
         D3D11_UNORDERED_ACCESS_VIEW_DESC( o )
     {}
@@ -5884,8 +5874,7 @@ typedef struct D3D11_SAMPLER_DESC
 }
 struct CD3D11_SAMPLER_DESC : public D3D11_SAMPLER_DESC
 {
-    CD3D11_SAMPLER_DESC()
-    {}
+    CD3D11_SAMPLER_DESC() = default;
     explicit CD3D11_SAMPLER_DESC( const D3D11_SAMPLER_DESC& o ) :
         D3D11_SAMPLER_DESC( o )
     {}
@@ -6296,8 +6285,7 @@ typedef struct D3D11_QUERY_DESC
 }
 struct CD3D11_QUERY_DESC : public D3D11_QUERY_DESC
 {
-    CD3D11_QUERY_DESC()
-    {}
+    CD3D11_QUERY_DESC() = default;
     explicit CD3D11_QUERY_DESC( const D3D11_QUERY_DESC& o ) :
         D3D11_QUERY_DESC( o )
     {}
@@ -6634,8 +6622,7 @@ typedef struct D3D11_COUNTER_DESC
 }
 struct CD3D11_COUNTER_DESC : public D3D11_COUNTER_DESC
 {
-    CD3D11_COUNTER_DESC()
-    {}
+    CD3D11_COUNTER_DESC() = default;
     explicit CD3D11_COUNTER_DESC( const D3D11_COUNTER_DESC& o ) :
         D3D11_COUNTER_DESC( o )
     {}
@@ -7308,7 +7295,8 @@ enum D3D11_FEATURE
         D3D11_FEATURE_D3D11_OPTIONS3	= ( D3D11_FEATURE_D3D11_OPTIONS2 + 1 ) ,
         D3D11_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT	= ( D3D11_FEATURE_D3D11_OPTIONS3 + 1 ) ,
         D3D11_FEATURE_D3D11_OPTIONS4	= ( D3D11_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT + 1 ) ,
-        D3D11_FEATURE_SHADER_CACHE	= ( D3D11_FEATURE_D3D11_OPTIONS4 + 1 ) 
+        D3D11_FEATURE_SHADER_CACHE	= ( D3D11_FEATURE_D3D11_OPTIONS4 + 1 ) ,
+        D3D11_FEATURE_D3D11_OPTIONS5	= ( D3D11_FEATURE_SHADER_CACHE + 1 ) 
     } 	D3D11_FEATURE;
 
 typedef struct D3D11_FEATURE_DATA_THREADING
@@ -7478,6 +7466,19 @@ typedef struct D3D11_FEATURE_DATA_SHADER_CACHE
     UINT SupportFlags;
     } 	D3D11_FEATURE_DATA_SHADER_CACHE;
 
+typedef 
+enum D3D11_SHARED_RESOURCE_TIER
+    {
+        D3D11_SHARED_RESOURCE_TIER_0	= 0,
+        D3D11_SHARED_RESOURCE_TIER_1	= ( D3D11_SHARED_RESOURCE_TIER_0 + 1 ) ,
+        D3D11_SHARED_RESOURCE_TIER_2	= ( D3D11_SHARED_RESOURCE_TIER_1 + 1 ) 
+    } 	D3D11_SHARED_RESOURCE_TIER;
+
+typedef struct D3D11_FEATURE_DATA_D3D11_OPTIONS5
+    {
+    D3D11_SHARED_RESOURCE_TIER SharedResourceTier;
+    } 	D3D11_FEATURE_DATA_D3D11_OPTIONS5;
+
 
 
 extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0029_v0_0_c_ifspec;
@@ -10061,11 +10062,14 @@ enum D3D11_CONTENT_PROTECTION_CAPS
         D3D11_CONTENT_PROTECTION_CAPS_HARDWARE_PROTECT_UNCOMPRESSED	= 0x800,
         D3D11_CONTENT_PROTECTION_CAPS_HARDWARE_PROTECTED_MEMORY_PAGEABLE	= 0x1000,
         D3D11_CONTENT_PROTECTION_CAPS_HARDWARE_TEARDOWN	= 0x2000,
-        D3D11_CONTENT_PROTECTION_CAPS_HARDWARE_DRM_COMMUNICATION	= 0x4000
+        D3D11_CONTENT_PROTECTION_CAPS_HARDWARE_DRM_COMMUNICATION	= 0x4000,
+        D3D11_CONTENT_PROTECTION_CAPS_HARDWARE_DRM_COMMUNICATION_MULTI_THREADED	= 0x8000
     } 	D3D11_CONTENT_PROTECTION_CAPS;
 
 DEFINE_GUID(D3D11_CRYPTO_TYPE_AES128_CTR, 0x9b6bd711, 0x4f74, 0x41c9, 0x9e, 0x7b, 0xb, 0xe2, 0xd7, 0xd9, 0x3b, 0x4f );
 DEFINE_GUID(D3D11_DECODER_ENCRYPTION_HW_CENC, 0x89d6ac4f, 0x9f2, 0x4229, 0xb2, 0xcd, 0x37, 0x74, 0xa, 0x6d, 0xfd, 0x81);
+DEFINE_GUID(D3D11_DECODER_BITSTREAM_ENCRYPTION_TYPE_CENC, 0xb0405235, 0xc13d, 0x44f2, 0x9a, 0xe5, 0xdd, 0x48, 0xe0, 0x8e, 0x5b, 0x67);
+DEFINE_GUID(D3D11_DECODER_BITSTREAM_ENCRYPTION_TYPE_CBCS, 0x422d9319, 0x9d21, 0x4bb7, 0x93, 0x71, 0xfa, 0xf5, 0xa8, 0x2c, 0x3e, 0x04);
 DEFINE_GUID(D3D11_KEY_EXCHANGE_HW_PROTECTION, 0xb1170d8a, 0x628d, 0x4da3, 0xad, 0x3b, 0x82, 0xdd, 0xb0, 0x8b, 0x49, 0x70);
 typedef struct D3D11_VIDEO_CONTENT_PROTECTION_CAPS
     {
@@ -14400,11 +14404,11 @@ enum D3D11_CREATE_DEVICE_FLAG
 #if !defined( D3D11_IGNORE_SDK_LAYERS ) 
 #include "d3d11sdklayers.h" 
 #endif 
-// BK - #include "d3d10_1.h"
-// BK - #include "d3d10shader.h"
-// BK - #include "d3d10_1shader.h"
-// BK - #include "d3d10misc.h"
-// BK - #include "d3d10effect.h"
+#include "d3d10_1.h"
+#include "d3d10shader.h" 
+#include "d3d10_1shader.h" 
+#include "d3d10misc.h" 
+#include "d3d10effect.h" 
 
 ///////////////////////////////////////////////////////////////////////////
 // D3D11CreateDevice

diff --git a/3rdparty/dxsdk/include/d3d11_1.h b/3rdparty/dxsdk/include/d3d11_1.h
@@ -183,8 +183,7 @@ typedef struct D3D11_BLEND_DESC1
 }
 struct CD3D11_BLEND_DESC1 : public D3D11_BLEND_DESC1
 {
-    CD3D11_BLEND_DESC1()
-    {}
+    CD3D11_BLEND_DESC1() = default;
     explicit CD3D11_BLEND_DESC1( const D3D11_BLEND_DESC1& o ) :
         D3D11_BLEND_DESC1( o )
     {}
@@ -369,8 +368,7 @@ typedef struct D3D11_RASTERIZER_DESC1
 }
 struct CD3D11_RASTERIZER_DESC1 : public D3D11_RASTERIZER_DESC1
 {
-    CD3D11_RASTERIZER_DESC1()
-    {}
+    CD3D11_RASTERIZER_DESC1() = default;
     explicit CD3D11_RASTERIZER_DESC1( const D3D11_RASTERIZER_DESC1& o ) :
         D3D11_RASTERIZER_DESC1( o )
     {}

diff --git a/3rdparty/dxsdk/include/d3d11_3.h b/3rdparty/dxsdk/include/d3d11_3.h
@@ -180,8 +180,7 @@ typedef struct D3D11_TEXTURE2D_DESC1
 }
 struct CD3D11_TEXTURE2D_DESC1 : public D3D11_TEXTURE2D_DESC1
 {
-    CD3D11_TEXTURE2D_DESC1()
-    {}
+    CD3D11_TEXTURE2D_DESC1() = default;
     explicit CD3D11_TEXTURE2D_DESC1( const D3D11_TEXTURE2D_DESC1& o ) :
         D3D11_TEXTURE2D_DESC1( o )
     {}
@@ -417,8 +416,7 @@ typedef struct D3D11_TEXTURE3D_DESC1
 }
 struct CD3D11_TEXTURE3D_DESC1 : public D3D11_TEXTURE3D_DESC1
 {
-    CD3D11_TEXTURE3D_DESC1()
-    {}
+    CD3D11_TEXTURE3D_DESC1() = default;
     explicit CD3D11_TEXTURE3D_DESC1( const D3D11_TEXTURE3D_DESC1& o ) :
         D3D11_TEXTURE3D_DESC1( o )
     {}
@@ -657,8 +655,7 @@ typedef struct D3D11_RASTERIZER_DESC2
 }
 struct CD3D11_RASTERIZER_DESC2 : public D3D11_RASTERIZER_DESC2
 {
-    CD3D11_RASTERIZER_DESC2()
-    {}
+    CD3D11_RASTERIZER_DESC2() = default;
     explicit CD3D11_RASTERIZER_DESC2( const D3D11_RASTERIZER_DESC2& o ) :
         D3D11_RASTERIZER_DESC2( o )
     {}
@@ -900,8 +897,7 @@ typedef struct D3D11_SHADER_RESOURCE_VIEW_DESC1
 }
 struct CD3D11_SHADER_RESOURCE_VIEW_DESC1 : public D3D11_SHADER_RESOURCE_VIEW_DESC1
 {
-    CD3D11_SHADER_RESOURCE_VIEW_DESC1()
-    {}
+    CD3D11_SHADER_RESOURCE_VIEW_DESC1() = default;
     explicit CD3D11_SHADER_RESOURCE_VIEW_DESC1( const D3D11_SHADER_RESOURCE_VIEW_DESC1& o ) :
         D3D11_SHADER_RESOURCE_VIEW_DESC1( o )
     {}
@@ -1294,8 +1290,7 @@ typedef struct D3D11_RENDER_TARGET_VIEW_DESC1
 }
 struct CD3D11_RENDER_TARGET_VIEW_DESC1 : public D3D11_RENDER_TARGET_VIEW_DESC1
 {
-    CD3D11_RENDER_TARGET_VIEW_DESC1()
-    {}
+    CD3D11_RENDER_TARGET_VIEW_DESC1() = default;
     explicit CD3D11_RENDER_TARGET_VIEW_DESC1( const D3D11_RENDER_TARGET_VIEW_DESC1& o ) :
         D3D11_RENDER_TARGET_VIEW_DESC1( o )
     {}
@@ -1640,8 +1635,7 @@ typedef struct D3D11_UNORDERED_ACCESS_VIEW_DESC1
 }
 struct CD3D11_UNORDERED_ACCESS_VIEW_DESC1 : public D3D11_UNORDERED_ACCESS_VIEW_DESC1
 {
-    CD3D11_UNORDERED_ACCESS_VIEW_DESC1()
-    {}
+    CD3D11_UNORDERED_ACCESS_VIEW_DESC1() = default;
     explicit CD3D11_UNORDERED_ACCESS_VIEW_DESC1( const D3D11_UNORDERED_ACCESS_VIEW_DESC1& o ) :
         D3D11_UNORDERED_ACCESS_VIEW_DESC1( o )
     {}
@@ -1954,8 +1948,7 @@ typedef struct D3D11_QUERY_DESC1
 }
 struct CD3D11_QUERY_DESC1 : public D3D11_QUERY_DESC1
 {
-    CD3D11_QUERY_DESC1()
-    {}
+    CD3D11_QUERY_DESC1() = default;
     explicit CD3D11_QUERY_DESC1( const D3D11_QUERY_DESC1& o ) :
         D3D11_QUERY_DESC1( o )
     {}
@@ -2125,9 +2118,10 @@ EXTERN_C const IID IID_ID3D11Query1;
 typedef 
 enum D3D11_FENCE_FLAG
     {
-        D3D11_FENCE_FLAG_NONE	= 0x1,
+        D3D11_FENCE_FLAG_NONE	= 0,
         D3D11_FENCE_FLAG_SHARED	= 0x2,
-        D3D11_FENCE_FLAG_SHARED_CROSS_ADAPTER	= 0x4
+        D3D11_FENCE_FLAG_SHARED_CROSS_ADAPTER	= 0x4,
+        D3D11_FENCE_FLAG_NON_MONITORED	= 0x8
     } 	D3D11_FENCE_FLAG;
 
 DEFINE_ENUM_FLAG_OPERATORS(D3D11_FENCE_FLAG);