@@ -2831,6 +2831,14 @@ constexpr bool D3D12IsLayoutOpaque( D3D12_TEXTURE_LAYOUT Layout ) noexcept
2831
2831
{ return Layout == D3D12_TEXTURE_LAYOUT_UNKNOWN || Layout == D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE ; }
2832
2832
2833
2833
//------------------------------------------------------------------------------------------------
2834
+ #ifndef D3DX12_ASSERT
2835
+ #ifdef assert
2836
+ #define D3DX12_ASSERT (x ) assert(x)
2837
+ #else
2838
+ #define D3DX12_ASSERT (x )
2839
+ #endif
2840
+ #endif
2841
+
2834
2842
template < typename T >
2835
2843
inline T D3DX12Align (T uValue , T uAlign )
2836
2844
{
@@ -5002,6 +5010,10 @@ class CD3DX12_DXIL_LIBRARY_SUBOBJECT
5002
5010
Init ();
5003
5011
AddToStateObject (ContainingStateObject );
5004
5012
}
5013
+ CD3DX12_DXIL_LIBRARY_SUBOBJECT (const CD3DX12_DXIL_LIBRARY_SUBOBJECT & other ) = delete ;
5014
+ CD3DX12_DXIL_LIBRARY_SUBOBJECT & operator = (const CD3DX12_DXIL_LIBRARY_SUBOBJECT & other ) = delete ;
5015
+ CD3DX12_DXIL_LIBRARY_SUBOBJECT (CD3DX12_DXIL_LIBRARY_SUBOBJECT && other ) = default ;
5016
+ CD3DX12_DXIL_LIBRARY_SUBOBJECT & operator = (CD3DX12_DXIL_LIBRARY_SUBOBJECT && other ) = default ;
5005
5017
void SetDXILLibrary (const D3D12_SHADER_BYTECODE * pCode ) noexcept
5006
5018
{
5007
5019
static const D3D12_SHADER_BYTECODE Default = {};
@@ -5068,6 +5080,10 @@ class CD3DX12_EXISTING_COLLECTION_SUBOBJECT
5068
5080
Init ();
5069
5081
AddToStateObject (ContainingStateObject );
5070
5082
}
5083
+ CD3DX12_EXISTING_COLLECTION_SUBOBJECT (const CD3DX12_EXISTING_COLLECTION_SUBOBJECT & other ) = delete ;
5084
+ CD3DX12_EXISTING_COLLECTION_SUBOBJECT & operator = (const CD3DX12_EXISTING_COLLECTION_SUBOBJECT & other ) = delete ;
5085
+ CD3DX12_EXISTING_COLLECTION_SUBOBJECT (CD3DX12_EXISTING_COLLECTION_SUBOBJECT && other ) = default ;
5086
+ CD3DX12_EXISTING_COLLECTION_SUBOBJECT & operator = (CD3DX12_EXISTING_COLLECTION_SUBOBJECT && other ) = default ;
5071
5087
void SetExistingCollection (ID3D12StateObject * pExistingCollection ) noexcept
5072
5088
{
5073
5089
m_Desc .pExistingCollection = pExistingCollection ;
@@ -5136,6 +5152,10 @@ class CD3DX12_SUBOBJECT_TO_EXPORTS_ASSOCIATION_SUBOBJECT
5136
5152
Init ();
5137
5153
AddToStateObject (ContainingStateObject );
5138
5154
}
5155
+ CD3DX12_SUBOBJECT_TO_EXPORTS_ASSOCIATION_SUBOBJECT (const CD3DX12_SUBOBJECT_TO_EXPORTS_ASSOCIATION_SUBOBJECT & other ) = delete ;
5156
+ CD3DX12_SUBOBJECT_TO_EXPORTS_ASSOCIATION_SUBOBJECT & operator = (const CD3DX12_SUBOBJECT_TO_EXPORTS_ASSOCIATION_SUBOBJECT & other ) = delete ;
5157
+ CD3DX12_SUBOBJECT_TO_EXPORTS_ASSOCIATION_SUBOBJECT (CD3DX12_SUBOBJECT_TO_EXPORTS_ASSOCIATION_SUBOBJECT && other ) = default ;
5158
+ CD3DX12_SUBOBJECT_TO_EXPORTS_ASSOCIATION_SUBOBJECT & operator = (CD3DX12_SUBOBJECT_TO_EXPORTS_ASSOCIATION_SUBOBJECT && other ) = default ;
5139
5159
void SetSubobjectToAssociate (const D3D12_STATE_SUBOBJECT & SubobjectToAssociate ) noexcept
5140
5160
{
5141
5161
m_Desc .pSubobjectToAssociate = & SubobjectToAssociate ;
@@ -5194,6 +5214,10 @@ class CD3DX12_DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATION
5194
5214
Init ();
5195
5215
AddToStateObject (ContainingStateObject );
5196
5216
}
5217
+ CD3DX12_DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATION (const CD3DX12_DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATION & other ) = delete ;
5218
+ CD3DX12_DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATION & operator = (const CD3DX12_DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATION & other ) = delete ;
5219
+ CD3DX12_DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATION (CD3DX12_DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATION && other ) = default ;
5220
+ CD3DX12_DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATION & operator = (CD3DX12_DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATION && other ) = default ;
5197
5221
void SetSubobjectNameToAssociate (LPCWSTR SubobjectToAssociate )
5198
5222
{
5199
5223
m_Desc .SubobjectToAssociate = m_SubobjectName .LocalCopy (SubobjectToAssociate , true);
@@ -5254,6 +5278,10 @@ class CD3DX12_HIT_GROUP_SUBOBJECT
5254
5278
Init ();
5255
5279
AddToStateObject (ContainingStateObject );
5256
5280
}
5281
+ CD3DX12_HIT_GROUP_SUBOBJECT (const CD3DX12_HIT_GROUP_SUBOBJECT & other ) = delete ;
5282
+ CD3DX12_HIT_GROUP_SUBOBJECT & operator = (const CD3DX12_HIT_GROUP_SUBOBJECT & other ) = delete ;
5283
+ CD3DX12_HIT_GROUP_SUBOBJECT (CD3DX12_HIT_GROUP_SUBOBJECT && other ) = default ;
5284
+ CD3DX12_HIT_GROUP_SUBOBJECT & operator = (CD3DX12_HIT_GROUP_SUBOBJECT && other ) = default ;
5257
5285
void SetHitGroupExport (LPCWSTR exportName )
5258
5286
{
5259
5287
m_Desc .HitGroupExport = m_Strings [0 ].LocalCopy (exportName , true);
@@ -5307,6 +5335,10 @@ class CD3DX12_RAYTRACING_SHADER_CONFIG_SUBOBJECT
5307
5335
Init ();
5308
5336
AddToStateObject (ContainingStateObject );
5309
5337
}
5338
+ CD3DX12_RAYTRACING_SHADER_CONFIG_SUBOBJECT (const CD3DX12_RAYTRACING_SHADER_CONFIG_SUBOBJECT & other ) = delete ;
5339
+ CD3DX12_RAYTRACING_SHADER_CONFIG_SUBOBJECT & operator = (const CD3DX12_RAYTRACING_SHADER_CONFIG_SUBOBJECT & other ) = delete ;
5340
+ CD3DX12_RAYTRACING_SHADER_CONFIG_SUBOBJECT (CD3DX12_RAYTRACING_SHADER_CONFIG_SUBOBJECT && other ) = default ;
5341
+ CD3DX12_RAYTRACING_SHADER_CONFIG_SUBOBJECT & operator = (CD3DX12_RAYTRACING_SHADER_CONFIG_SUBOBJECT && other ) = default ;
5310
5342
void Config (UINT MaxPayloadSizeInBytes , UINT MaxAttributeSizeInBytes ) noexcept
5311
5343
{
5312
5344
m_Desc .MaxPayloadSizeInBytes = MaxPayloadSizeInBytes ;
@@ -5341,6 +5373,10 @@ class CD3DX12_RAYTRACING_PIPELINE_CONFIG_SUBOBJECT
5341
5373
Init ();
5342
5374
AddToStateObject (ContainingStateObject );
5343
5375
}
5376
+ CD3DX12_RAYTRACING_PIPELINE_CONFIG_SUBOBJECT (const CD3DX12_RAYTRACING_PIPELINE_CONFIG_SUBOBJECT & other ) = delete ;
5377
+ CD3DX12_RAYTRACING_PIPELINE_CONFIG_SUBOBJECT & operator = (const CD3DX12_RAYTRACING_PIPELINE_CONFIG_SUBOBJECT & other ) = delete ;
5378
+ CD3DX12_RAYTRACING_PIPELINE_CONFIG_SUBOBJECT (CD3DX12_RAYTRACING_PIPELINE_CONFIG_SUBOBJECT && other ) = default ;
5379
+ CD3DX12_RAYTRACING_PIPELINE_CONFIG_SUBOBJECT & operator = (CD3DX12_RAYTRACING_PIPELINE_CONFIG_SUBOBJECT && other ) = default ;
5344
5380
void Config (UINT MaxTraceRecursionDepth ) noexcept
5345
5381
{
5346
5382
m_Desc .MaxTraceRecursionDepth = MaxTraceRecursionDepth ;
@@ -5374,6 +5410,10 @@ class CD3DX12_RAYTRACING_PIPELINE_CONFIG1_SUBOBJECT
5374
5410
Init ();
5375
5411
AddToStateObject (ContainingStateObject );
5376
5412
}
5413
+ CD3DX12_RAYTRACING_PIPELINE_CONFIG1_SUBOBJECT (const CD3DX12_RAYTRACING_PIPELINE_CONFIG1_SUBOBJECT & other ) = delete ;
5414
+ CD3DX12_RAYTRACING_PIPELINE_CONFIG1_SUBOBJECT & operator = (const CD3DX12_RAYTRACING_PIPELINE_CONFIG1_SUBOBJECT & other ) = delete ;
5415
+ CD3DX12_RAYTRACING_PIPELINE_CONFIG1_SUBOBJECT (CD3DX12_RAYTRACING_PIPELINE_CONFIG1_SUBOBJECT && other ) = default ;
5416
+ CD3DX12_RAYTRACING_PIPELINE_CONFIG1_SUBOBJECT & operator = (CD3DX12_RAYTRACING_PIPELINE_CONFIG1_SUBOBJECT && other ) = default ;
5377
5417
void Config (UINT MaxTraceRecursionDepth , D3D12_RAYTRACING_PIPELINE_FLAGS Flags ) noexcept
5378
5418
{
5379
5419
m_Desc .MaxTraceRecursionDepth = MaxTraceRecursionDepth ;
@@ -5408,6 +5448,10 @@ class CD3DX12_GLOBAL_ROOT_SIGNATURE_SUBOBJECT
5408
5448
Init ();
5409
5449
AddToStateObject (ContainingStateObject );
5410
5450
}
5451
+ CD3DX12_GLOBAL_ROOT_SIGNATURE_SUBOBJECT (const CD3DX12_GLOBAL_ROOT_SIGNATURE_SUBOBJECT & other ) = delete ;
5452
+ CD3DX12_GLOBAL_ROOT_SIGNATURE_SUBOBJECT & operator = (const CD3DX12_GLOBAL_ROOT_SIGNATURE_SUBOBJECT & other ) = delete ;
5453
+ CD3DX12_GLOBAL_ROOT_SIGNATURE_SUBOBJECT (CD3DX12_GLOBAL_ROOT_SIGNATURE_SUBOBJECT && other ) = default ;
5454
+ CD3DX12_GLOBAL_ROOT_SIGNATURE_SUBOBJECT & operator = (CD3DX12_GLOBAL_ROOT_SIGNATURE_SUBOBJECT && other ) = default ;
5411
5455
void SetRootSignature (ID3D12RootSignature * pRootSig ) noexcept
5412
5456
{
5413
5457
m_pRootSig = pRootSig ;
@@ -5441,6 +5485,10 @@ class CD3DX12_LOCAL_ROOT_SIGNATURE_SUBOBJECT
5441
5485
Init ();
5442
5486
AddToStateObject (ContainingStateObject );
5443
5487
}
5488
+ CD3DX12_LOCAL_ROOT_SIGNATURE_SUBOBJECT (const CD3DX12_LOCAL_ROOT_SIGNATURE_SUBOBJECT & other ) = delete ;
5489
+ CD3DX12_LOCAL_ROOT_SIGNATURE_SUBOBJECT & operator = (const CD3DX12_LOCAL_ROOT_SIGNATURE_SUBOBJECT & other ) = delete ;
5490
+ CD3DX12_LOCAL_ROOT_SIGNATURE_SUBOBJECT (CD3DX12_LOCAL_ROOT_SIGNATURE_SUBOBJECT && other ) = default ;
5491
+ CD3DX12_LOCAL_ROOT_SIGNATURE_SUBOBJECT & operator = (CD3DX12_LOCAL_ROOT_SIGNATURE_SUBOBJECT && other ) = default ;
5444
5492
void SetRootSignature (ID3D12RootSignature * pRootSig ) noexcept
5445
5493
{
5446
5494
m_pRootSig = pRootSig ;
@@ -5474,6 +5522,10 @@ class CD3DX12_STATE_OBJECT_CONFIG_SUBOBJECT
5474
5522
Init ();
5475
5523
AddToStateObject (ContainingStateObject );
5476
5524
}
5525
+ CD3DX12_STATE_OBJECT_CONFIG_SUBOBJECT (const CD3DX12_STATE_OBJECT_CONFIG_SUBOBJECT & other ) = delete ;
5526
+ CD3DX12_STATE_OBJECT_CONFIG_SUBOBJECT & operator = (const CD3DX12_STATE_OBJECT_CONFIG_SUBOBJECT & other ) = delete ;
5527
+ CD3DX12_STATE_OBJECT_CONFIG_SUBOBJECT (CD3DX12_STATE_OBJECT_CONFIG_SUBOBJECT && other ) = default ;
5528
+ CD3DX12_STATE_OBJECT_CONFIG_SUBOBJECT & operator = (CD3DX12_STATE_OBJECT_CONFIG_SUBOBJECT && other ) = default ;
5477
5529
void SetFlags (D3D12_STATE_OBJECT_FLAGS Flags ) noexcept
5478
5530
{
5479
5531
m_Desc .Flags = Flags ;
@@ -5507,6 +5559,10 @@ class CD3DX12_NODE_MASK_SUBOBJECT
5507
5559
Init ();
5508
5560
AddToStateObject (ContainingStateObject );
5509
5561
}
5562
+ CD3DX12_NODE_MASK_SUBOBJECT (const CD3DX12_NODE_MASK_SUBOBJECT & other ) = delete ;
5563
+ CD3DX12_NODE_MASK_SUBOBJECT & operator = (const CD3DX12_NODE_MASK_SUBOBJECT & other ) = delete ;
5564
+ CD3DX12_NODE_MASK_SUBOBJECT (CD3DX12_NODE_MASK_SUBOBJECT && other ) = default ;
5565
+ CD3DX12_NODE_MASK_SUBOBJECT & operator = (CD3DX12_NODE_MASK_SUBOBJECT && other ) = default ;
5510
5566
void SetNodeMask (UINT NodeMask ) noexcept
5511
5567
{
5512
5568
m_Desc .NodeMask = NodeMask ;
0 commit comments