Skip to content

Commit 362292a

Browse files
author
Direct3D Build Agent
committed
Update headers
1 parent aafb798 commit 362292a

10 files changed

+84
-14
lines changed

‎include/directx/d3d12.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1102,7 +1102,7 @@ extern "C"{
11021102

11031103
#define D3D12_PIXEL_ADDRESS_RANGE_BIT_COUNT ( 15 )
11041104

1105-
#define D3D12_PREVIEW_SDK_VERSION ( 713 )
1105+
#define D3D12_PREVIEW_SDK_VERSION ( 714 )
11061106

11071107
#define D3D12_PRE_SCISSOR_PIXEL_ADDRESS_RANGE_BIT_COUNT ( 16 )
11081108

@@ -1235,7 +1235,7 @@ extern "C"{
12351235

12361236
#define D3D12_RS_SET_SHADING_RATE_COMBINER_COUNT ( 2 )
12371237

1238-
#define D3D12_SDK_VERSION ( 613 )
1238+
#define D3D12_SDK_VERSION ( 614 )
12391239

12401240
#define D3D12_SHADER_IDENTIFIER_SIZE_IN_BYTES ( 32 )
12411241

‎include/directx/d3d12.idl

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ const UINT D3D12_OS_RESERVED_REGISTER_SPACE_VALUES_END = 0xffffffff;
293293
const UINT D3D12_OS_RESERVED_REGISTER_SPACE_VALUES_START = 0xfffffff8;
294294
const UINT D3D12_PACKED_TILE = 0xffffffff;
295295
const UINT D3D12_PIXEL_ADDRESS_RANGE_BIT_COUNT = 15;
296-
const UINT D3D12_PREVIEW_SDK_VERSION = 713;
296+
const UINT D3D12_PREVIEW_SDK_VERSION = 714;
297297
const UINT D3D12_PRE_SCISSOR_PIXEL_ADDRESS_RANGE_BIT_COUNT = 16;
298298
const UINT D3D12_PS_CS_UAV_REGISTER_COMPONENTS = 1;
299299
const UINT D3D12_PS_CS_UAV_REGISTER_COUNT = 8;
@@ -361,7 +361,7 @@ const UINT D3D12_REQ_TEXTURECUBE_DIMENSION = 16384;
361361
const UINT D3D12_RESINFO_INSTRUCTION_MISSING_COMPONENT_RETVAL = 0;
362362
const UINT D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES = 0xffffffff;
363363
const UINT D3D12_RS_SET_SHADING_RATE_COMBINER_COUNT = 2;
364-
const UINT D3D12_SDK_VERSION = 613;
364+
const UINT D3D12_SDK_VERSION = 614;
365365
const UINT D3D12_SHADER_IDENTIFIER_SIZE_IN_BYTES = 32;
366366
const UINT D3D12_SHADER_MAJOR_VERSION = 5;
367367
const UINT D3D12_SHADER_MAX_INSTANCES = 65535;
@@ -1030,7 +1030,7 @@ typedef enum D3D12_FEATURE
10301030
D3D12_FEATURE_PREDICATION = 50,
10311031
D3D12_FEATURE_PLACED_RESOURCE_SUPPORT_INFO = 51,
10321032
D3D12_FEATURE_HARDWARE_COPY = 52,
1033-
D3D12_FEATURE_D3D12_OPTIONS21 = 53
1033+
D3D12_FEATURE_D3D12_OPTIONS21 = 53,
10341034
} D3D12_FEATURE;
10351035

10361036
typedef enum D3D12_SHADER_MIN_PRECISION_SUPPORT
@@ -1621,6 +1621,7 @@ typedef struct D3D12_FEATURE_DATA_HARDWARE_COPY
16211621
[annotation("_Out_")] BOOL Supported;
16221622
} D3D12_FEATURE_DATA_HARDWARE_COPY;
16231623

