Commit 33e51af1 authored by Joshua Ashton's avatar Joshua Ashton 🐸

[d3d9] Handle ResetEx nuance

parent aa8d4979
This diff is collapsed.
......@@ -104,13 +104,14 @@ namespace dxvk {
public:
D3D9DeviceEx(
D3D9InterfaceEx* pParent,
D3D9Adapter* pAdapter,
D3DDEVTYPE DeviceType,
HWND hFocusWindow,
DWORD BehaviorFlags,
D3DDISPLAYMODEEX* pDisplayMode,
Rc<DxvkDevice> dxvkDevice);
D3D9InterfaceEx* pParent,
D3D9Adapter* pAdapter,
D3DDEVTYPE DeviceType,
HWND hFocusWindow,
DWORD BehaviorFlags,
D3DPRESENT_PARAMETERS* pPresentationParameters,
D3DDISPLAYMODEEX* pDisplayMode,
Rc<DxvkDevice> dxvkDevice);
~D3D9DeviceEx();
......@@ -854,6 +855,11 @@ namespace dxvk {
const D3D9ConstantLayout& GetVertexConstantLayout() { return m_vsLayout; }
const D3D9ConstantLayout& GetPixelConstantLayout() { return m_psLayout; }
HRESULT ResetState(D3DPRESENT_PARAMETERS* pPresentationParameters);
HRESULT ResetSwapChain(D3DPRESENT_PARAMETERS* pPresentationParameters, D3DDISPLAYMODEEX* pFullscreenDisplayMode);
HRESULT InitialReset(D3DPRESENT_PARAMETERS* pPresentationParameters, D3DDISPLAYMODEEX* pFullscreenDisplayMode);
private:
D3D9DeviceFlags m_flags;
......
......@@ -291,17 +291,10 @@ namespace dxvk {
DeviceType,
hFocusWindow,
BehaviorFlags,
pPresentationParameters,
pFullscreenDisplayMode,
dxvkDevice));
HRESULT hr = (*ppReturnedDeviceInterface)->Reset(pPresentationParameters);
if (FAILED(hr)) {
Logger::warn("D3D9InterfaceEx::CreateDeviceEx: device initial reset failed.");
*ppReturnedDeviceInterface = nullptr;
return hr;
}
return D3D_OK;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment