feat: updated engine version to 4.4-rc1
This commit is contained in:
parent
ee00efde1f
commit
21ba8e33af
5459 changed files with 1128836 additions and 198305 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -1,4 +1,4 @@
|
|||
//*********************************************************
|
||||
//*********************************************************
|
||||
//
|
||||
// Copyright (c) Microsoft Corporation.
|
||||
// Licensed under the MIT License (MIT).
|
||||
|
|
|
|||
|
|
@ -25,12 +25,10 @@
|
|||
struct DefaultSampleMask { operator UINT() noexcept { return UINT_MAX; } };
|
||||
struct DefaultSampleDesc { operator DXGI_SAMPLE_DESC() noexcept { return DXGI_SAMPLE_DESC{1, 0}; } };
|
||||
|
||||
/* GODOT start */
|
||||
#if defined(_MSC_VER)
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable : 4324)
|
||||
#endif
|
||||
/* GODOT start */
|
||||
template <typename InnerStructType, D3D12_PIPELINE_STATE_SUBOBJECT_TYPE Type, typename DefaultArg = InnerStructType>
|
||||
class alignas(void*) CD3DX12_PIPELINE_STATE_STREAM_SUBOBJECT
|
||||
{
|
||||
|
|
@ -46,11 +44,9 @@ public:
|
|||
InnerStructType* operator&() noexcept { return &pssInner; }
|
||||
InnerStructType const* operator&() const noexcept { return &pssInner; }
|
||||
};
|
||||
/* GODOT start */
|
||||
#if defined(_MSC_VER)
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
/* GODOT end */
|
||||
typedef CD3DX12_PIPELINE_STATE_STREAM_SUBOBJECT< D3D12_PIPELINE_STATE_FLAGS, D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_FLAGS> CD3DX12_PIPELINE_STATE_STREAM_FLAGS;
|
||||
typedef CD3DX12_PIPELINE_STATE_STREAM_SUBOBJECT< UINT, D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_NODE_MASK> CD3DX12_PIPELINE_STATE_STREAM_NODE_MASK;
|
||||
typedef CD3DX12_PIPELINE_STATE_STREAM_SUBOBJECT< ID3D12RootSignature*, D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_ROOT_SIGNATURE> CD3DX12_PIPELINE_STATE_STREAM_ROOT_SIGNATURE;
|
||||
|
|
|
|||
|
|
@ -996,9 +996,7 @@ struct CD3DX12_GPU_DESCRIPTOR_HANDLE : public D3D12_GPU_DESCRIPTOR_HANDLE
|
|||
// two code paths for building root signatures, this helper method reconstructs a 1.0 signature when
|
||||
// 1.1 is not supported.
|
||||
inline HRESULT D3DX12SerializeVersionedRootSignature(
|
||||
/* GODOT start */
|
||||
_In_ HMODULE pLibD3D12,
|
||||
/* GODOT end */
|
||||
_In_ const D3D12_VERSIONED_ROOT_SIGNATURE_DESC* pRootSignatureDesc,
|
||||
D3D_ROOT_SIGNATURE_VERSION MaxVersion,
|
||||
_Outptr_ ID3DBlob** ppBlob,
|
||||
|
|
@ -1009,22 +1007,18 @@ inline HRESULT D3DX12SerializeVersionedRootSignature(
|
|||
*ppErrorBlob = nullptr;
|
||||
}
|
||||
|
||||
/* GODOT start */
|
||||
PFN_D3D12_SERIALIZE_ROOT_SIGNATURE d3d_D3D12SerializeRootSignature = (PFN_D3D12_SERIALIZE_ROOT_SIGNATURE)(void *)GetProcAddress(pLibD3D12, "D3D12SerializeRootSignature");
|
||||
PFN_D3D12_SERIALIZE_ROOT_SIGNATURE d3d_D3D12SerializeRootSignature = (PFN_D3D12_SERIALIZE_ROOT_SIGNATURE)(void *)GetProcAddress(pLibD3D12, "D3D12SerializeRootSignature");
|
||||
if (d3d_D3D12SerializeRootSignature == nullptr) {
|
||||
return E_INVALIDARG;
|
||||
}
|
||||
PFN_D3D12_SERIALIZE_VERSIONED_ROOT_SIGNATURE d3d_D3D12SerializeVersionedRootSignature = (PFN_D3D12_SERIALIZE_VERSIONED_ROOT_SIGNATURE)(void *)GetProcAddress(pLibD3D12, "D3D12SerializeVersionedRootSignature");
|
||||
/* GODOT end */
|
||||
switch (MaxVersion)
|
||||
{
|
||||
case D3D_ROOT_SIGNATURE_VERSION_1_0:
|
||||
switch (pRootSignatureDesc->Version)
|
||||
{
|
||||
case D3D_ROOT_SIGNATURE_VERSION_1_0:
|
||||
/* GODOT start */
|
||||
return d3d_D3D12SerializeRootSignature(&pRootSignatureDesc->Desc_1_0, D3D_ROOT_SIGNATURE_VERSION_1, ppBlob, ppErrorBlob);
|
||||
/* GODOT end */
|
||||
|
||||
case D3D_ROOT_SIGNATURE_VERSION_1_1:
|
||||
#if defined(D3D12_SDK_VERSION) && (D3D12_SDK_VERSION >= 609)
|
||||
|
|
@ -1126,9 +1120,7 @@ inline HRESULT D3DX12SerializeVersionedRootSignature(
|
|||
if (SUCCEEDED(hr))
|
||||
{
|
||||
const CD3DX12_ROOT_SIGNATURE_DESC desc_1_0(desc_1_1.NumParameters, pParameters_1_0, desc_1_1.NumStaticSamplers, pStaticSamplers == nullptr ? desc_1_1.pStaticSamplers : pStaticSamplers, desc_1_1.Flags);
|
||||
/* GODOT start */
|
||||
hr = d3d_D3D12SerializeRootSignature(&desc_1_0, D3D_ROOT_SIGNATURE_VERSION_1, ppBlob, ppErrorBlob);
|
||||
/* GODOT end */
|
||||
}
|
||||
|
||||
if (pParameters)
|
||||
|
|
@ -1159,9 +1151,7 @@ inline HRESULT D3DX12SerializeVersionedRootSignature(
|
|||
{
|
||||
case D3D_ROOT_SIGNATURE_VERSION_1_0:
|
||||
case D3D_ROOT_SIGNATURE_VERSION_1_1:
|
||||
/* GODOT start */
|
||||
return d3d_D3D12SerializeVersionedRootSignature(pRootSignatureDesc, ppBlob, ppErrorBlob);
|
||||
/* GODOT end */
|
||||
|
||||
#if defined(D3D12_SDK_VERSION) && (D3D12_SDK_VERSION >= 609)
|
||||
case D3D_ROOT_SIGNATURE_VERSION_1_2:
|
||||
|
|
@ -1197,9 +1187,7 @@ inline HRESULT D3DX12SerializeVersionedRootSignature(
|
|||
if (SUCCEEDED(hr))
|
||||
{
|
||||
const CD3DX12_VERSIONED_ROOT_SIGNATURE_DESC desc(desc_1_1.NumParameters, desc_1_1.pParameters, desc_1_1.NumStaticSamplers, pStaticSamplers == nullptr ? desc_1_1.pStaticSamplers : pStaticSamplers, desc_1_1.Flags);
|
||||
/* GODOT start */
|
||||
hr = d3d_D3D12SerializeVersionedRootSignature(&desc, ppBlob, ppErrorBlob);
|
||||
/* GODOT end */
|
||||
}
|
||||
|
||||
if (pStaticSamplers)
|
||||
|
|
@ -1215,9 +1203,7 @@ inline HRESULT D3DX12SerializeVersionedRootSignature(
|
|||
#if defined(D3D12_SDK_VERSION) && (D3D12_SDK_VERSION >= 609)
|
||||
case D3D_ROOT_SIGNATURE_VERSION_1_2:
|
||||
#endif
|
||||
/* GODOT start */
|
||||
return d3d_D3D12SerializeVersionedRootSignature(pRootSignatureDesc, ppBlob, ppErrorBlob);
|
||||
/* GODOT end */
|
||||
}
|
||||
|
||||
return E_INVALIDARG;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue