Handle querying for ID3D11Texture2D1 and ID3D12Resource1. Closes #1276

This commit is contained in:
baldurk
2019-02-22 13:49:58 +00:00
parent 95570e5a28
commit 73d51637c4
2 changed files with 8 additions and 4 deletions
+6 -4
View File
@@ -446,16 +446,18 @@ HRESULT WrappedIDXGISwapChain4::GetBuffer(
// query as native format so that wrapping works as expected
uuid = m_pDevice->GetBackbufferUUID();
}
else if(uuid != __uuidof(ID3D11Texture2D) && uuid != __uuidof(ID3D11Resource) &&
uuid != __uuidof(ID3D12Resource))
else if(uuid != __uuidof(ID3D11Texture2D) && uuid != __uuidof(ID3D11Texture2D1) &&
uuid != __uuidof(ID3D11Resource) && uuid != __uuidof(ID3D12Resource) &&
uuid != __uuidof(ID3D12Resource1))
{
RDCERR("Unsupported or unrecognised UUID passed to IDXGISwapChain::GetBuffer - %s",
ToStr(uuid).c_str());
return E_NOINTERFACE;
}
RDCASSERT(uuid == __uuidof(ID3D11Texture2D) || uuid == __uuidof(ID3D11Resource) ||
uuid == __uuidof(ID3D12Resource));
RDCASSERT(uuid == __uuidof(ID3D11Texture2D) || uuid == __uuidof(ID3D11Texture2D1) ||
uuid == __uuidof(ID3D11Resource) || uuid == __uuidof(ID3D12Resource) ||
uuid == __uuidof(ID3D12Resource1));
HRESULT ret = m_pReal->GetBuffer(Buffer, uuid, ppSurface);
+2
View File
@@ -30,9 +30,11 @@
#include "driver/dx/official/dxgi1_6.h"
MIDL_INTERFACE("6f15aaf2-d208-4e89-9ab4-489535d34f9c") ID3D11Texture2D;
MIDL_INTERFACE("51218251-1E33-4617-9CCB-4D3A4367E7BB") ID3D11Texture2D1;
MIDL_INTERFACE("dc8e63f3-d12b-4952-b47b-5e45026a862d") ID3D11Resource;
MIDL_INTERFACE("db6f6ddb-ac77-4e88-8253-819df9bbf140") ID3D11Device;
MIDL_INTERFACE("696442be-a72e-4059-bc79-5b5c98040fad") ID3D12Resource;
MIDL_INTERFACE("9D5E227A-4430-4161-88B3-3ECA6BB16E19") ID3D12Resource1;
MIDL_INTERFACE("189819f1-1db6-4b57-be54-1821339b85f7") ID3D12Device;
MIDL_INTERFACE("9B7E4E00-342C-4106-A19F-4F2704F689F0") ID3D11Multithread;