system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 12:47:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

dxgi: Add partial implementation for dxgi_adapter_GetDesc2() and dxgi_adapter_GetDesc3().

Browse source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2018-10-24 08:22:03 +03:00 committed by Alexandre Julliard
parent 7e7d03ed59
commit 1e8d17d0a4
1 changed files with 43 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
dlls/dxgi/adapter.c
View file

@ -147,18 +147,12 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac
return S_OK;
}
static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc1(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC1 *desc)
static HRESULT dxgi_adapter_get_desc(struct dxgi_adapter *adapter, DXGI_ADAPTER_DESC3 *desc)
{
struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface);
struct wined3d_adapter_identifier adapter_id;
char description[128];
HRESULT hr;
TRACE("iface %p, desc %p.\n", iface, desc);
if (!desc)
return E_INVALIDARG;
adapter_id.driver_size = 0;
adapter_id.description = description;
adapter_id.description_size = sizeof(description);
@ -187,13 +181,16 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc1(IWineDXGIAdapter *iface,
desc->SharedSystemMemory = 0; /* FIXME */
desc->AdapterLuid = adapter_id.adapter_luid;
desc->Flags = 0;
desc->GraphicsPreemptionGranularity = 0; /* FIXME */
desc->ComputePreemptionGranularity = 0; /* FIXME */
return hr;
}
static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC *desc)
{
DXGI_ADAPTER_DESC1 desc1;
struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface);
DXGI_ADAPTER_DESC3 desc3;
HRESULT hr;
TRACE("iface %p, desc %p.\n", iface, desc);
@ -201,8 +198,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, D
if (!desc)
return E_INVALIDARG;
if (SUCCEEDED(hr = dxgi_adapter_GetDesc1(iface, &desc1)))
memcpy(desc, &desc1, sizeof(*desc));
if (SUCCEEDED(hr = dxgi_adapter_get_desc(adapter, &desc3)))
memcpy(desc, &desc3, sizeof(*desc));
return hr;
}
@ -249,11 +246,38 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IWineDXGIAda
return S_OK;
}
static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc1(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC1 *desc)
{
struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface);
DXGI_ADAPTER_DESC3 desc3;
HRESULT hr;
TRACE("iface %p, desc %p.\n", iface, desc);
if (!desc)
return E_INVALIDARG;
if (SUCCEEDED(hr = dxgi_adapter_get_desc(adapter, &desc3)))
memcpy(desc, &desc3, sizeof(*desc));
return hr;
}
static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc2(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC2 *desc)
{
FIXME("iface %p, desc %p stub!\n", iface, desc);
struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface);
DXGI_ADAPTER_DESC3 desc3;
HRESULT hr;
return E_NOTIMPL;
TRACE("iface %p, desc %p.\n", iface, desc);
if (!desc)
return E_INVALIDARG;
if (SUCCEEDED(hr = dxgi_adapter_get_desc(adapter, &desc3)))
memcpy(desc, &desc3, sizeof(*desc));
return hr;
}
static HRESULT STDMETHODCALLTYPE dxgi_adapter_RegisterHardwareContentProtectionTeardownStatusEvent(
@ -304,9 +328,14 @@ static void STDMETHODCALLTYPE dxgi_adapter_UnregisterVideoMemoryBudgetChangeNoti
static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc3(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC3 *desc)
{
FIXME("iface %p, desc %p stub!\n", iface, desc);
struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface);
return E_NOTIMPL;
TRACE("iface %p, desc %p.\n", iface, desc);
if (!desc)
return E_INVALIDARG;
return dxgi_adapter_get_desc(adapter, desc);
}
static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl =