AuroraMiddleware/DirectXTex
1
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex synced 2024-11-09 14:30:05 +00:00
Code Issues Releases Wiki Activity

Fix D3DX12 warnings (#478)

Browse Source
This commit is contained in:
Chuck Walbourn 2024-05-30 12:39:25 -07:00 committed by GitHub
parent 68e726aefc
commit bcb687ee65
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DirectXTex/DirectXTexUtil.cpp
View File

@ -27,6 +27,10 @@ static_assert(WIN10_DXGI_FORMAT_V208 == DXGI_FORMAT_V208, "Windows SDK mismatch
static_assert(WIN10_DXGI_FORMAT_V408 == DXGI_FORMAT_V408, "Windows SDK mismatch detected"); static_assert(WIN10_DXGI_FORMAT_V408 == DXGI_FORMAT_V408, "Windows SDK mismatch detected");
#endif #endif
#if defined(NTDDI_WIN11_GE)
static_assert(WIN11_DXGI_FORMAT_A4B4G4R4_UNORM == DXGI_FORMAT_A4B4G4R4_UNORM, "Windows SDK mismatch detected");
#endif
using namespace DirectX; using namespace DirectX;
using Microsoft::WRL::ComPtr; using Microsoft::WRL::ComPtr;

56
DirectXTex/d3dx12.h
View File

@ -2831,6 +2831,14 @@ constexpr bool D3D12IsLayoutOpaque( D3D12_TEXTURE_LAYOUT Layout ) noexcept
{ return Layout == D3D12_TEXTURE_LAYOUT_UNKNOWN || Layout == D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE; } { return Layout == D3D12_TEXTURE_LAYOUT_UNKNOWN || Layout == D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE; }
//------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------
#ifndef D3DX12_ASSERT
#ifdef assert
#define D3DX12_ASSERT(x) assert(x)
#else
#define D3DX12_ASSERT(x)
#endif
#endif
template< typename T > template< typename T >
inline T D3DX12Align(T uValue, T uAlign) inline T D3DX12Align(T uValue, T uAlign)
{ {
@ -5002,6 +5010,10 @@ public:
Init(); Init();
AddToStateObject(ContainingStateObject); AddToStateObject(ContainingStateObject);
} }
CD3DX12_DXIL_LIBRARY_SUBOBJECT(const CD3DX12_DXIL_LIBRARY_SUBOBJECT& other) = delete;
CD3DX12_DXIL_LIBRARY_SUBOBJECT& operator=(const CD3DX12_DXIL_LIBRARY_SUBOBJECT& other) = delete;
CD3DX12_DXIL_LIBRARY_SUBOBJECT(CD3DX12_DXIL_LIBRARY_SUBOBJECT&& other) = default;
CD3DX12_DXIL_LIBRARY_SUBOBJECT& operator=(CD3DX12_DXIL_LIBRARY_SUBOBJECT&& other) = default;
void SetDXILLibrary(const D3D12_SHADER_BYTECODE* pCode) noexcept void SetDXILLibrary(const D3D12_SHADER_BYTECODE* pCode) noexcept
{ {
static const D3D12_SHADER_BYTECODE Default = {}; static const D3D12_SHADER_BYTECODE Default = {};
@ -5068,6 +5080,10 @@ public:
Init(); Init();
AddToStateObject(ContainingStateObject); AddToStateObject(ContainingStateObject);
} }
CD3DX12_EXISTING_COLLECTION_SUBOBJECT(const CD3DX12_EXISTING_COLLECTION_SUBOBJECT& other) = delete;
CD3DX12_EXISTING_COLLECTION_SUBOBJECT& operator=(const CD3DX12_EXISTING_COLLECTION_SUBOBJECT& other) = delete;
CD3DX12_EXISTING_COLLECTION_SUBOBJECT(CD3DX12_EXISTING_COLLECTION_SUBOBJECT&& other) = default;
CD3DX12_EXISTING_COLLECTION_SUBOBJECT& operator=(CD3DX12_EXISTING_COLLECTION_SUBOBJECT&& other) = default;
void SetExistingCollection(ID3D12StateObject*pExistingCollection) noexcept void SetExistingCollection(ID3D12StateObject*pExistingCollection) noexcept
{ {
m_Desc.pExistingCollection = pExistingCollection; m_Desc.pExistingCollection = pExistingCollection;
@ -5136,6 +5152,10 @@ public:
Init(); Init();
AddToStateObject(ContainingStateObject); AddToStateObject(ContainingStateObject);
} }
CD3DX12_SUBOBJECT_TO_EXPORTS_ASSOCIATION_SUBOBJECT(const CD3DX12_SUBOBJECT_TO_EXPORTS_ASSOCIATION_SUBOBJECT& other) = delete;
CD3DX12_SUBOBJECT_TO_EXPORTS_ASSOCIATION_SUBOBJECT& operator=(const CD3DX12_SUBOBJECT_TO_EXPORTS_ASSOCIATION_SUBOBJECT& other) = delete;
CD3DX12_SUBOBJECT_TO_EXPORTS_ASSOCIATION_SUBOBJECT(CD3DX12_SUBOBJECT_TO_EXPORTS_ASSOCIATION_SUBOBJECT&& other) = default;
CD3DX12_SUBOBJECT_TO_EXPORTS_ASSOCIATION_SUBOBJECT& operator=(CD3DX12_SUBOBJECT_TO_EXPORTS_ASSOCIATION_SUBOBJECT&& other) = default;
void SetSubobjectToAssociate(const D3D12_STATE_SUBOBJECT& SubobjectToAssociate) noexcept void SetSubobjectToAssociate(const D3D12_STATE_SUBOBJECT& SubobjectToAssociate) noexcept
{ {
m_Desc.pSubobjectToAssociate = &SubobjectToAssociate; m_Desc.pSubobjectToAssociate = &SubobjectToAssociate;
@ -5194,6 +5214,10 @@ public:
Init(); Init();
AddToStateObject(ContainingStateObject); AddToStateObject(ContainingStateObject);
} }
CD3DX12_DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATION(const CD3DX12_DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATION& other) = delete;
CD3DX12_DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATION& operator=(const CD3DX12_DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATION& other) = delete;
CD3DX12_DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATION(CD3DX12_DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATION&& other) = default;
CD3DX12_DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATION& operator=(CD3DX12_DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATION&& other) = default;
void SetSubobjectNameToAssociate(LPCWSTR SubobjectToAssociate) void SetSubobjectNameToAssociate(LPCWSTR SubobjectToAssociate)
{ {
m_Desc.SubobjectToAssociate = m_SubobjectName.LocalCopy(SubobjectToAssociate, true); m_Desc.SubobjectToAssociate = m_SubobjectName.LocalCopy(SubobjectToAssociate, true);
@ -5254,6 +5278,10 @@ public:
Init(); Init();
AddToStateObject(ContainingStateObject); AddToStateObject(ContainingStateObject);
} }
CD3DX12_HIT_GROUP_SUBOBJECT(const CD3DX12_HIT_GROUP_SUBOBJECT& other) = delete;
CD3DX12_HIT_GROUP_SUBOBJECT& operator=(const CD3DX12_HIT_GROUP_SUBOBJECT& other) = delete;
CD3DX12_HIT_GROUP_SUBOBJECT(CD3DX12_HIT_GROUP_SUBOBJECT&& other) = default;
CD3DX12_HIT_GROUP_SUBOBJECT& operator=(CD3DX12_HIT_GROUP_SUBOBJECT&& other) = default;
void SetHitGroupExport(LPCWSTR exportName) void SetHitGroupExport(LPCWSTR exportName)
{ {
m_Desc.HitGroupExport = m_Strings[0].LocalCopy(exportName, true); m_Desc.HitGroupExport = m_Strings[0].LocalCopy(exportName, true);
@ -5307,6 +5335,10 @@ public:
Init(); Init();
AddToStateObject(ContainingStateObject); AddToStateObject(ContainingStateObject);
} }
CD3DX12_RAYTRACING_SHADER_CONFIG_SUBOBJECT(const CD3DX12_RAYTRACING_SHADER_CONFIG_SUBOBJECT& other) = delete;
CD3DX12_RAYTRACING_SHADER_CONFIG_SUBOBJECT& operator=(const CD3DX12_RAYTRACING_SHADER_CONFIG_SUBOBJECT& other) = delete;
CD3DX12_RAYTRACING_SHADER_CONFIG_SUBOBJECT(CD3DX12_RAYTRACING_SHADER_CONFIG_SUBOBJECT&& other) = default;
CD3DX12_RAYTRACING_SHADER_CONFIG_SUBOBJECT& operator=(CD3DX12_RAYTRACING_SHADER_CONFIG_SUBOBJECT&& other) = default;
void Config(UINT MaxPayloadSizeInBytes, UINT MaxAttributeSizeInBytes) noexcept void Config(UINT MaxPayloadSizeInBytes, UINT MaxAttributeSizeInBytes) noexcept
{ {
m_Desc.MaxPayloadSizeInBytes = MaxPayloadSizeInBytes; m_Desc.MaxPayloadSizeInBytes = MaxPayloadSizeInBytes;
@ -5341,6 +5373,10 @@ public:
Init(); Init();
AddToStateObject(ContainingStateObject); AddToStateObject(ContainingStateObject);
} }
CD3DX12_RAYTRACING_PIPELINE_CONFIG_SUBOBJECT(const CD3DX12_RAYTRACING_PIPELINE_CONFIG_SUBOBJECT& other) = delete;
CD3DX12_RAYTRACING_PIPELINE_CONFIG_SUBOBJECT& operator=(const CD3DX12_RAYTRACING_PIPELINE_CONFIG_SUBOBJECT& other) = delete;
CD3DX12_RAYTRACING_PIPELINE_CONFIG_SUBOBJECT(CD3DX12_RAYTRACING_PIPELINE_CONFIG_SUBOBJECT&& other) = default;
CD3DX12_RAYTRACING_PIPELINE_CONFIG_SUBOBJECT& operator=(CD3DX12_RAYTRACING_PIPELINE_CONFIG_SUBOBJECT&& other) = default;
void Config(UINT MaxTraceRecursionDepth) noexcept void Config(UINT MaxTraceRecursionDepth) noexcept
{ {
m_Desc.MaxTraceRecursionDepth = MaxTraceRecursionDepth; m_Desc.MaxTraceRecursionDepth = MaxTraceRecursionDepth;
@ -5374,6 +5410,10 @@ public:
Init(); Init();
AddToStateObject(ContainingStateObject); AddToStateObject(ContainingStateObject);
} }
CD3DX12_RAYTRACING_PIPELINE_CONFIG1_SUBOBJECT(const CD3DX12_RAYTRACING_PIPELINE_CONFIG1_SUBOBJECT& other) = delete;
CD3DX12_RAYTRACING_PIPELINE_CONFIG1_SUBOBJECT& operator=(const CD3DX12_RAYTRACING_PIPELINE_CONFIG1_SUBOBJECT& other) = delete;
CD3DX12_RAYTRACING_PIPELINE_CONFIG1_SUBOBJECT(CD3DX12_RAYTRACING_PIPELINE_CONFIG1_SUBOBJECT&& other) = default;
CD3DX12_RAYTRACING_PIPELINE_CONFIG1_SUBOBJECT& operator=(CD3DX12_RAYTRACING_PIPELINE_CONFIG1_SUBOBJECT&& other) = default;
void Config(UINT MaxTraceRecursionDepth, D3D12_RAYTRACING_PIPELINE_FLAGS Flags) noexcept void Config(UINT MaxTraceRecursionDepth, D3D12_RAYTRACING_PIPELINE_FLAGS Flags) noexcept
{ {
m_Desc.MaxTraceRecursionDepth = MaxTraceRecursionDepth; m_Desc.MaxTraceRecursionDepth = MaxTraceRecursionDepth;
@ -5408,6 +5448,10 @@ public:
Init(); Init();
AddToStateObject(ContainingStateObject); AddToStateObject(ContainingStateObject);
} }
CD3DX12_GLOBAL_ROOT_SIGNATURE_SUBOBJECT(const CD3DX12_GLOBAL_ROOT_SIGNATURE_SUBOBJECT& other) = delete;
CD3DX12_GLOBAL_ROOT_SIGNATURE_SUBOBJECT& operator=(const CD3DX12_GLOBAL_ROOT_SIGNATURE_SUBOBJECT& other) = delete;
CD3DX12_GLOBAL_ROOT_SIGNATURE_SUBOBJECT(CD3DX12_GLOBAL_ROOT_SIGNATURE_SUBOBJECT&& other) = default;
CD3DX12_GLOBAL_ROOT_SIGNATURE_SUBOBJECT& operator=(CD3DX12_GLOBAL_ROOT_SIGNATURE_SUBOBJECT&& other) = default;
void SetRootSignature(ID3D12RootSignature* pRootSig) noexcept void SetRootSignature(ID3D12RootSignature* pRootSig) noexcept
{ {
m_pRootSig = pRootSig; m_pRootSig = pRootSig;
@ -5441,6 +5485,10 @@ public:
Init(); Init();
AddToStateObject(ContainingStateObject); AddToStateObject(ContainingStateObject);
} }
CD3DX12_LOCAL_ROOT_SIGNATURE_SUBOBJECT(const CD3DX12_LOCAL_ROOT_SIGNATURE_SUBOBJECT& other) = delete;
CD3DX12_LOCAL_ROOT_SIGNATURE_SUBOBJECT& operator=(const CD3DX12_LOCAL_ROOT_SIGNATURE_SUBOBJECT& other) = delete;
CD3DX12_LOCAL_ROOT_SIGNATURE_SUBOBJECT(CD3DX12_LOCAL_ROOT_SIGNATURE_SUBOBJECT&& other) = default;
CD3DX12_LOCAL_ROOT_SIGNATURE_SUBOBJECT& operator=(CD3DX12_LOCAL_ROOT_SIGNATURE_SUBOBJECT&& other) = default;
void SetRootSignature(ID3D12RootSignature* pRootSig) noexcept void SetRootSignature(ID3D12RootSignature* pRootSig) noexcept
{ {
m_pRootSig = pRootSig; m_pRootSig = pRootSig;
@ -5474,6 +5522,10 @@ public:
Init(); Init();
AddToStateObject(ContainingStateObject); AddToStateObject(ContainingStateObject);
} }
CD3DX12_STATE_OBJECT_CONFIG_SUBOBJECT(const CD3DX12_STATE_OBJECT_CONFIG_SUBOBJECT& other) = delete;
CD3DX12_STATE_OBJECT_CONFIG_SUBOBJECT& operator=(const CD3DX12_STATE_OBJECT_CONFIG_SUBOBJECT& other) = delete;
CD3DX12_STATE_OBJECT_CONFIG_SUBOBJECT(CD3DX12_STATE_OBJECT_CONFIG_SUBOBJECT&& other) = default;
CD3DX12_STATE_OBJECT_CONFIG_SUBOBJECT& operator=(CD3DX12_STATE_OBJECT_CONFIG_SUBOBJECT&& other) = default;
void SetFlags(D3D12_STATE_OBJECT_FLAGS Flags) noexcept void SetFlags(D3D12_STATE_OBJECT_FLAGS Flags) noexcept
{ {
m_Desc.Flags = Flags; m_Desc.Flags = Flags;
@ -5507,6 +5559,10 @@ public:
Init(); Init();
AddToStateObject(ContainingStateObject); AddToStateObject(ContainingStateObject);
} }
CD3DX12_NODE_MASK_SUBOBJECT(const CD3DX12_NODE_MASK_SUBOBJECT& other) = delete;
CD3DX12_NODE_MASK_SUBOBJECT& operator=(const CD3DX12_NODE_MASK_SUBOBJECT& other) = delete;
CD3DX12_NODE_MASK_SUBOBJECT(CD3DX12_NODE_MASK_SUBOBJECT&& other) = default;
CD3DX12_NODE_MASK_SUBOBJECT& operator=(CD3DX12_NODE_MASK_SUBOBJECT&& other) = default;
void SetNodeMask(UINT NodeMask) noexcept void SetNodeMask(UINT NodeMask) noexcept
{ {
m_Desc.NodeMask = NodeMask; m_Desc.NodeMask = NodeMask;