Skip to content

Commit 590ed28

Browse files
author
Direct3D Build Agent
committed
Update headers
1 parent 211c823 commit 590ed28

File tree

9 files changed

+2318
-115
lines changed

9 files changed

+2318
-115
lines changed

‎include/directx/d3d12.h

Lines changed: 1845 additions & 71 deletions
Large diffs are not rendered by default.

‎include/directx/d3d12.idl

Lines changed: 171 additions & 16 deletions
Large diffs are not rendered by default.

‎include/directx/d3d12sdklayers.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3346,7 +3346,8 @@ enum D3D12_MESSAGE_ID
33463346
D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_INSTANCE_COUNT_ZERO = 1418,
33473347
D3D12_MESSAGE_ID_DESCRIPTOR_HEAP_NOT_SET_BEFORE_ROOT_SIGNATURE_WITH_DIRECTLY_INDEXED_FLAG = 1419,
33483348
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 )
3349+
D3D12_MESSAGE_ID_APPLICATION_SPECIFIC_DRIVER_STATE_NOT_SUPPORTED = 1421,
3350+
D3D12_MESSAGE_ID_D3D12_MESSAGES_END = ( D3D12_MESSAGE_ID_APPLICATION_SPECIFIC_DRIVER_STATE_NOT_SUPPORTED + 1 )
33503351
} D3D12_MESSAGE_ID;
33513352

33523353
typedef struct D3D12_MESSAGE

‎include/directx/d3d12sdklayers.idl

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1455,46 +1455,47 @@ 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,
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,
14911491
D3D12_MESSAGE_ID_CREATE_STATE_OBJECT_WARNING = 1414,
14921492
D3D12_MESSAGE_ID_GUID_TEXTURE_LAYOUT_UNSUPPORTED = 1415,
14931493
D3D12_MESSAGE_ID_RESOLVE_ENCODER_INPUT_PARAM_LAYOUT_INVALID_PARAMETERS = 1416,
14941494
D3D12_MESSAGE_ID_INVALID_BARRIER_ACCESS = 1417,
14951495
D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_INSTANCE_COUNT_ZERO = 1418,
14961496
D3D12_MESSAGE_ID_DESCRIPTOR_HEAP_NOT_SET_BEFORE_ROOT_SIGNATURE_WITH_DIRECTLY_INDEXED_FLAG = 1419,
14971497
D3D12_MESSAGE_ID_DIFFERENT_DESCRIPTOR_HEAP_SET_AFTER_ROOT_SIGNATURE_WITH_DIRECTLY_INDEXED_FLAG = 1420,
1498+
D3D12_MESSAGE_ID_APPLICATION_SPECIFIC_DRIVER_STATE_NOT_SUPPORTED = 1421,
14981499
D3D12_MESSAGE_ID_D3D12_MESSAGES_END
14991500
} D3D12_MESSAGE_ID;
15001501

‎include/directx/d3d12video.idl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2517,6 +2517,7 @@ typedef enum D3D12_VIDEO_ENCODER_SUPPORT_FLAGS
25172517
D3D12_VIDEO_ENCODER_SUPPORT_FLAG_RATE_CONTROL_EXTENSION1_SUPPORT = 0x2000,
25182518
D3D12_VIDEO_ENCODER_SUPPORT_FLAG_RATE_CONTROL_QUALITY_VS_SPEED_AVAILABLE = 0x4000,
25192519
D3D12_VIDEO_ENCODER_SUPPORT_FLAG_READABLE_RECONSTRUCTED_PICTURE_LAYOUT_AVAILABLE = 0x8000,
2520+
25202521
} D3D12_VIDEO_ENCODER_SUPPORT_FLAGS;
25212522
cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_ENCODER_SUPPORT_FLAGS)")
25222523

‎include/directx/d3dx12_check_feature_support.h

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,10 @@ class CD3DX12FeatureSupport
236236
D3D12_WORK_GRAPHS_TIER WorkGraphsTier() const noexcept;
237237
#endif
238238

