From a6f7461aa753d48d0aab366566e1af35952539a0 Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 14 Nov 2019 17:31:44 +0000 Subject: [PATCH] Implement OpenSharedResource1 and ResourceByName on D3D11. Refs #1595 --- renderdoc/driver/d3d11/d3d11_common.h | 2 + renderdoc/driver/d3d11/d3d11_device.cpp | 8 +- renderdoc/driver/d3d11/d3d11_device.h | 2 +- renderdoc/driver/d3d11/d3d11_device1_wrap.cpp | 38 +- renderdoc/driver/d3d11/d3d11_device_wrap.cpp | 366 +++++++++--------- renderdoc/driver/d3d11/d3d11_stringise.cpp | 4 +- 6 files changed, 227 insertions(+), 193 deletions(-) diff --git a/renderdoc/driver/d3d11/d3d11_common.h b/renderdoc/driver/d3d11/d3d11_common.h index dee7490ee..c833251a5 100644 --- a/renderdoc/driver/d3d11/d3d11_common.h +++ b/renderdoc/driver/d3d11/d3d11_common.h @@ -422,6 +422,8 @@ enum class D3D11Chunk : uint32_t PostFinishCommandListSet, SwapDeviceContextState, ExternalDXGIResource, + OpenSharedResource1, + OpenSharedResourceByName, Max, }; diff --git a/renderdoc/driver/d3d11/d3d11_device.cpp b/renderdoc/driver/d3d11/d3d11_device.cpp index d816ed1e8..a65babeee 100644 --- a/renderdoc/driver/d3d11/d3d11_device.cpp +++ b/renderdoc/driver/d3d11/d3d11_device.cpp @@ -1031,6 +1031,8 @@ bool WrappedID3D11Device::ProcessChunk(ReadSerialiser &ser, D3D11Chunk context) case D3D11Chunk::SetExceptionMode: return Serialise_SetExceptionMode(ser, 0); case D3D11Chunk::ExternalDXGIResource: case D3D11Chunk::OpenSharedResource: + case D3D11Chunk::OpenSharedResource1: + case D3D11Chunk::OpenSharedResourceByName: { IID nul; return Serialise_OpenSharedResource(ser, 0, nul, NULL); @@ -1518,8 +1520,10 @@ IDXGIResource *WrappedID3D11Device::WrapExternalDXGIResource(IDXGIResource *res) return ret; } - void *voidRes = (void *)res; - OpenSharedResourceInternal(true, 0, __uuidof(IDXGIResource), &voidRes); + void *voidRes; + // duration will be meaningless but at least we can get timestamp. + SERIALISE_TIME_CALL(voidRes = (void *)res); + OpenSharedResourceInternal(D3D11Chunk::ExternalDXGIResource, __uuidof(IDXGIResource), &voidRes); return (IDXGIResource *)voidRes; } diff --git a/renderdoc/driver/d3d11/d3d11_device.h b/renderdoc/driver/d3d11/d3d11_device.h index 58abe258b..809eddf00 100644 --- a/renderdoc/driver/d3d11/d3d11_device.h +++ b/renderdoc/driver/d3d11/d3d11_device.h @@ -609,7 +609,7 @@ public: SerialiserType &ser, ID3D11Resource *tex, ResourceId id, const D3D11_SUBRESOURCE_DATA *data, UINT w, UINT h, UINT d, DXGI_FORMAT fmt, UINT mips, UINT arr, bool HasData); - HRESULT STDMETHODCALLTYPE OpenSharedResourceInternal(bool externalResource, HANDLE hResource, + HRESULT STDMETHODCALLTYPE OpenSharedResourceInternal(D3D11Chunk chunkType, REFIID ReturnedInterface, void **ppResource); // this is defined as a macro so that we can re-use it to explicitly instantiate these functions as diff --git a/renderdoc/driver/d3d11/d3d11_device1_wrap.cpp b/renderdoc/driver/d3d11/d3d11_device1_wrap.cpp index 6d8d69a79..b5869d922 100644 --- a/renderdoc/driver/d3d11/d3d11_device1_wrap.cpp +++ b/renderdoc/driver/d3d11/d3d11_device1_wrap.cpp @@ -322,8 +322,22 @@ HRESULT WrappedID3D11Device::OpenSharedResource1(HANDLE hResource, REFIID return { if(m_pDevice1 == NULL) return E_NOINTERFACE; - RDCUNIMPLEMENTED("Not wrapping OpenSharedResource1"); - return m_pDevice1->OpenSharedResource1(hResource, returnedInterface, ppResource); + + if(ppResource == NULL) + return E_INVALIDARG; + + HRESULT hr; + + SERIALISE_TIME_CALL(hr = m_pDevice1->OpenSharedResource1(hResource, returnedInterface, ppResource)); + + if(FAILED(hr)) + { + IUnknown *unk = (IUnknown *)*ppResource; + SAFE_RELEASE(unk); + return hr; + } + + return OpenSharedResourceInternal(D3D11Chunk::OpenSharedResource1, returnedInterface, ppResource); } HRESULT WrappedID3D11Device::OpenSharedResourceByName(LPCWSTR lpName, DWORD dwDesiredAccess, @@ -331,8 +345,24 @@ HRESULT WrappedID3D11Device::OpenSharedResourceByName(LPCWSTR lpName, DWORD dwDe { if(m_pDevice1 == NULL) return E_NOINTERFACE; - RDCUNIMPLEMENTED("Not wrapping OpenSharedResourceByName"); - return m_pDevice1->OpenSharedResourceByName(lpName, dwDesiredAccess, returnedInterface, ppResource); + + if(ppResource == NULL) + return E_INVALIDARG; + + HRESULT hr; + + SERIALISE_TIME_CALL(hr = m_pDevice1->OpenSharedResourceByName(lpName, dwDesiredAccess, + returnedInterface, ppResource)); + + if(FAILED(hr)) + { + IUnknown *unk = (IUnknown *)*ppResource; + SAFE_RELEASE(unk); + return hr; + } + + return OpenSharedResourceInternal(D3D11Chunk::OpenSharedResourceByName, returnedInterface, + ppResource); } #undef IMPLEMENT_FUNCTION_SERIALISED diff --git a/renderdoc/driver/d3d11/d3d11_device_wrap.cpp b/renderdoc/driver/d3d11/d3d11_device_wrap.cpp index 1748974ff..805262d59 100644 --- a/renderdoc/driver/d3d11/d3d11_device_wrap.cpp +++ b/renderdoc/driver/d3d11/d3d11_device_wrap.cpp @@ -3017,7 +3017,7 @@ HRESULT WrappedID3D11Device::CreateDeferredContext(UINT ContextFlags, } template -bool WrappedID3D11Device::Serialise_OpenSharedResource(SerialiserType &ser, HANDLE hResource, +bool WrappedID3D11Device::Serialise_OpenSharedResource(SerialiserType &ser, HANDLE, REFIID ReturnedInterface, void **ppResource) { ID3D11DeviceChild *res = ser.IsWriting() ? (ID3D11DeviceChild *)*ppResource : NULL; @@ -3274,10 +3274,24 @@ bool WrappedID3D11Device::Serialise_OpenSharedResource(SerialiserType &ser, HAND HRESULT WrappedID3D11Device::OpenSharedResource(HANDLE hResource, REFIID ReturnedInterface, void **ppResource) { - return OpenSharedResourceInternal(false, hResource, ReturnedInterface, ppResource); + if(ppResource == NULL) + return E_INVALIDARG; + + HRESULT hr; + + SERIALISE_TIME_CALL(hr = m_pDevice->OpenSharedResource(hResource, ReturnedInterface, ppResource)); + + if(FAILED(hr)) + { + IUnknown *unk = (IUnknown *)*ppResource; + SAFE_RELEASE(unk); + return hr; + } + + return OpenSharedResourceInternal(D3D11Chunk::OpenSharedResource, ReturnedInterface, ppResource); } -HRESULT WrappedID3D11Device::OpenSharedResourceInternal(bool externalResource, HANDLE hResource, +HRESULT WrappedID3D11Device::OpenSharedResourceInternal(D3D11Chunk chunkType, REFIID ReturnedInterface, void **ppResource) { if(IsReplayMode(m_State)) @@ -3286,9 +3300,6 @@ HRESULT WrappedID3D11Device::OpenSharedResourceInternal(bool externalResource, H return E_NOTIMPL; } - if(ppResource == NULL) - return E_INVALIDARG; - bool isDXGIRes = (ReturnedInterface == __uuidof(IDXGIResource) ? true : false); bool isRes = (ReturnedInterface == __uuidof(ID3D11Resource) ? true : false); bool isBuf = (ReturnedInterface == __uuidof(ID3D11Buffer) ? true : false); @@ -3298,204 +3309,189 @@ HRESULT WrappedID3D11Device::OpenSharedResourceInternal(bool externalResource, H if(isDXGIRes || isRes || isBuf || isTex1D || isTex2D || isTex3D) { - void *res = NULL; - HRESULT hr; + void *res = *ppResource; + HRESULT hr = S_OK; - if(externalResource) + if(isDXGIRes) { - res = *ppResource; - SERIALISE_TIME_CALL(hr = S_OK); - } - else - { - SERIALISE_TIME_CALL(hr = m_pDevice->OpenSharedResource(hResource, ReturnedInterface, &res)); + IDXGIResource *dxgiRes = (IDXGIResource *)res; + + ID3D11Resource *d3d11Res = NULL; + hr = dxgiRes->QueryInterface(__uuidof(ID3D11Resource), (void **)&d3d11Res); + + // if we can't get a d3d11Res then we can't properly wrap this resource, + // whatever it is. + if(FAILED(hr) || d3d11Res == NULL) + { + SAFE_RELEASE(d3d11Res); + SAFE_RELEASE(dxgiRes); + return E_NOINTERFACE; + } + + // release this interface + SAFE_RELEASE(dxgiRes); + + // and use this one, so it'll be casted back below + res = (void *)d3d11Res; + isRes = true; } - if(FAILED(hr)) + SCOPED_LOCK(m_D3DLock); + + ResourceId wrappedID; + + if(isRes) { - IUnknown *unk = (IUnknown *)res; - SAFE_RELEASE(unk); - return hr; + ID3D11Resource *resource = (ID3D11Resource *)res; + D3D11_RESOURCE_DIMENSION dim; + resource->GetType(&dim); + + if(dim == D3D11_RESOURCE_DIMENSION_BUFFER) + { + res = (ID3D11Buffer *)(ID3D11Resource *)res; + isBuf = true; + } + else if(dim == D3D11_RESOURCE_DIMENSION_TEXTURE1D) + { + res = (ID3D11Texture1D *)(ID3D11Resource *)res; + isTex1D = true; + } + else if(dim == D3D11_RESOURCE_DIMENSION_TEXTURE2D) + { + res = (ID3D11Texture2D *)(ID3D11Resource *)res; + isTex2D = true; + } + else if(dim == D3D11_RESOURCE_DIMENSION_TEXTURE3D) + { + res = (ID3D11Texture3D *)(ID3D11Resource *)res; + isTex3D = true; + } } - else + + ID3D11Resource *realRes = NULL; + + void *ppvWrapped = NULL; + + if(isBuf) { + WrappedID3D11Buffer *w = new WrappedID3D11Buffer((ID3D11Buffer *)res, 0, this); + wrappedID = w->GetResourceID(); + + realRes = w->GetReal(); + + ppvWrapped = (ID3D11Buffer *)w; + if(isDXGIRes) { - IDXGIResource *dxgiRes = (IDXGIResource *)res; - - ID3D11Resource *d3d11Res = NULL; - hr = dxgiRes->QueryInterface(__uuidof(ID3D11Resource), (void **)&d3d11Res); - - // if we can't get a d3d11Res then we can't properly wrap this resource, - // whatever it is. - if(FAILED(hr) || d3d11Res == NULL) - { - SAFE_RELEASE(d3d11Res); - SAFE_RELEASE(dxgiRes); - return E_NOINTERFACE; - } - - // release this interface - SAFE_RELEASE(dxgiRes); - - // and use this one, so it'll be casted back below - res = (void *)d3d11Res; - isRes = true; + w->QueryInterface(__uuidof(IDXGIResource), ppResource); + w->Release(); } - - SCOPED_LOCK(m_D3DLock); - - ResourceId wrappedID; - - if(isRes) + else if(isRes) { - ID3D11Resource *resource = (ID3D11Resource *)res; - D3D11_RESOURCE_DIMENSION dim; - resource->GetType(&dim); - - if(dim == D3D11_RESOURCE_DIMENSION_BUFFER) - { - res = (ID3D11Buffer *)(ID3D11Resource *)res; - isBuf = true; - } - else if(dim == D3D11_RESOURCE_DIMENSION_TEXTURE1D) - { - res = (ID3D11Texture1D *)(ID3D11Resource *)res; - isTex1D = true; - } - else if(dim == D3D11_RESOURCE_DIMENSION_TEXTURE2D) - { - res = (ID3D11Texture2D *)(ID3D11Resource *)res; - isTex2D = true; - } - else if(dim == D3D11_RESOURCE_DIMENSION_TEXTURE3D) - { - res = (ID3D11Texture3D *)(ID3D11Resource *)res; - isTex3D = true; - } + *ppResource = (ID3D11Resource *)w; } - - ID3D11Resource *realRes = NULL; - - void *ppvWrapped = NULL; - - if(isBuf) + else { - WrappedID3D11Buffer *w = new WrappedID3D11Buffer((ID3D11Buffer *)res, 0, this); - wrappedID = w->GetResourceID(); - - realRes = w->GetReal(); - - ppvWrapped = (ID3D11Buffer *)w; - - if(isDXGIRes) - { - w->QueryInterface(__uuidof(IDXGIResource), ppResource); - w->Release(); - } - else if(isRes) - { - *ppResource = (ID3D11Resource *)w; - } - else - { - *ppResource = (ID3D11Buffer *)w; - } + *ppResource = (ID3D11Buffer *)w; } - else if(isTex1D) - { - WrappedID3D11Texture1D *w = new WrappedID3D11Texture1D((ID3D11Texture1D *)res, this); - wrappedID = w->GetResourceID(); - - realRes = w->GetReal(); - - ppvWrapped = (ID3D11Texture1D *)w; - - if(isDXGIRes) - { - w->QueryInterface(__uuidof(IDXGIResource), ppResource); - w->Release(); - } - else if(isRes) - { - *ppResource = (ID3D11Resource *)w; - } - else - { - *ppResource = (ID3D11Texture1D *)w; - } - } - else if(isTex2D) - { - WrappedID3D11Texture2D1 *w = new WrappedID3D11Texture2D1((ID3D11Texture2D *)res, this); - wrappedID = w->GetResourceID(); - - realRes = w->GetReal(); - - ppvWrapped = (ID3D11Texture2D *)w; - - if(isDXGIRes) - { - w->QueryInterface(__uuidof(IDXGIResource), ppResource); - w->Release(); - } - else if(isRes) - { - *ppResource = (ID3D11Resource *)w; - } - else - { - *ppResource = (ID3D11Texture2D *)w; - } - } - else if(isTex3D) - { - WrappedID3D11Texture3D1 *w = new WrappedID3D11Texture3D1((ID3D11Texture3D *)res, this); - wrappedID = w->GetResourceID(); - - realRes = w->GetReal(); - - ppvWrapped = (ID3D11Texture3D *)w; - - if(isDXGIRes) - { - w->QueryInterface(__uuidof(IDXGIResource), ppResource); - w->Release(); - } - else if(isRes) - { - *ppResource = (ID3D11Resource *)w; - } - else - { - *ppResource = (ID3D11Texture3D *)w; - } - } - - Chunk *chunk = NULL; - - { - USE_SCRATCH_SERIALISER(); - SCOPED_SERIALISE_CHUNK(externalResource ? D3D11Chunk::ExternalDXGIResource - : D3D11Chunk::OpenSharedResource); - Serialise_OpenSharedResource(GET_SERIALISER, hResource, ReturnedInterface, &ppvWrapped); - - chunk = scope.Get(); - } - - // don't know where this came from or who might modify it at any point. - GetResourceManager()->MarkDirtyResource(wrappedID); - - D3D11ResourceRecord *record = GetResourceManager()->GetResourceRecord(wrappedID); - RDCASSERT(record); - - record->AddChunk(chunk); - record->SetDataPtr(chunk->GetData()); } + else if(isTex1D) + { + WrappedID3D11Texture1D *w = new WrappedID3D11Texture1D((ID3D11Texture1D *)res, this); + wrappedID = w->GetResourceID(); + + realRes = w->GetReal(); + + ppvWrapped = (ID3D11Texture1D *)w; + + if(isDXGIRes) + { + w->QueryInterface(__uuidof(IDXGIResource), ppResource); + w->Release(); + } + else if(isRes) + { + *ppResource = (ID3D11Resource *)w; + } + else + { + *ppResource = (ID3D11Texture1D *)w; + } + } + else if(isTex2D) + { + WrappedID3D11Texture2D1 *w = new WrappedID3D11Texture2D1((ID3D11Texture2D *)res, this); + wrappedID = w->GetResourceID(); + + realRes = w->GetReal(); + + ppvWrapped = (ID3D11Texture2D *)w; + + if(isDXGIRes) + { + w->QueryInterface(__uuidof(IDXGIResource), ppResource); + w->Release(); + } + else if(isRes) + { + *ppResource = (ID3D11Resource *)w; + } + else + { + *ppResource = (ID3D11Texture2D *)w; + } + } + else if(isTex3D) + { + WrappedID3D11Texture3D1 *w = new WrappedID3D11Texture3D1((ID3D11Texture3D *)res, this); + wrappedID = w->GetResourceID(); + + realRes = w->GetReal(); + + ppvWrapped = (ID3D11Texture3D *)w; + + if(isDXGIRes) + { + w->QueryInterface(__uuidof(IDXGIResource), ppResource); + w->Release(); + } + else if(isRes) + { + *ppResource = (ID3D11Resource *)w; + } + else + { + *ppResource = (ID3D11Texture3D *)w; + } + } + + Chunk *chunk = NULL; + + { + USE_SCRATCH_SERIALISER(); + SCOPED_SERIALISE_CHUNK(chunkType); + Serialise_OpenSharedResource(GET_SERIALISER, 0, ReturnedInterface, &ppvWrapped); + + chunk = scope.Get(); + } + + // don't know where this came from or who might modify it at any point. + GetResourceManager()->MarkDirtyResource(wrappedID); + + D3D11ResourceRecord *record = GetResourceManager()->GetResourceRecord(wrappedID); + RDCASSERT(record); + + record->AddChunk(chunk); + record->SetDataPtr(chunk->GetData()); return S_OK; } + RDCERR("Unknown OpenSharedResourceInternal GUID: %s", ToStr(ReturnedInterface).c_str()); + + IUnknown *unk = (IUnknown *)*ppResource; + SAFE_RELEASE(unk); + return E_NOINTERFACE; } diff --git a/renderdoc/driver/d3d11/d3d11_stringise.cpp b/renderdoc/driver/d3d11/d3d11_stringise.cpp index 471dc66a1..4ae957fab 100644 --- a/renderdoc/driver/d3d11/d3d11_stringise.cpp +++ b/renderdoc/driver/d3d11/d3d11_stringise.cpp @@ -59,7 +59,7 @@ rdcstr DoStringise(const D3D11ResourceType &el) template <> rdcstr DoStringise(const D3D11Chunk &el) { - RDCCOMPILE_ASSERT((uint32_t)D3D11Chunk::Max == 1128, "Chunks changed without updating names"); + RDCCOMPILE_ASSERT((uint32_t)D3D11Chunk::Max == 1130, "Chunks changed without updating names"); BEGIN_ENUM_STRINGISE(D3D11Chunk) { @@ -210,6 +210,8 @@ rdcstr DoStringise(const D3D11Chunk &el) STRINGISE_ENUM_CLASS_NAMED(SwapDeviceContextState, "ID3D11DeviceContext1::SwapDeviceContextState"); STRINGISE_ENUM_CLASS_NAMED(ExternalDXGIResource, "External DXGI Resource import"); + STRINGISE_ENUM_CLASS_NAMED(OpenSharedResource1, "ID3D11Device1::OpenSharedResource1"); + STRINGISE_ENUM_CLASS_NAMED(OpenSharedResourceByName, "ID3D11Device1::OpenSharedResourceByName"); STRINGISE_ENUM_CLASS_NAMED(Max, "Max Chunk"); } END_ENUM_STRINGISE()