1624+
16241625
typedef struct D3D12_RESOURCE_ALLOCATION_INFO
16251626
{
16261627
UINT64 SizeInBytes;
@@ -1779,6 +1780,7 @@ typedef struct D3D12_RESOURCE_DESC1
17791780
} D3D12_RESOURCE_DESC1;
17801781

17811782

1783+
17821784
typedef struct D3D12_DEPTH_STENCIL_VALUE
17831785
{
17841786
FLOAT Depth;
@@ -5430,6 +5432,7 @@ interface ID3D12Resource2
54305432
}
54315433

54325434

5435+
54335436
[uuid(572F7389-2168-49E3-9693-D6DF5871BF6D), object, local, pointer_default(unique)]
54345437
interface ID3D12Heap1
54355438
: ID3D12Heap
@@ -6063,6 +6066,7 @@ interface ID3D12Device14 : ID3D12Device13
60636066
[out, iid_is(riid), annotation("_COM_Outptr_")] void** ppvRootSignature);
60646067
};
60656068

6069+
60666070
[uuid(bc66d368-7373-4943-8757-fc87dc79e476), object, local, pointer_default(unique)]
60676071
interface ID3D12VirtualizationGuestDevice
60686072
: IUnknown
@@ -6089,7 +6093,6 @@ interface ID3D12Tools
60896093
}
60906094

60916095

6092-
60936096
typedef struct D3D12_SUBRESOURCE_DATA
60946097
{
60956098
const void* pData;

‎include/directx/d3d12sdklayers.h

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3314,8 +3314,39 @@ enum D3D12_MESSAGE_ID
33143314
D3D12_MESSAGE_ID_RECREATEAT_INSUFFICIENT_SUPPORT = 1386,
33153315
D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_STRUCTURED_BUFFER_STRIDE_MISMATCH = 1387,
33163316
D3D12_MESSAGE_ID_DISPATCH_GRAPH_INVALID = 1388,
3317+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_TARGET_FORMAT_INVALID = 1389,
3318+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_TARGET_DIMENSION_INVALID = 1390,
3319+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_SOURCE_COLOR_FORMAT_INVALID = 1391,
3320+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_SOURCE_DEPTH_FORMAT_INVALID = 1392,
3321+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_EXPOSURE_SCALE_FORMAT_INVALID = 1393,
3322+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_ENGINE_CREATE_FLAGS_INVALID = 1394,
3323+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_EXTENSION_INTERNAL_LOAD_FAILURE = 1395,
3324+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_EXTENSION_INTERNAL_ENGINE_CREATION_ERROR = 1396,
3325+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_EXTENSION_INTERNAL_UPSCALER_CREATION_ERROR = 1397,
3326+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_EXTENSION_INTERNAL_UPSCALER_EXECUTION_ERROR = 1398,
3327+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_UPSCALER_EXECUTE_REGION_INVALID = 1399,
3328+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_UPSCALER_EXECUTE_TIME_DELTA_INVALID = 1400,
3329+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_UPSCALER_EXECUTE_REQUIRED_TEXTURE_IS_NULL = 1401,
3330+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_UPSCALER_EXECUTE_MOTION_VECTORS_FORMAT_INVALID = 1402,
3331+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_UPSCALER_EXECUTE_FLAGS_INVALID = 1403,
3332+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_UPSCALER_EXECUTE_FORMAT_INVALID = 1404,
3333+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_UPSCALER_EXECUTE_EXPOSURE_SCALE_TEXTURE_SIZE_INVALID = 1405,
3334+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_VARIANT_INDEX_OUT_OF_BOUNDS = 1406,
3335+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_VARIANT_ID_NOT_FOUND = 1407,
3336+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_DUPLICATE_VARIANT_ID = 1408,
3337+
D3D12_MESSAGE_ID_DIRECTSR_OUT_OF_MEMORY = 1409,
3338+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_UPSCALER_EXECUTE_UNEXPECTED_TEXTURE_IS_IGNORED = 1410,
3339+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_UPSCALER_EVICT_UNDERFLOW = 1411,
3340+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_UPSCALER_EXECUTE_OPTIONAL_TEXTURE_IS_NULL = 1412,
3341+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_UPSCALER_EXECUTE_INVALID_CAMERA_JITTER = 1413,
33173342
D3D12_MESSAGE_ID_CREATE_STATE_OBJECT_WARNING = 1414,
3318-
D3D12_MESSAGE_ID_D3D12_MESSAGES_END = ( D3D12_MESSAGE_ID_CREATE_STATE_OBJECT_WARNING + 1 )
3343+
D3D12_MESSAGE_ID_GUID_TEXTURE_LAYOUT_UNSUPPORTED = 1415,
3344+
D3D12_MESSAGE_ID_RESOLVE_ENCODER_INPUT_PARAM_LAYOUT_INVALID_PARAMETERS = 1416,
3345+
D3D12_MESSAGE_ID_INVALID_BARRIER_ACCESS = 1417,
3346+
D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_INSTANCE_COUNT_ZERO = 1418,
3347+
D3D12_MESSAGE_ID_DESCRIPTOR_HEAP_NOT_SET_BEFORE_ROOT_SIGNATURE_WITH_DIRECTLY_INDEXED_FLAG = 1419,
3348+
D3D12_MESSAGE_ID_DIFFERENT_DESCRIPTOR_HEAP_SET_AFTER_ROOT_SIGNATURE_WITH_DIRECTLY_INDEXED_FLAG = 1420,
3349+
D3D12_MESSAGE_ID_D3D12_MESSAGES_END = ( D3D12_MESSAGE_ID_DIFFERENT_DESCRIPTOR_HEAP_SET_AFTER_ROOT_SIGNATURE_WITH_DIRECTLY_INDEXED_FLAG + 1 )
33193350
} D3D12_MESSAGE_ID;
33203351

