ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d8: Store a struct d3d8 in struct d3d8_device. 

So that d3d_parent->wined3d_outputs can be directly accessed in device.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zhiyi Zhang 2020-05-12 20:49:16 +08:00 committed by Alexandre Julliard
parent f904e9af1b
commit 97fce0b3af
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d3d8/d3d8_private.h
View File

@ -115,7 +115,7 @@ struct d3d8_device
LONG ref; LONG ref;
struct wined3d_device *wined3d_device; struct wined3d_device *wined3d_device;
unsigned int adapter_ordinal; unsigned int adapter_ordinal;
IDirect3D8 *d3d_parent; struct d3d8 *d3d_parent;
struct d3d8_handle_table handle_table; struct d3d8_handle_table handle_table;
/* FVF management */ /* FVF management */

13
dlls/d3d8/device.c
View File

@ -609,7 +609,7 @@ static ULONG WINAPI d3d8_device_Release(IDirect3DDevice8 *iface)
if (!ref) if (!ref)
{ {
IDirect3D8 *parent = device->d3d_parent; IDirect3D8 *parent = &device->d3d_parent->IDirect3D8_iface;
unsigned i; unsigned i;
TRACE("Releasing wined3d device %p.\n", device->wined3d_device); TRACE("Releasing wined3d device %p.\n", device->wined3d_device);
@ -705,7 +705,8 @@ static HRESULT WINAPI d3d8_device_GetDirect3D(IDirect3DDevice8 *iface, IDirect3D
if (!d3d8) if (!d3d8)
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
return IDirect3D8_QueryInterface(device->d3d_parent, &IID_IDirect3D8, (void **)d3d8); return IDirect3D8_QueryInterface(&device->d3d_parent->IDirect3D8_iface, &IID_IDirect3D8,
(void **)d3d8);
} }
static HRESULT WINAPI d3d8_device_GetDeviceCaps(IDirect3DDevice8 *iface, D3DCAPS8 *caps) static HRESULT WINAPI d3d8_device_GetDeviceCaps(IDirect3DDevice8 *iface, D3DCAPS8 *caps)
@ -791,8 +792,8 @@ static HRESULT WINAPI d3d8_device_SetCursorProperties(IDirect3DDevice8 *iface,
return hr; return hr;
} }
if (FAILED(hr = IDirect3D8_GetAdapterDisplayMode(device->d3d_parent, device->adapter_ordinal, if (FAILED(hr = IDirect3D8_GetAdapterDisplayMode(&device->d3d_parent->IDirect3D8_iface,
&mode))) device->adapter_ordinal, &mode)))
{ {
WARN("Failed to get device display mode, hr %#x.\n", hr); WARN("Failed to get device display mode, hr %#x.\n", hr);
return hr; return hr;
@ -3835,8 +3836,8 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine
device->implicit_swapchain = wined3d_swapchain; device->implicit_swapchain = wined3d_swapchain;
device->d3d_parent = &parent->IDirect3D8_iface; device->d3d_parent = parent;
IDirect3D8_AddRef(device->d3d_parent); IDirect3D8_AddRef(&parent->IDirect3D8_iface);
return D3D_OK; return D3D_OK;