system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 19:04:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dxdiagn: Added properties for hardware acceleration capabilities.

Browse source
This commit is contained in:
Markus Weiland 2014-03-23 21:18:45 -04:00 committed by Alexandre Julliard
parent 1809f7c782
commit 7462da1345
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dlls/dxdiagn/provider.c
View file

@ -915,10 +915,15 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node
static const WCHAR id_fmtW[] = {'0','x','%','0','4','x',0};
static const WCHAR subsysid_fmtW[] = {'0','x','%','0','8','x',0};
static const WCHAR mem_fmt[] = {'%','.','1','f',' ','M','B',0};
static const WCHAR b3DAccelerationExists[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','x','i','s','t','s',0};
static const WCHAR b3DAccelerationEnabled[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0};
static const WCHAR bDDAccelerationEnabled[] = {'b','D','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0};
D3DADAPTER_IDENTIFIER9 adapter_info;
D3DDISPLAYMODE adapter_mode;
D3DCAPS9 device_caps;
DWORD available_mem = 0;
BOOL hardware_accel;
snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), adapterid_fmtW, index);
display_adapter = allocate_information_node(buffer);
@ -1043,6 +1048,21 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node
hr = add_bstr_property(display_adapter, szDisplayMemoryEnglish, buffer);
if (FAILED(hr))
goto cleanup;
hr = IDirect3D9_GetDeviceCaps(pDirect3D9, index, D3DDEVTYPE_HAL, &device_caps);
hardware_accel = SUCCEEDED(hr);
hr = add_bool_property(display_adapter, b3DAccelerationEnabled, hardware_accel);
if (FAILED(hr))
goto cleanup;
hr = add_bool_property(display_adapter, b3DAccelerationExists, hardware_accel);
if (FAILED(hr))
goto cleanup;
hr = add_bool_property(display_adapter, bDDAccelerationEnabled, hardware_accel);
if (FAILED(hr))
goto cleanup;
}
hr = S_OK;

6
dlls/dxdiagn/tests/container.c
View file

@ -938,6 +938,9 @@ static void test_DxDiag_DisplayDevices(void)
static const WCHAR szRevisionId[] = {'s','z','R','e','v','i','s','i','o','n','I','d',0};
static const WCHAR dwRefreshRate[] = {'d','w','R','e','f','r','e','s','h','R','a','t','e',0};
static const WCHAR szManufacturer[] = {'s','z','M','a','n','u','f','a','c','t','u','r','e','r',0};
static const WCHAR b3DAccelerationExists[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','x','i','s','t','s',0};
static const WCHAR b3DAccelerationEnabled[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0};
static const WCHAR bDDAccelerationEnabled[] = {'b','D','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0};
static const struct property_test property_tests[] =
{
@ -959,6 +962,9 @@ static void test_DxDiag_DisplayDevices(void)
{szRevisionId, VT_BSTR},
{dwRefreshRate, VT_UI4},
{szManufacturer, VT_BSTR},
{b3DAccelerationExists, VT_BOOL},
{b3DAccelerationEnabled, VT_BOOL},
{bDDAccelerationEnabled, VT_BOOL},
};
IDxDiagContainer *display_cont = NULL;