33213352
typedef struct D3D12_MESSAGE

‎include/directx/d3d12sdklayers.idl

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1455,15 +1455,46 @@ typedef enum D3D12_MESSAGE_ID {
14551455

14561456
D3D12_MESSAGE_ID_PROBABLE_PIX_EVENT_LEAK = 1383,
14571457
D3D12_MESSAGE_ID_PIX_EVENT_UNDERFLOW = 1384,
1458-
1458+
14591459
D3D12_MESSAGE_ID_RECREATEAT_INVALID_TARGET = 1385,
14601460
D3D12_MESSAGE_ID_RECREATEAT_INSUFFICIENT_SUPPORT = 1386,
14611461

14621462
D3D12_MESSAGE_ID_GPU_BASED_VALIDATION_STRUCTURED_BUFFER_STRIDE_MISMATCH = 1387,
14631463

14641464
D3D12_MESSAGE_ID_DISPATCH_GRAPH_INVALID = 1388,
14651465

1466+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_TARGET_FORMAT_INVALID = 1389,
1467+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_TARGET_DIMENSION_INVALID = 1390,
1468+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_SOURCE_COLOR_FORMAT_INVALID = 1391,
1469+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_SOURCE_DEPTH_FORMAT_INVALID = 1392,
1470+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_EXPOSURE_SCALE_FORMAT_INVALID = 1393,
1471+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_ENGINE_CREATE_FLAGS_INVALID = 1394,
1472+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_EXTENSION_INTERNAL_LOAD_FAILURE = 1395,
1473+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_EXTENSION_INTERNAL_ENGINE_CREATION_ERROR = 1396,
1474+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_EXTENSION_INTERNAL_UPSCALER_CREATION_ERROR = 1397,
1475+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_EXTENSION_INTERNAL_UPSCALER_EXECUTION_ERROR = 1398,
1476+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_UPSCALER_EXECUTE_REGION_INVALID = 1399,
1477+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_UPSCALER_EXECUTE_TIME_DELTA_INVALID = 1400,
1478+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_UPSCALER_EXECUTE_REQUIRED_TEXTURE_IS_NULL = 1401,
1479+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_UPSCALER_EXECUTE_MOTION_VECTORS_FORMAT_INVALID = 1402,
1480+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_UPSCALER_EXECUTE_FLAGS_INVALID = 1403,
1481+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_UPSCALER_EXECUTE_FORMAT_INVALID = 1404,
1482+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_UPSCALER_EXECUTE_EXPOSURE_SCALE_TEXTURE_SIZE_INVALID = 1405,
1483+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_VARIANT_INDEX_OUT_OF_BOUNDS = 1406,
1484+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_VARIANT_ID_NOT_FOUND = 1407,
1485+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_DUPLICATE_VARIANT_ID = 1408,
1486+
D3D12_MESSAGE_ID_DIRECTSR_OUT_OF_MEMORY = 1409,
1487+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_UPSCALER_EXECUTE_UNEXPECTED_TEXTURE_IS_IGNORED = 1410,
1488+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_UPSCALER_EVICT_UNDERFLOW = 1411,
1489+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_UPSCALER_EXECUTE_OPTIONAL_TEXTURE_IS_NULL = 1412,
1490+
D3D12_MESSAGE_ID_DIRECTSR_SUPERRES_UPSCALER_EXECUTE_INVALID_CAMERA_JITTER = 1413,
14661491
D3D12_MESSAGE_ID_CREATE_STATE_OBJECT_WARNING = 1414,
1492+
D3D12_MESSAGE_ID_GUID_TEXTURE_LAYOUT_UNSUPPORTED = 1415,
1493+
D3D12_MESSAGE_ID_RESOLVE_ENCODER_INPUT_PARAM_LAYOUT_INVALID_PARAMETERS = 1416,
1494+
D3D12_MESSAGE_ID_INVALID_BARRIER_ACCESS = 1417,
1495+
D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_INSTANCE_COUNT_ZERO = 1418,
1496+
D3D12_MESSAGE_ID_DESCRIPTOR_HEAP_NOT_SET_BEFORE_ROOT_SIGNATURE_WITH_DIRECTLY_INDEXED_FLAG = 1419,
1497+
D3D12_MESSAGE_ID_DIFFERENT_DESCRIPTOR_HEAP_SET_AFTER_ROOT_SIGNATURE_WITH_DIRECTLY_INDEXED_FLAG = 1420,
14671498
D3D12_MESSAGE_ID_D3D12_MESSAGES_END
14681499
} D3D12_MESSAGE_ID;
14691500