239+
#if defined(D3D12_SDK_VERSION) && (D3D12_SDK_VERSION >= 614)
240+
BOOL TightAlignmentSupported() const noexcept;
241+
#endif
242+
239243
private: // Private structs and helpers declaration
240244
struct ProtectedResourceSessionTypesLocal : D3D12_FEATURE_DATA_PROTECTED_RESOURCE_SESSION_TYPES
241245
{
@@ -325,6 +329,9 @@ class CD3DX12FeatureSupport
325329
#if defined(D3D12_SDK_VERSION) && (D3D12_SDK_VERSION >= 612)
326330
D3D12_FEATURE_DATA_D3D12_OPTIONS21 m_dOptions21;
327331
#endif
332+
#if defined(D3D12_SDK_VERSION) && (D3D12_SDK_VERSION >= 614)
333+
D3D12_FEATURE_DATA_D3D12_OPTIONS22 m_dOptions22;
334+
#endif
328335
};
329336

330337
// Implementations for CD3DX12FeatureSupport functions
@@ -419,6 +426,9 @@ inline CD3DX12FeatureSupport::CD3DX12FeatureSupport() noexcept
419426
#if defined (D3D12_SDK_VERSION) && (D3D12_SDK_VERSION >= 612)
420427
, m_dOptions21{}
421428
#endif
429+
#if defined (D3D12_SDK_VERSION) && (D3D12_SDK_VERSION >= 614)
430+
, m_dOptions22{}
431+
#endif
422432
{}
423433

424434
inline HRESULT CD3DX12FeatureSupport::Init(ID3D12Device* pDevice)
@@ -594,6 +604,13 @@ inline HRESULT CD3DX12FeatureSupport::Init(ID3D12Device* pDevice)
594604
}
595605
#endif
596606

607+
#if defined(D3D12_SDK_VERSION) && (D3D12_SDK_VERSION >= 614)
608+
if (FAILED(m_pDevice->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS22, &m_dOptions22, sizeof(m_dOptions22))))
609+
{
610+
m_dOptions22 = {};
611+
}
612+
#endif
613+
597614
// Initialize per-node feature support data structures
598615
const UINT uNodeCount = m_pDevice->GetNodeCount();
599616
m_dProtectedResourceSessionSupport.resize(uNodeCount);
@@ -972,6 +989,11 @@ FEATURE_SUPPORT_GET(D3D12_EXECUTE_INDIRECT_TIER, m_dOptions21, ExecuteIndirectTi
972989
FEATURE_SUPPORT_GET(D3D12_WORK_GRAPHS_TIER, m_dOptions21, WorkGraphsTier);
973990
#endif
974991

992+
#if defined(D3D12_SDK_VERSION) && (D3D12_SDK_VERSION >= 614)
993+
// 51: Options22
994+
FEATURE_SUPPORT_GET(BOOL, m_dOptions22, TightAlignmentSupported);
995+
#endif
996+
975997
// Helper function to decide the highest shader model supported by the system
976998
// Stores the result in m_dShaderModel
977999
// Must be updated whenever a new shader model is added to the d3d12.h header

‎include/directx/d3dx12_render_pass.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ inline bool operator==( const D3D12_RENDER_PASS_BEGINNING_ACCESS &a, const D3D12
6060
if (!(a.PreserveLocal == b.PreserveLocal)) return false;
6161
break;
6262
#endif
63+
default:
64+
break;
6365
}
6466
return true;
6567
}
@@ -79,8 +81,9 @@ inline bool operator==(const D3D12_RENDER_PASS_ENDING_ACCESS& a, const D3D12_REN
7981
if (!(a.PreserveLocal == b.PreserveLocal)) return false;
8082
break;
8183
#endif
84+
default:
85+
break;
8286
}
83-
8487
return true;
8588
}
8689

‎include/directx/d3dx12_resource_helpers.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -600,3 +600,4 @@ inline bool D3DX12GetCopyableFootprints(
600600
}
601601

602602
#endif // D3D12_SDK_VERSION >= 606
603+

0 commit comments

Comments
 (0)