Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-09 16:18:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[host] d12: test if creating resources in the heap works at init

Browse Source 
AMD GPUs and older NVidia GPUs can initialize fine but fail when we
start to create resources in the shared memory heap, we must test it
early to detect this so we can fallback to a working capture method.
This commit is contained in:
Geoffrey McRae 2024-03-11 12:36:28 +11:00
parent 7a41169104
commit 989fe2bb0b
1 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
host/platform/Windows/capture/D12/d12.c
View File

@ -113,6 +113,8 @@ static bool d12_enumerateDevices(
IDXGIAdapter1 ** adapter, IDXGIAdapter1 ** adapter,
IDXGIOutput ** output); IDXGIOutput ** output);
static bool d12_heapTest(ID3D12Device3 * device, ID3D12Heap * heap);
static ID3D12Resource * d12_frameBufferToResource( static ID3D12Resource * d12_frameBufferToResource(
unsigned frameBufferIndex, unsigned frameBufferIndex,
FrameBuffer * frameBuffer, FrameBuffer * frameBuffer,
@ -349,6 +351,17 @@ static bool d12_init(void * ivshmemBase, unsigned * alignSize)
D3D12_HEAP_DESC heapDesc = ID3D12Heap_GetDesc(*ivshmemHeap); D3D12_HEAP_DESC heapDesc = ID3D12Heap_GetDesc(*ivshmemHeap);
*alignSize = heapDesc.Alignment; *alignSize = heapDesc.Alignment;
/* Ensure we can create resources in the ivshmem heap
* NOTE: It is safe to do this as the application has not yet setup the KVMFR
* headers, so we can just attempt to create a resource at the start of the
* heap without corrupting anything */
if (!d12_heapTest(*device, *ivshmemHeap))
{
DEBUG_ERROR(
"Unable to create resources in the IVSHMEM heap, is REBAR working?");
goto exit;
}
// initialize the backend // initialize the backend
if (!d12_backendInit(this->backend, this->debug, *device, *adapter, *output, if (!d12_backendInit(this->backend, this->debug, *device, *adapter, *output,
this->trackDamage)) this->trackDamage))
@ -916,6 +929,50 @@ static bool d12_enumerateDevices(
return true; return true;
} }
static bool d12_heapTest(ID3D12Device3 * device, ID3D12Heap * heap)
{
bool result = false;
comRef_scopePush(1);
D3D12_RESOURCE_DESC desc =
{
.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER,
.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT,
.Width = 1048576,
.Height = 1,
.DepthOrArraySize = 1,
.MipLevels = 1,
.Format = DXGI_FORMAT_UNKNOWN,
.SampleDesc.Count = 1,
.SampleDesc.Quality = 0,
.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR,
.Flags = D3D12_RESOURCE_FLAG_ALLOW_CROSS_ADAPTER
};
comRef_defineLocal(ID3D12Resource, resource);
HRESULT hr = ID3D12Device3_CreatePlacedResource(
device,
heap,
0,
&desc,
D3D12_RESOURCE_STATE_COPY_DEST,
NULL,
&IID_ID3D12Resource,
(void **)resource);
if (FAILED(hr))
{
DEBUG_WINERROR("Failed to create the FrameBuffer ID3D12Resource", hr);
goto exit;
}
result = true;
exit:
comRef_scopePop();
return result;
}
static ID3D12Resource * d12_frameBufferToResource(unsigned frameBufferIndex, static ID3D12Resource * d12_frameBufferToResource(unsigned frameBufferIndex,
FrameBuffer * frameBuffer, unsigned size) FrameBuffer * frameBuffer, unsigned size)
{ {