‎include/directx/d3d12video.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7449,7 +7449,8 @@ enum D3D12_VIDEO_ENCODER_SUPPORT_FLAGS
74497449
D3D12_VIDEO_ENCODER_SUPPORT_FLAG_SEQUENCE_GOP_RECONFIGURATION_AVAILABLE = 0x800,
74507450
D3D12_VIDEO_ENCODER_SUPPORT_FLAG_MOTION_ESTIMATION_PRECISION_MODE_LIMIT_AVAILABLE = 0x1000,
74517451
D3D12_VIDEO_ENCODER_SUPPORT_FLAG_RATE_CONTROL_EXTENSION1_SUPPORT = 0x2000,
7452-
D3D12_VIDEO_ENCODER_SUPPORT_FLAG_RATE_CONTROL_QUALITY_VS_SPEED_AVAILABLE = 0x4000
7452+
D3D12_VIDEO_ENCODER_SUPPORT_FLAG_RATE_CONTROL_QUALITY_VS_SPEED_AVAILABLE = 0x4000,
7453+
D3D12_VIDEO_ENCODER_SUPPORT_FLAG_READABLE_RECONSTRUCTED_PICTURE_LAYOUT_AVAILABLE = 0x8000
74537454
} D3D12_VIDEO_ENCODER_SUPPORT_FLAGS;
74547455

74557456
DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_ENCODER_SUPPORT_FLAGS)

‎include/directx/d3d12video.idl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ typedef enum D3D12_FEATURE_VIDEO
9595
D3D12_FEATURE_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_CONFIG = 46,
9696
D3D12_FEATURE_VIDEO_ENCODER_SUPPORT1 = 47,
9797

