Skip to content

Commit e1bad51

Browse files
authored
Fix D3DX12 warnings (#234)
1 parent f51741f commit e1bad51

File tree

1 file changed

+56
-0
lines changed

1 file changed

+56
-0
lines changed

Src/d3dx12.h

+56
Original file line numberDiff line numberDiff line change
@@ -2831,6 +2831,14 @@ constexpr bool D3D12IsLayoutOpaque( D3D12_TEXTURE_LAYOUT Layout ) noexcept
28312831
{ return Layout == D3D12_TEXTURE_LAYOUT_UNKNOWN || Layout == D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE; }
28322832

28332833
//------------------------------------------------------------------------------------------------
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+
28342842
template< typename T >
28352843
inline T D3DX12Align(T uValue, T uAlign)
28362844
{
@@ -5002,6 +5010,10 @@ class CD3DX12_DXIL_LIBRARY_SUBOBJECT
50025010
Init();
50035011
AddToStateObject(ContainingStateObject);
50045012
}
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;
50055017
void SetDXILLibrary(const D3D12_SHADER_BYTECODE* pCode) noexcept
50065018
{
50075019
static const D3D12_SHADER_BYTECODE Default = {};
@@ -5068,6 +5080,10 @@ class CD3DX12_EXISTING_COLLECTION_SUBOBJECT
50685080
Init();
50695081
AddToStateObject(ContainingStateObject);
50705082
}
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;
50715087
void SetExistingCollection(ID3D12StateObject*pExistingCollection) noexcept
50725088
{
50735089
m_Desc.pExistingCollection = pExistingCollection;
@@ -5136,6 +5152,10 @@ class CD3DX12_SUBOBJECT_TO_EXPORTS_ASSOCIATION_SUBOBJECT
51365152
Init();
51375153
AddToStateObject(ContainingStateObject);
51385154
}
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;
51395159
void SetSubobjectToAssociate(const D3D12_STATE_SUBOBJECT& SubobjectToAssociate) noexcept
51405160
{
51415161
m_Desc.pSubobjectToAssociate = &SubobjectToAssociate;
@@ -5194,6 +5214,10 @@ class CD3DX12_DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATION
51945214
Init();
51955215
AddToStateObject(ContainingStateObject);
51965216
}
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;
51975221
void SetSubobjectNameToAssociate(LPCWSTR SubobjectToAssociate)
51985222
{
51995223
m_Desc.SubobjectToAssociate = m_SubobjectName.LocalCopy(SubobjectToAssociate, true);
@@ -5254,6 +5278,10 @@ class CD3DX12_HIT_GROUP_SUBOBJECT
52545278
Init();
52555279
AddToStateObject(ContainingStateObject);
52565280
}
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;
52575285
void SetHitGroupExport(LPCWSTR exportName)
52585286
{
52595287
m_Desc.HitGroupExport = m_Strings[0].LocalCopy(exportName, true);
@@ -5307,6 +5335,10 @@ class CD3DX12_RAYTRACING_SHADER_CONFIG_SUBOBJECT
53075335
Init();
53085336
AddToStateObject(ContainingStateObject);
53095337
}
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;
53105342
void Config(UINT MaxPayloadSizeInBytes, UINT MaxAttributeSizeInBytes) noexcept
53115343
{
53125344
m_Desc.MaxPayloadSizeInBytes = MaxPayloadSizeInBytes;
@@ -5341,6 +5373,10 @@ class CD3DX12_RAYTRACING_PIPELINE_CONFIG_SUBOBJECT
53415373
Init();
53425374
AddToStateObject(ContainingStateObject);
53435375
}
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;
53445380
void Config(UINT MaxTraceRecursionDepth) noexcept
53455381
{
53465382
m_Desc.MaxTraceRecursionDepth = MaxTraceRecursionDepth;
@@ -5374,6 +5410,10 @@ class CD3DX12_RAYTRACING_PIPELINE_CONFIG1_SUBOBJECT
53745410
Init();
53755411
AddToStateObject(ContainingStateObject);
53765412
}
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;
53775417
void Config(UINT MaxTraceRecursionDepth, D3D12_RAYTRACING_PIPELINE_FLAGS Flags) noexcept
53785418
{
53795419
m_Desc.MaxTraceRecursionDepth = MaxTraceRecursionDepth;
@@ -5408,6 +5448,10 @@ class CD3DX12_GLOBAL_ROOT_SIGNATURE_SUBOBJECT
54085448
Init();
54095449
AddToStateObject(ContainingStateObject);
54105450
}
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;
54115455
void SetRootSignature(ID3D12RootSignature* pRootSig) noexcept
54125456
{
54135457
m_pRootSig = pRootSig;
@@ -5441,6 +5485,10 @@ class CD3DX12_LOCAL_ROOT_SIGNATURE_SUBOBJECT
54415485
Init();
54425486
AddToStateObject(ContainingStateObject);
54435487
}
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;
54445492
void SetRootSignature(ID3D12RootSignature* pRootSig) noexcept
54455493
{
54465494
m_pRootSig = pRootSig;
@@ -5474,6 +5522,10 @@ class CD3DX12_STATE_OBJECT_CONFIG_SUBOBJECT
54745522
Init();
54755523
AddToStateObject(ContainingStateObject);
54765524
}
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;
54775529
void SetFlags(D3D12_STATE_OBJECT_FLAGS Flags) noexcept
54785530
{
54795531
m_Desc.Flags = Flags;
@@ -5507,6 +5559,10 @@ class CD3DX12_NODE_MASK_SUBOBJECT
55075559
Init();
55085560
AddToStateObject(ContainingStateObject);
55095561
}
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;
55105566
void SetNodeMask(UINT NodeMask) noexcept
55115567
{
55125568
m_Desc.NodeMask = NodeMask;

0 commit comments

Comments
 (0)