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

[host] d12: move ivshmem heap creation to later in init

Browse Source 
This has been moved to try to isolate a failure with RX580 startup
This commit is contained in:
Geoffrey McRae 2024-03-09 11:54:19 +11:00
parent a88783e5b7
commit 4d388d6b9b
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -334,21 +334,6 @@ static bool d12_init(void * ivshmemBase, unsigned * alignSize)
*device, D3D12_COMMAND_LIST_TYPE_COMPUTE, &this->computeCommand, L"Compute")) *device, D3D12_COMMAND_LIST_TYPE_COMPUTE, &this->computeCommand, L"Compute"))
goto exit; goto exit;
// Create the IVSHMEM heap
this->ivshmemBase = ivshmemBase;
comRef_defineLocal(ID3D12Heap, ivshmemHeap);
hr = ID3D12Device3_OpenExistingHeapFromAddress(
*device, ivshmemBase, &IID_ID3D12Heap, (void **)ivshmemHeap);
if (FAILED(hr))
{
DEBUG_WINERROR("Failed to open the framebuffer as a D3D12Heap", hr);
goto exit;
}
// Adjust the alignSize based on the required heap alignment
D3D12_HEAP_DESC heapDesc = ID3D12Heap_GetDesc(*ivshmemHeap);
*alignSize = heapDesc.Alignment;
// 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))
@ -377,6 +362,21 @@ static bool d12_init(void * ivshmemBase, unsigned * alignSize)
} }
} }
// Create the IVSHMEM heap
this->ivshmemBase = ivshmemBase;
comRef_defineLocal(ID3D12Heap, ivshmemHeap);
hr = ID3D12Device3_OpenExistingHeapFromAddress(
*device, ivshmemBase, &IID_ID3D12Heap, (void **)ivshmemHeap);
if (FAILED(hr))
{
DEBUG_WINERROR("Failed to open the framebuffer as a D3D12Heap", hr);
goto exit;
}
// Adjust the alignSize based on the required heap alignment
D3D12_HEAP_DESC heapDesc = ID3D12Heap_GetDesc(*ivshmemHeap);
*alignSize = heapDesc.Alignment;
comRef_toGlobal(this->factory , factory ); comRef_toGlobal(this->factory , factory );
comRef_toGlobal(this->device , device ); comRef_toGlobal(this->device , device );
comRef_toGlobal(this->copyQueue , copyQueue ); comRef_toGlobal(this->copyQueue , copyQueue );
@ -388,7 +388,13 @@ static bool d12_init(void * ivshmemBase, unsigned * alignSize)
exit: exit:
comRef_scopePop(); comRef_scopePop();
if (!result) if (!result)
{
D12Effect * effect;
vector_forEach(effect, &this->effects)
d12_effectFree(&effect);
vector_destroy(&this->effects);
comRef_freeScope(&d12_comScope); comRef_freeScope(&d12_comScope);
}
return result; return result;
} }