98-
9998
} D3D12_FEATURE_VIDEO;
10099

101100
typedef enum D3D12_BITSTREAM_ENCRYPTION_TYPE
@@ -2517,6 +2516,7 @@ typedef enum D3D12_VIDEO_ENCODER_SUPPORT_FLAGS
25172516
D3D12_VIDEO_ENCODER_SUPPORT_FLAG_MOTION_ESTIMATION_PRECISION_MODE_LIMIT_AVAILABLE = 0x1000,
25182517
D3D12_VIDEO_ENCODER_SUPPORT_FLAG_RATE_CONTROL_EXTENSION1_SUPPORT = 0x2000,
25192518
D3D12_VIDEO_ENCODER_SUPPORT_FLAG_RATE_CONTROL_QUALITY_VS_SPEED_AVAILABLE = 0x4000,
2519+
D3D12_VIDEO_ENCODER_SUPPORT_FLAG_READABLE_RECONSTRUCTED_PICTURE_LAYOUT_AVAILABLE = 0x8000,
25202520
} D3D12_VIDEO_ENCODER_SUPPORT_FLAGS;
25212521
cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_ENCODER_SUPPORT_FLAGS)")
25222522

‎include/directx/d3dx12_core.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1495,6 +1495,7 @@ inline const CD3DX12_RESOURCE_DESC1* D3DX12ConditionallyExpandAPIDesc(
14951495
}
14961496
}
14971497

1498+
14981499
//------------------------------------------------------------------------------------------------
14991500
struct CD3DX12_VIEW_INSTANCING_DESC : public D3D12_VIEW_INSTANCING_DESC
15001501
{
@@ -1532,4 +1533,5 @@ struct CD3DX12_RT_FORMAT_ARRAY : public D3D12_RT_FORMAT_ARRAY
15321533
memcpy(RTFormats, pFormats, sizeof(RTFormats));
15331534
// assumes ARRAY_SIZE(pFormats) == ARRAY_SIZE(RTFormats)
15341535
}
1535-
};
1536+
};
1537+

‎include/directx/d3dx12_pipeline_state_stream.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#error D3DX12 requires C++
1212
#endif
1313

14-
#include "d3d12.h"
1514
#include "d3dx12_default.h"
15+
#include "d3d12.h"
1616
#include "d3dx12_core.h"
1717

1818
//------------------------------------------------------------------------------------------------
@@ -1494,3 +1494,4 @@ inline HRESULT D3DX12ParsePipelineStream(const D3D12_PIPELINE_STATE_STREAM_DESC&
14941494

14951495
return S_OK;
14961496
}
1497+

‎include/directx/d3dx12_resource_helpers.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
#error D3DX12 requires C++
1212
#endif
1313

14+
#include "d3dx12_property_format_table.h"
1415
#include "d3d12.h"
1516
#include "d3dx12_core.h"
16-
#include "d3dx12_property_format_table.h"
1717
//------------------------------------------------------------------------------------------------
1818
template <typename T, typename U, typename V>
1919
inline void D3D12DecomposeSubresource( UINT Subresource, UINT MipLevels, UINT ArraySize, _Out_ T& MipSlice, _Out_ U& ArraySlice, _Out_ V& PlaneSlice ) noexcept

‎include/directx/d3dx12_state_object.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#error D3DX12 requires C++
1212
#endif
1313

14-
#include "d3d12.h"
1514
#include "d3dx12_default.h"
15+
#include "d3d12.h"
1616
#include "d3dx12_core.h"
1717

1818
//================================================================================================
@@ -2151,3 +2151,4 @@ class CD3DX12_WORK_GRAPH_SUBOBJECT
21512151
#undef D3DX12_COM_PTR
21522152
#undef D3DX12_COM_PTR_GET
21532153
#undef D3DX12_COM_PTR_ADDRESSOF
2154+

0 commit comments

Comments
 (0)