KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

d3d12: Add a budget/usage callback to the screen 

Reviewed-by: Bill Kristiansen <billkris@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14959>
This commit is contained in:
Jesse Natalie 2022-02-09 08:56:28 -08:00 committed by Marge Bot
parent 671deb541e
commit 40dafd0094
3 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gallium/drivers/d3d12/d3d12_dxcore_screen.cpp
View File

@ -130,6 +130,19 @@ dxcore_get_name(struct pipe_screen *screen)
return buf;
}
static void
dxcore_get_memory_info(struct d3d12_screen *screen, struct d3d12_memory_info *output)
{
struct d3d12_dxcore_screen *dxcore_screen = d3d12_dxcore_screen(screen);
DXCoreAdapterMemoryBudget local_info, nonlocal_info;
DXCoreAdapterMemoryBudgetNodeSegmentGroup local_node_segment = { 0, DXCoreSegmentGroup::Local };
DXCoreAdapterMemoryBudgetNodeSegmentGroup nonlocal_node_segment = { 0, DXCoreSegmentGroup::NonLocal };
dxcore_screen->adapter->QueryState(DXCoreAdapterState::AdapterMemoryBudget, &local_node_segment, &local_info);
dxcore_screen->adapter->QueryState(DXCoreAdapterState::AdapterMemoryBudget, &nonlocal_node_segment, &nonlocal_info);
output->budget = local_info.budget + nonlocal_info.budget;
output->usage = local_info.currentUsage + nonlocal_info.currentUsage;
}
struct pipe_screen *
d3d12_create_dxcore_screen(struct sw_winsys *winsys, LUID *adapter_luid)
{
@ -168,6 +181,7 @@ d3d12_create_dxcore_screen(struct sw_winsys *winsys, LUID *adapter_luid)
screen->base.vendor_id = hardware_ids.vendorID;
screen->base.memory_size_megabytes = (dedicated_video_memory + dedicated_system_memory + shared_system_memory) >> 20;
screen->base.base.get_name = dxcore_get_name;
screen->base.get_memory_info = dxcore_get_memory_info;
if (!d3d12_init_screen(&screen->base, winsys, screen->adapter)) {
debug_printf("D3D12: failed to initialize DXCore screen\n");

25
src/gallium/drivers/d3d12/d3d12_dxgi_screen.cpp
View File

@ -70,10 +70,10 @@ get_dxgi_factory()
return factory;
}
static IDXGIAdapter1 *
static IDXGIAdapter3 *
choose_dxgi_adapter(IDXGIFactory4 *factory, LUID *adapter)
{
IDXGIAdapter1 *ret;
IDXGIAdapter3 *ret;
if (adapter) {
if (SUCCEEDED(factory->EnumAdapterByLuid(*adapter,
IID_PPV_ARGS(&ret))))
@ -90,8 +90,13 @@ choose_dxgi_adapter(IDXGIFactory4 *factory, LUID *adapter)
}
// The first adapter is the default
if (SUCCEEDED(factory->EnumAdapters1(0, &ret)))
return ret;
IDXGIAdapter1 *adapter1;
if (SUCCEEDED(factory->EnumAdapters1(0, &adapter1))) {
HRESULT hr = adapter1->QueryInterface(&ret);
adapter1->Release();
if (SUCCEEDED(hr))
return ret;
}
return NULL;
}
@ -108,6 +113,17 @@ dxgi_get_name(struct pipe_screen *screen)
return buf;
}
static void
dxgi_get_memory_info(struct d3d12_screen *screen, struct d3d12_memory_info *output)
{
struct d3d12_dxgi_screen *dxgi_screen = d3d12_dxgi_screen(screen);
DXGI_QUERY_VIDEO_MEMORY_INFO local_info, nonlocal_info;
dxgi_screen->adapter->QueryVideoMemoryInfo(0, DXGI_MEMORY_SEGMENT_GROUP_LOCAL, &local_info);
dxgi_screen->adapter->QueryVideoMemoryInfo(0, DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL, &nonlocal_info);
output->budget = local_info.Budget + nonlocal_info.Budget;
output->usage = local_info.CurrentUsage + nonlocal_info.CurrentUsage;
}
struct pipe_screen *
d3d12_create_dxgi_screen(struct sw_winsys *winsys, LUID *adapter_luid)
{
@ -147,6 +163,7 @@ d3d12_create_dxgi_screen(struct sw_winsys *winsys, LUID *adapter_luid)
(adapter_desc.SharedSystemMemory >> 20);
wcsncpy(screen->description, adapter_desc.Description, ARRAY_SIZE(screen->description));
screen->base.base.get_name = dxgi_get_name;
screen->base.get_memory_info = dxgi_get_memory_info;
if (!d3d12_init_screen(&screen->base, winsys, screen->adapter)) {
debug_printf("D3D12: failed to initialize DXGI screen\n");

8
src/gallium/drivers/d3d12/d3d12_screen.h
View File

@ -56,12 +56,18 @@ enum resource_dimension
RESOURCE_DIMENSION_COUNT
};
struct d3d12_memory_info {
uint64_t usage;
uint64_t budget;
};
struct d3d12_screen {
struct pipe_screen base;
struct sw_winsys *winsys;
ID3D12Device *dev;
ID3D12CommandQueue *cmdqueue;
void (*get_memory_info)(struct d3d12_screen *screen, struct d3d12_memory_info *output);
mtx_t submit_mutex;
ID3D12Fence *fence;
@ -115,7 +121,7 @@ struct d3d12_dxgi_screen {
struct d3d12_screen base;
struct IDXGIFactory4 *factory;
struct IDXGIAdapter1 *adapter;
struct IDXGIAdapter3 *adapter;
wchar_t description[128];
};