[PATCH 3/5] ddraw: Get rid of IDirect3DDeviceImpl.
Henri Verbeet
hverbeet at codeweavers.com
Mon Apr 9 13:43:40 CDT 2012
---
dlls/ddraw/ddraw.c | 6 +-
dlls/ddraw/ddraw_private.h | 45 +-
dlls/ddraw/device.c | 3231 +++++++++++++++++++-------------------------
dlls/ddraw/executebuffer.c | 38 +-
dlls/ddraw/light.c | 6 +-
dlls/ddraw/material.c | 6 +-
dlls/ddraw/surface.c | 12 +-
dlls/ddraw/vertexbuffer.c | 6 +-
dlls/ddraw/viewport.c | 2 +-
9 files changed, 1471 insertions(+), 1881 deletions(-)
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index a777d35..daf614e 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -4431,7 +4431,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid,
{
struct ddraw_surface *target = unsafe_impl_from_IDirectDrawSurface7(surface);
struct ddraw *ddraw = impl_from_IDirect3D7(iface);
- IDirect3DDeviceImpl *object;
+ struct d3d_device *object;
HRESULT hr;
TRACE("iface %p, riid %s, surface %p, device %p.\n", iface, debugstr_guid(riid), surface, device);
@@ -4455,7 +4455,7 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid,
{
struct ddraw_surface *surface_impl = unsafe_impl_from_IDirectDrawSurface4(surface);
struct ddraw *ddraw = impl_from_IDirect3D3(iface);
- IDirect3DDeviceImpl *device_impl;
+ struct d3d_device *device_impl;
HRESULT hr;
TRACE("iface %p, riid %s, surface %p, device %p, outer_unknown %p.\n",
@@ -4483,7 +4483,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid,
{
struct ddraw_surface *surface_impl = unsafe_impl_from_IDirectDrawSurface(surface);
struct ddraw *ddraw = impl_from_IDirect3D2(iface);
- IDirect3DDeviceImpl *device_impl;
+ struct d3d_device *device_impl;
HRESULT hr;
TRACE("iface %p, riid %s, surface %p, device %p.\n",
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index 3509f58..f1b78c0 100644
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -40,7 +40,6 @@
extern const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops DECLSPEC_HIDDEN;
/* Typdef the interfaces */
-typedef struct IDirect3DDeviceImpl IDirect3DDeviceImpl;
typedef struct IDirect3DExecuteBufferImpl IDirect3DExecuteBufferImpl;
typedef struct IDirect3DVertexBufferImpl IDirect3DVertexBufferImpl;
@@ -90,7 +89,7 @@ struct ddraw
/* D3D things */
HWND d3d_window;
- IDirect3DDeviceImpl *d3ddevice;
+ struct d3d_device *d3ddevice;
int d3dversion;
/* Various HWNDs */
@@ -159,7 +158,7 @@ struct ddraw_surface
struct ddraw *ddraw;
struct wined3d_surface *wined3d_surface;
struct wined3d_texture *wined3d_texture;
- IDirect3DDeviceImpl *device1;
+ struct d3d_device *device1;
/* This implementation handles attaching surfaces to other surfaces */
struct ddraw_surface *next_attached;
@@ -272,7 +271,7 @@ DWORD ddraw_allocate_handle(struct ddraw_handle_table *t, void *object, enum ddr
void *ddraw_free_handle(struct ddraw_handle_table *t, DWORD handle, enum ddraw_handle_type type) DECLSPEC_HIDDEN;
void *ddraw_get_object(struct ddraw_handle_table *t, DWORD handle, enum ddraw_handle_type type) DECLSPEC_HIDDEN;
-struct IDirect3DDeviceImpl
+struct d3d_device
{
/* IUnknown */
IDirect3DDevice7 IDirect3DDevice7_iface;
@@ -318,7 +317,8 @@ struct IDirect3DDeviceImpl
};
HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target,
- UINT version, IDirect3DDeviceImpl **device, IUnknown *outer_unknown) DECLSPEC_HIDDEN;
+ UINT version, struct d3d_device **device, IUnknown *outer_unknown) DECLSPEC_HIDDEN;
+enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device *device) DECLSPEC_HIDDEN;
/* The IID */
extern const GUID IID_D3DDEVICE_WineD3D DECLSPEC_HIDDEN;
@@ -326,32 +326,31 @@ extern const GUID IID_D3DDEVICE_WineD3D DECLSPEC_HIDDEN;
/* Helper functions */
HRESULT IDirect3DImpl_GetCaps(const struct wined3d *wined3d,
D3DDEVICEDESC *Desc123, D3DDEVICEDESC7 *Desc7) DECLSPEC_HIDDEN;
-enum wined3d_depth_buffer_type IDirect3DDeviceImpl_UpdateDepthStencil(IDirect3DDeviceImpl *device) DECLSPEC_HIDDEN;
-static inline IDirect3DDeviceImpl *impl_from_IDirect3DDevice(IDirect3DDevice *iface)
+static inline struct d3d_device *impl_from_IDirect3DDevice(IDirect3DDevice *iface)
{
- return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice_iface);
+ return CONTAINING_RECORD(iface, struct d3d_device, IDirect3DDevice_iface);
}
-static inline IDirect3DDeviceImpl *impl_from_IDirect3DDevice2(IDirect3DDevice2 *iface)
+static inline struct d3d_device *impl_from_IDirect3DDevice2(IDirect3DDevice2 *iface)
{
- return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice2_iface);
+ return CONTAINING_RECORD(iface, struct d3d_device, IDirect3DDevice2_iface);
}
-static inline IDirect3DDeviceImpl *impl_from_IDirect3DDevice3(IDirect3DDevice3 *iface)
+static inline struct d3d_device *impl_from_IDirect3DDevice3(IDirect3DDevice3 *iface)
{
- return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice3_iface);
+ return CONTAINING_RECORD(iface, struct d3d_device, IDirect3DDevice3_iface);
}
-static inline IDirect3DDeviceImpl *impl_from_IDirect3DDevice7(IDirect3DDevice7 *iface)
+static inline struct d3d_device *impl_from_IDirect3DDevice7(IDirect3DDevice7 *iface)
{
- return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice7_iface);
+ return CONTAINING_RECORD(iface, struct d3d_device, IDirect3DDevice7_iface);
}
-IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface) DECLSPEC_HIDDEN;
-IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice2(IDirect3DDevice2 *iface) DECLSPEC_HIDDEN;
-IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice3(IDirect3DDevice3 *iface) DECLSPEC_HIDDEN;
-IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice7(IDirect3DDevice7 *iface) DECLSPEC_HIDDEN;
+struct d3d_device *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface) DECLSPEC_HIDDEN;
+struct d3d_device *unsafe_impl_from_IDirect3DDevice2(IDirect3DDevice2 *iface) DECLSPEC_HIDDEN;
+struct d3d_device *unsafe_impl_from_IDirect3DDevice3(IDirect3DDevice3 *iface) DECLSPEC_HIDDEN;
+struct d3d_device *unsafe_impl_from_IDirect3DDevice7(IDirect3DDevice7 *iface) DECLSPEC_HIDDEN;
struct ddraw_clipper
{
@@ -438,7 +437,7 @@ struct d3d_material
/* IDirect3DMaterial2 fields */
struct ddraw *ddraw;
- IDirect3DDeviceImpl *active_device;
+ struct d3d_device *active_device;
D3DMATERIAL mat;
DWORD Handle;
@@ -460,7 +459,7 @@ struct d3d_viewport
struct ddraw *ddraw;
/* If this viewport is active for one device, put the device here */
- IDirect3DDeviceImpl *active_device;
+ struct d3d_device *active_device;
DWORD num_lights;
DWORD map_lights;
@@ -495,7 +494,7 @@ struct IDirect3DExecuteBufferImpl
LONG ref;
/* IDirect3DExecuteBuffer fields */
struct ddraw *ddraw;
- IDirect3DDeviceImpl *d3ddev;
+ struct d3d_device *d3ddev;
D3DEXECUTEBUFFERDESC desc;
D3DEXECUTEDATA data;
@@ -512,12 +511,12 @@ struct IDirect3DExecuteBufferImpl
};
HRESULT d3d_execute_buffer_init(IDirect3DExecuteBufferImpl *execute_buffer,
- IDirect3DDeviceImpl *device, D3DEXECUTEBUFFERDESC *desc) DECLSPEC_HIDDEN;
+ struct d3d_device *device, D3DEXECUTEBUFFERDESC *desc) DECLSPEC_HIDDEN;
IDirect3DExecuteBufferImpl *unsafe_impl_from_IDirect3DExecuteBuffer(IDirect3DExecuteBuffer *iface) DECLSPEC_HIDDEN;
/* The execute function */
HRESULT d3d_execute_buffer_execute(IDirect3DExecuteBufferImpl *execute_buffer,
- IDirect3DDeviceImpl *device, struct d3d_viewport *viewport) DECLSPEC_HIDDEN;
+ struct d3d_device *device, struct d3d_viewport *viewport) DECLSPEC_HIDDEN;
/*****************************************************************************
* IDirect3DVertexBuffer
diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index 89404ee..464e905 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -75,14 +75,14 @@ static inline WORD d3d_fpu_setup(void)
return oldcw;
}
-static inline IDirect3DDeviceImpl *impl_from_IUnknown(IUnknown *iface)
+static inline struct d3d_device *impl_from_IUnknown(IUnknown *iface)
{
- return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IUnknown_inner);
+ return CONTAINING_RECORD(iface, struct d3d_device, IUnknown_inner);
}
static HRESULT WINAPI d3d_device_inner_QueryInterface(IUnknown *iface, REFIID riid, void **out)
{
- IDirect3DDeviceImpl *device = impl_from_IUnknown(iface);
+ struct d3d_device *device = impl_from_IUnknown(iface);
TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out);
@@ -138,36 +138,36 @@ static HRESULT WINAPI d3d_device_inner_QueryInterface(IUnknown *iface, REFIID ri
return E_NOINTERFACE;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_7_QueryInterface(IDirect3DDevice7 *iface, REFIID riid, void **out)
+static HRESULT WINAPI d3d_device7_QueryInterface(IDirect3DDevice7 *iface, REFIID riid, void **out)
{
- IDirect3DDeviceImpl *device = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out);
return IUnknown_QueryInterface(device->outer_unknown, riid, out);
}
-static HRESULT WINAPI IDirect3DDeviceImpl_3_QueryInterface(IDirect3DDevice3 *iface, REFIID riid, void **out)
+static HRESULT WINAPI d3d_device3_QueryInterface(IDirect3DDevice3 *iface, REFIID riid, void **out)
{
- IDirect3DDeviceImpl *device = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out);
return IUnknown_QueryInterface(device->outer_unknown, riid, out);
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_QueryInterface(IDirect3DDevice2 *iface, REFIID riid, void **out)
+static HRESULT WINAPI d3d_device2_QueryInterface(IDirect3DDevice2 *iface, REFIID riid, void **out)
{
- IDirect3DDeviceImpl *device = impl_from_IDirect3DDevice2(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out);
return IUnknown_QueryInterface(device->outer_unknown, riid, out);
}
-static HRESULT WINAPI IDirect3DDeviceImpl_1_QueryInterface(IDirect3DDevice *iface, REFIID riid, void **out)
+static HRESULT WINAPI d3d_device1_QueryInterface(IDirect3DDevice *iface, REFIID riid, void **out)
{
- IDirect3DDeviceImpl *device = impl_from_IDirect3DDevice(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice(iface);
TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out);
@@ -176,7 +176,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_QueryInterface(IDirect3DDevice *ifac
static ULONG WINAPI d3d_device_inner_AddRef(IUnknown *iface)
{
- IDirect3DDeviceImpl *device = impl_from_IUnknown(iface);
+ struct d3d_device *device = impl_from_IUnknown(iface);
ULONG ref = InterlockedIncrement(&device->ref);
TRACE("%p increasing refcount to %u.\n", device, ref);
@@ -184,36 +184,36 @@ static ULONG WINAPI d3d_device_inner_AddRef(IUnknown *iface)
return ref;
}
-static ULONG WINAPI IDirect3DDeviceImpl_7_AddRef(IDirect3DDevice7 *iface)
+static ULONG WINAPI d3d_device7_AddRef(IDirect3DDevice7 *iface)
{
- IDirect3DDeviceImpl *device = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
TRACE("iface %p.\n", iface);
return IUnknown_AddRef(device->outer_unknown);
}
-static ULONG WINAPI IDirect3DDeviceImpl_3_AddRef(IDirect3DDevice3 *iface)
+static ULONG WINAPI d3d_device3_AddRef(IDirect3DDevice3 *iface)
{
- IDirect3DDeviceImpl *device = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
TRACE("iface %p.\n", iface);
return IUnknown_AddRef(device->outer_unknown);
}
-static ULONG WINAPI IDirect3DDeviceImpl_2_AddRef(IDirect3DDevice2 *iface)
+static ULONG WINAPI d3d_device2_AddRef(IDirect3DDevice2 *iface)
{
- IDirect3DDeviceImpl *device = impl_from_IDirect3DDevice2(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
TRACE("iface %p.\n", iface);
return IUnknown_AddRef(device->outer_unknown);
}
-static ULONG WINAPI IDirect3DDeviceImpl_1_AddRef(IDirect3DDevice *iface)
+static ULONG WINAPI d3d_device1_AddRef(IDirect3DDevice *iface)
{
- IDirect3DDeviceImpl *device = impl_from_IDirect3DDevice(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice(iface);
TRACE("iface %p.\n", iface);
@@ -222,7 +222,7 @@ static ULONG WINAPI IDirect3DDeviceImpl_1_AddRef(IDirect3DDevice *iface)
static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface)
{
- IDirect3DDeviceImpl *This = impl_from_IUnknown(iface);
+ struct d3d_device *This = impl_from_IUnknown(iface);
ULONG ref = InterlockedDecrement(&This->ref);
TRACE("%p decreasing refcount to %u.\n", This, ref);
@@ -319,36 +319,36 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface)
return ref;
}
-static ULONG WINAPI IDirect3DDeviceImpl_7_Release(IDirect3DDevice7 *iface)
+static ULONG WINAPI d3d_device7_Release(IDirect3DDevice7 *iface)
{
- IDirect3DDeviceImpl *device = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
TRACE("iface %p.\n", iface);
return IUnknown_Release(device->outer_unknown);
}
-static ULONG WINAPI IDirect3DDeviceImpl_3_Release(IDirect3DDevice3 *iface)
+static ULONG WINAPI d3d_device3_Release(IDirect3DDevice3 *iface)
{
- IDirect3DDeviceImpl *device = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
TRACE("iface %p.\n", iface);
return IUnknown_Release(device->outer_unknown);
}
-static ULONG WINAPI IDirect3DDeviceImpl_2_Release(IDirect3DDevice2 *iface)
+static ULONG WINAPI d3d_device2_Release(IDirect3DDevice2 *iface)
{
- IDirect3DDeviceImpl *device = impl_from_IDirect3DDevice2(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
TRACE("iface %p.\n", iface);
return IUnknown_Release(device->outer_unknown);
}
-static ULONG WINAPI IDirect3DDeviceImpl_1_Release(IDirect3DDevice *iface)
+static ULONG WINAPI d3d_device1_Release(IDirect3DDevice *iface)
{
- IDirect3DDeviceImpl *device = impl_from_IDirect3DDevice(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice(iface);
TRACE("iface %p.\n", iface);
@@ -373,15 +373,13 @@ static ULONG WINAPI IDirect3DDeviceImpl_1_Release(IDirect3DDevice *iface)
* Returns: DD_OK
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_1_Initialize(IDirect3DDevice *iface,
- IDirect3D *Direct3D, GUID *guid,
- D3DDEVICEDESC *Desc)
+static HRESULT WINAPI d3d_device1_Initialize(IDirect3DDevice *iface,
+ IDirect3D *d3d, GUID *guid, D3DDEVICEDESC *device_desc)
{
/* It shouldn't be crucial, but print a FIXME, I'm interested if
* any game calls it and when. */
FIXME("iface %p, d3d %p, guid %s, device_desc %p nop!\n",
- iface, Direct3D, debugstr_guid(guid), Desc);
+ iface, d3d, debugstr_guid(guid), device_desc);
return D3D_OK;
}
@@ -402,11 +400,9 @@ IDirect3DDeviceImpl_1_Initialize(IDirect3DDevice *iface,
* D3DERR_* if a problem occurs. See WineD3D
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_GetCaps(IDirect3DDevice7 *iface,
- D3DDEVICEDESC7 *Desc)
+static HRESULT d3d_device7_GetCaps(IDirect3DDevice7 *iface, D3DDEVICEDESC7 *Desc)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
D3DDEVICEDESC OldDesc;
TRACE("iface %p, device_desc %p.\n", iface, Desc);
@@ -418,25 +414,21 @@ IDirect3DDeviceImpl_7_GetCaps(IDirect3DDevice7 *iface,
}
/* Call the same function used by IDirect3D, this saves code */
- return IDirect3DImpl_GetCaps(This->ddraw->wined3d, &OldDesc, Desc);
+ return IDirect3DImpl_GetCaps(device->ddraw->wined3d, &OldDesc, Desc);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_GetCaps_FPUSetup(IDirect3DDevice7 *iface,
- D3DDEVICEDESC7 *Desc)
+static HRESULT WINAPI d3d_device7_GetCaps_FPUSetup(IDirect3DDevice7 *iface, D3DDEVICEDESC7 *desc)
{
- return IDirect3DDeviceImpl_7_GetCaps(iface, Desc);
+ return d3d_device7_GetCaps(iface, desc);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_GetCaps_FPUPreserve(IDirect3DDevice7 *iface,
- D3DDEVICEDESC7 *Desc)
+static HRESULT WINAPI d3d_device7_GetCaps_FPUPreserve(IDirect3DDevice7 *iface, D3DDEVICEDESC7 *desc)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_GetCaps(iface, Desc);
+ hr = d3d_device7_GetCaps(iface, desc);
set_fpu_control_word(old_fpucw);
return hr;
@@ -480,12 +472,10 @@ static inline BOOL check_d3ddevicedesc_size(DWORD size)
return FALSE;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_3_GetCaps(IDirect3DDevice3 *iface,
- D3DDEVICEDESC *HWDesc,
- D3DDEVICEDESC *HelDesc)
+static HRESULT WINAPI d3d_device3_GetCaps(IDirect3DDevice3 *iface,
+ D3DDEVICEDESC *HWDesc, D3DDEVICEDESC *HelDesc)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
D3DDEVICEDESC oldDesc;
D3DDEVICEDESC7 newDesc;
HRESULT hr;
@@ -513,28 +503,33 @@ IDirect3DDeviceImpl_3_GetCaps(IDirect3DDevice3 *iface,
return DDERR_INVALIDPARAMS;
}
- hr = IDirect3DImpl_GetCaps(This->ddraw->wined3d, &oldDesc, &newDesc);
- if(hr != D3D_OK) return hr;
+ hr = IDirect3DImpl_GetCaps(device->ddraw->wined3d, &oldDesc, &newDesc);
+ if (hr != D3D_OK)
+ return hr;
DD_STRUCT_COPY_BYSIZE(HWDesc, &oldDesc);
DD_STRUCT_COPY_BYSIZE(HelDesc, &oldDesc);
return D3D_OK;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_GetCaps(IDirect3DDevice2 *iface,
- D3DDEVICEDESC *D3DHWDevDesc, D3DDEVICEDESC *D3DHELDevDesc)
+static HRESULT WINAPI d3d_device2_GetCaps(IDirect3DDevice2 *iface,
+ D3DDEVICEDESC *hw_desc, D3DDEVICEDESC *hel_desc)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
- TRACE("iface %p, hw_desc %p, hel_desc %p.\n", iface, D3DHWDevDesc, D3DHELDevDesc);
- return IDirect3DDevice3_GetCaps(&This->IDirect3DDevice3_iface, D3DHWDevDesc, D3DHELDevDesc);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
+
+ TRACE("iface %p, hw_desc %p, hel_desc %p.\n", iface, hw_desc, hel_desc);
+
+ return d3d_device3_GetCaps(&device->IDirect3DDevice3_iface, hw_desc, hel_desc);
}
-static HRESULT WINAPI IDirect3DDeviceImpl_1_GetCaps(IDirect3DDevice *iface,
- D3DDEVICEDESC *D3DHWDevDesc, D3DDEVICEDESC *D3DHELDevDesc)
+static HRESULT WINAPI d3d_device1_GetCaps(IDirect3DDevice *iface,
+ D3DDEVICEDESC *hw_desc, D3DDEVICEDESC *hel_desc)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice(iface);
- TRACE("iface %p, hw_desc %p, hel_desc %p.\n", iface, D3DHWDevDesc, D3DHELDevDesc);
- return IDirect3DDevice3_GetCaps(&This->IDirect3DDevice3_iface, D3DHWDevDesc, D3DHELDevDesc);
+ struct d3d_device *device = impl_from_IDirect3DDevice(iface);
+
+ TRACE("iface %p, hw_desc %p, hel_desc %p.\n", iface, hw_desc, hel_desc);
+
+ return d3d_device3_GetCaps(&device->IDirect3DDevice3_iface, hw_desc, hel_desc);
}
/*****************************************************************************
@@ -549,24 +544,22 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_GetCaps(IDirect3DDevice *iface,
* D3D_OK
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_2_SwapTextureHandles(IDirect3DDevice2 *iface,
- IDirect3DTexture2 *Tex1,
- IDirect3DTexture2 *Tex2)
-{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
- struct ddraw_surface *surf1 = unsafe_impl_from_IDirect3DTexture2(Tex1);
- struct ddraw_surface *surf2 = unsafe_impl_from_IDirect3DTexture2(Tex2);
+static HRESULT WINAPI d3d_device2_SwapTextureHandles(IDirect3DDevice2 *iface,
+ IDirect3DTexture2 *tex1, IDirect3DTexture2 *tex2)
+{
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
+ struct ddraw_surface *surf1 = unsafe_impl_from_IDirect3DTexture2(tex1);
+ struct ddraw_surface *surf2 = unsafe_impl_from_IDirect3DTexture2(tex2);
DWORD h1, h2;
- TRACE("iface %p, tex1 %p, tex2 %p.\n", iface, Tex1, Tex2);
+ TRACE("iface %p, tex1 %p, tex2 %p.\n", iface, tex1, tex2);
wined3d_mutex_lock();
h1 = surf1->Handle - 1;
h2 = surf2->Handle - 1;
- This->handle_table.entries[h1].object = surf2;
- This->handle_table.entries[h2].object = surf1;
+ device->handle_table.entries[h1].object = surf2;
+ device->handle_table.entries[h2].object = surf1;
surf2->Handle = h1 + 1;
surf1->Handle = h2 + 1;
@@ -575,18 +568,18 @@ IDirect3DDeviceImpl_2_SwapTextureHandles(IDirect3DDevice2 *iface,
return D3D_OK;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_1_SwapTextureHandles(IDirect3DDevice *iface,
- IDirect3DTexture *D3DTex1, IDirect3DTexture *D3DTex2)
+static HRESULT WINAPI d3d_device1_SwapTextureHandles(IDirect3DDevice *iface,
+ IDirect3DTexture *tex1, IDirect3DTexture *tex2)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice(iface);
- struct ddraw_surface *surf1 = unsafe_impl_from_IDirect3DTexture(D3DTex1);
- struct ddraw_surface *surf2 = unsafe_impl_from_IDirect3DTexture(D3DTex2);
+ struct d3d_device *device = impl_from_IDirect3DDevice(iface);
+ struct ddraw_surface *surf1 = unsafe_impl_from_IDirect3DTexture(tex1);
+ struct ddraw_surface *surf2 = unsafe_impl_from_IDirect3DTexture(tex2);
IDirect3DTexture2 *t1 = surf1 ? &surf1->IDirect3DTexture2_iface : NULL;
IDirect3DTexture2 *t2 = surf2 ? &surf2->IDirect3DTexture2_iface : NULL;
- TRACE("iface %p, tex1 %p, tex2 %p.\n", iface, D3DTex1, D3DTex2);
+ TRACE("iface %p, tex1 %p, tex2 %p.\n", iface, tex1, tex2);
- return IDirect3DDevice2_SwapTextureHandles(&This->IDirect3DDevice2_iface, t1, t2);
+ return d3d_device2_SwapTextureHandles(&device->IDirect3DDevice2_iface, t1, t2);
}
/*****************************************************************************
@@ -607,9 +600,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_SwapTextureHandles(IDirect3DDevice *
* DDERR_INVALIDPARAMS if Stats == NULL
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_3_GetStats(IDirect3DDevice3 *iface,
- D3DSTATS *Stats)
+static HRESULT WINAPI d3d_device3_GetStats(IDirect3DDevice3 *iface, D3DSTATS *Stats)
{
FIXME("iface %p, stats %p stub!\n", iface, Stats);
@@ -626,22 +617,22 @@ IDirect3DDeviceImpl_3_GetStats(IDirect3DDevice3 *iface,
return D3D_OK;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_GetStats(IDirect3DDevice2 *iface, D3DSTATS *Stats)
+static HRESULT WINAPI d3d_device2_GetStats(IDirect3DDevice2 *iface, D3DSTATS *stats)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
- TRACE("iface %p, stats %p.\n", iface, Stats);
+ TRACE("iface %p, stats %p.\n", iface, stats);
- return IDirect3DDevice3_GetStats(&This->IDirect3DDevice3_iface, Stats);
+ return d3d_device3_GetStats(&device->IDirect3DDevice3_iface, stats);
}
-static HRESULT WINAPI IDirect3DDeviceImpl_1_GetStats(IDirect3DDevice *iface, D3DSTATS *Stats)
+static HRESULT WINAPI d3d_device1_GetStats(IDirect3DDevice *iface, D3DSTATS *stats)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice(iface);
- TRACE("iface %p, stats %p.\n", iface, Stats);
+ TRACE("iface %p, stats %p.\n", iface, stats);
- return IDirect3DDevice3_GetStats(&This->IDirect3DDevice3_iface, Stats);
+ return d3d_device3_GetStats(&device->IDirect3DDevice3_iface, stats);
}
/*****************************************************************************
@@ -664,20 +655,17 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_GetStats(IDirect3DDevice *iface, D3D
* D3D_OK on success
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_1_CreateExecuteBuffer(IDirect3DDevice *iface,
- D3DEXECUTEBUFFERDESC *Desc,
- IDirect3DExecuteBuffer **ExecuteBuffer,
- IUnknown *UnkOuter)
+static HRESULT WINAPI d3d_device1_CreateExecuteBuffer(IDirect3DDevice *iface,
+ D3DEXECUTEBUFFERDESC *buffer_desc, IDirect3DExecuteBuffer **ExecuteBuffer, IUnknown *outer_unknown)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice(iface);
IDirect3DExecuteBufferImpl* object;
HRESULT hr;
TRACE("iface %p, buffer_desc %p, buffer %p, outer_unknown %p.\n",
- iface, Desc, ExecuteBuffer, UnkOuter);
+ iface, buffer_desc, ExecuteBuffer, outer_unknown);
- if(UnkOuter)
+ if (outer_unknown)
return CLASS_E_NOAGGREGATION;
/* Allocate the new Execute Buffer */
@@ -688,7 +676,7 @@ IDirect3DDeviceImpl_1_CreateExecuteBuffer(IDirect3DDevice *iface,
return DDERR_OUTOFMEMORY;
}
- hr = d3d_execute_buffer_init(object, This, Desc);
+ hr = d3d_execute_buffer_init(object, device, buffer_desc);
if (FAILED(hr))
{
WARN("Failed to initialize execute buffer, hr %#x.\n", hr);
@@ -718,22 +706,22 @@ IDirect3DDeviceImpl_1_CreateExecuteBuffer(IDirect3DDevice *iface,
* D3D_OK on success
*
*****************************************************************************/
-static HRESULT WINAPI IDirect3DDeviceImpl_1_Execute(IDirect3DDevice *iface,
- IDirect3DExecuteBuffer *ExecuteBuffer, IDirect3DViewport *Viewport, DWORD Flags)
+static HRESULT WINAPI d3d_device1_Execute(IDirect3DDevice *iface,
+ IDirect3DExecuteBuffer *ExecuteBuffer, IDirect3DViewport *viewport, DWORD flags)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice(iface);
IDirect3DExecuteBufferImpl *buffer = unsafe_impl_from_IDirect3DExecuteBuffer(ExecuteBuffer);
- struct d3d_viewport *viewport_impl = unsafe_impl_from_IDirect3DViewport(Viewport);
+ struct d3d_viewport *viewport_impl = unsafe_impl_from_IDirect3DViewport(viewport);
HRESULT hr;
- TRACE("iface %p, buffer %p, viewport %p, flags %#x.\n", iface, ExecuteBuffer, Viewport, Flags);
+ TRACE("iface %p, buffer %p, viewport %p, flags %#x.\n", iface, ExecuteBuffer, viewport, flags);
if(!buffer)
return DDERR_INVALIDPARAMS;
/* Execute... */
wined3d_mutex_lock();
- hr = d3d_execute_buffer_execute(buffer, This, viewport_impl);
+ hr = d3d_execute_buffer_execute(buffer, device, viewport_impl);
wined3d_mutex_unlock();
return hr;
@@ -756,48 +744,45 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_Execute(IDirect3DDevice *iface,
* D3D_OK on success
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_3_AddViewport(IDirect3DDevice3 *iface,
- IDirect3DViewport3 *Viewport)
+static HRESULT WINAPI d3d_device3_AddViewport(IDirect3DDevice3 *iface, IDirect3DViewport3 *viewport)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
- struct d3d_viewport *vp = unsafe_impl_from_IDirect3DViewport3(Viewport);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
+ struct d3d_viewport *vp = unsafe_impl_from_IDirect3DViewport3(viewport);
- TRACE("iface %p, viewport %p.\n", iface, Viewport);
+ TRACE("iface %p, viewport %p.\n", iface, viewport);
/* Sanity check */
if(!vp)
return DDERR_INVALIDPARAMS;
wined3d_mutex_lock();
- list_add_head(&This->viewport_list, &vp->entry);
- vp->active_device = This; /* Viewport must be usable for Clear() after AddViewport,
- so set active_device here. */
+ list_add_head(&device->viewport_list, &vp->entry);
+ /* Viewport must be usable for Clear() after AddViewport, so set active_device here. */
+ vp->active_device = device;
wined3d_mutex_unlock();
return D3D_OK;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_AddViewport(IDirect3DDevice2 *iface,
- IDirect3DViewport2 *Direct3DViewport2)
+static HRESULT WINAPI d3d_device2_AddViewport(IDirect3DDevice2 *iface,
+ IDirect3DViewport2 *viewport)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
- struct d3d_viewport *vp = unsafe_impl_from_IDirect3DViewport2(Direct3DViewport2);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
+ struct d3d_viewport *vp = unsafe_impl_from_IDirect3DViewport2(viewport);
- TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport2);
+ TRACE("iface %p, viewport %p.\n", iface, viewport);
- return IDirect3DDevice3_AddViewport(&This->IDirect3DDevice3_iface, &vp->IDirect3DViewport3_iface);
+ return d3d_device3_AddViewport(&device->IDirect3DDevice3_iface, &vp->IDirect3DViewport3_iface);
}
-static HRESULT WINAPI IDirect3DDeviceImpl_1_AddViewport(IDirect3DDevice *iface,
- IDirect3DViewport *Direct3DViewport)
+static HRESULT WINAPI d3d_device1_AddViewport(IDirect3DDevice *iface, IDirect3DViewport *viewport)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice(iface);
- struct d3d_viewport *vp = unsafe_impl_from_IDirect3DViewport(Direct3DViewport);
+ struct d3d_device *device = impl_from_IDirect3DDevice(iface);
+ struct d3d_viewport *vp = unsafe_impl_from_IDirect3DViewport(viewport);
- TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport);
+ TRACE("iface %p, viewport %p.\n", iface, viewport);
- return IDirect3DDevice3_AddViewport(&This->IDirect3DDevice3_iface, &vp->IDirect3DViewport3_iface);
+ return d3d_device3_AddViewport(&device->IDirect3DDevice3_iface, &vp->IDirect3DViewport3_iface);
}
/*****************************************************************************
@@ -816,16 +801,16 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_AddViewport(IDirect3DDevice *iface,
* DDERR_INVALIDPARAMS if the viewport wasn't found in the list
*
*****************************************************************************/
-static HRESULT WINAPI IDirect3DDeviceImpl_3_DeleteViewport(IDirect3DDevice3 *iface, IDirect3DViewport3 *viewport)
+static HRESULT WINAPI d3d_device3_DeleteViewport(IDirect3DDevice3 *iface, IDirect3DViewport3 *viewport)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
struct d3d_viewport *vp = unsafe_impl_from_IDirect3DViewport3(viewport);
TRACE("iface %p, viewport %p.\n", iface, viewport);
wined3d_mutex_lock();
- if (vp->active_device != This)
+ if (vp->active_device != device)
{
WARN("Viewport %p active device is %p.\n", vp, vp->active_device);
wined3d_mutex_unlock();
@@ -840,26 +825,24 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_DeleteViewport(IDirect3DDevice3 *ifa
return D3D_OK;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_DeleteViewport(IDirect3DDevice2 *iface,
- IDirect3DViewport2 *Direct3DViewport2)
+static HRESULT WINAPI d3d_device2_DeleteViewport(IDirect3DDevice2 *iface, IDirect3DViewport2 *viewport)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
- struct d3d_viewport *vp = unsafe_impl_from_IDirect3DViewport2(Direct3DViewport2);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
+ struct d3d_viewport *vp = unsafe_impl_from_IDirect3DViewport2(viewport);
- TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport2);
+ TRACE("iface %p, viewport %p.\n", iface, viewport);
- return IDirect3DDevice3_DeleteViewport(&This->IDirect3DDevice3_iface, &vp->IDirect3DViewport3_iface);
+ return d3d_device3_DeleteViewport(&device->IDirect3DDevice3_iface, &vp->IDirect3DViewport3_iface);
}
-static HRESULT WINAPI IDirect3DDeviceImpl_1_DeleteViewport(IDirect3DDevice *iface,
- IDirect3DViewport *Direct3DViewport)
+static HRESULT WINAPI d3d_device1_DeleteViewport(IDirect3DDevice *iface, IDirect3DViewport *viewport)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice(iface);
- struct d3d_viewport *vp = unsafe_impl_from_IDirect3DViewport(Direct3DViewport);
+ struct d3d_device *device = impl_from_IDirect3DDevice(iface);
+ struct d3d_viewport *vp = unsafe_impl_from_IDirect3DViewport(viewport);
- TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport);
+ TRACE("iface %p, viewport %p.\n", iface, viewport);
- return IDirect3DDevice3_DeleteViewport(&This->IDirect3DDevice3_iface, &vp->IDirect3DViewport3_iface);
+ return d3d_device3_DeleteViewport(&device->IDirect3DDevice3_iface, &vp->IDirect3DViewport3_iface);
}
/*****************************************************************************
@@ -880,19 +863,16 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_DeleteViewport(IDirect3DDevice *ifac
* DDERR_INVALIDPARAMS if the flags were wrong, or Viewport was NULL
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_3_NextViewport(IDirect3DDevice3 *iface,
- IDirect3DViewport3 *Viewport3,
- IDirect3DViewport3 **lplpDirect3DViewport3,
- DWORD Flags)
+static HRESULT WINAPI d3d_device3_NextViewport(IDirect3DDevice3 *iface,
+ IDirect3DViewport3 *Viewport3, IDirect3DViewport3 **lplpDirect3DViewport3, DWORD flags)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *This = impl_from_IDirect3DDevice3(iface);
struct d3d_viewport *vp = unsafe_impl_from_IDirect3DViewport3(Viewport3);
struct d3d_viewport *next;
struct list *entry;
TRACE("iface %p, viewport %p, next %p, flags %#x.\n",
- iface, Viewport3, lplpDirect3DViewport3, Flags);
+ iface, Viewport3, lplpDirect3DViewport3, flags);
if(!vp)
{
@@ -902,7 +882,7 @@ IDirect3DDeviceImpl_3_NextViewport(IDirect3DDevice3 *iface,
wined3d_mutex_lock();
- switch (Flags)
+ switch (flags)
{
case D3DNEXT_NEXT:
entry = list_next(&This->viewport_list, &vp->entry);
@@ -917,7 +897,7 @@ IDirect3DDeviceImpl_3_NextViewport(IDirect3DDevice3 *iface,
break;
default:
- WARN("Invalid flags %#x.\n", Flags);
+ WARN("Invalid flags %#x.\n", flags);
*lplpDirect3DViewport3 = NULL;
wined3d_mutex_unlock();
return DDERR_INVALIDPARAMS;
@@ -936,37 +916,37 @@ IDirect3DDeviceImpl_3_NextViewport(IDirect3DDevice3 *iface,
return D3D_OK;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_NextViewport(IDirect3DDevice2 *iface,
- IDirect3DViewport2 *Viewport2, IDirect3DViewport2 **lplpDirect3DViewport2, DWORD Flags)
+static HRESULT WINAPI d3d_device2_NextViewport(IDirect3DDevice2 *iface,
+ IDirect3DViewport2 *viewport, IDirect3DViewport2 **next, DWORD flags)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
- struct d3d_viewport *vp = unsafe_impl_from_IDirect3DViewport2(Viewport2);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
+ struct d3d_viewport *vp = unsafe_impl_from_IDirect3DViewport2(viewport);
IDirect3DViewport3 *res;
HRESULT hr;
TRACE("iface %p, viewport %p, next %p, flags %#x.\n",
- iface, Viewport2, lplpDirect3DViewport2, Flags);
+ iface, viewport, next, flags);
- hr = IDirect3DDevice3_NextViewport(&This->IDirect3DDevice3_iface,
- &vp->IDirect3DViewport3_iface, &res, Flags);
- *lplpDirect3DViewport2 = (IDirect3DViewport2 *)res;
+ hr = d3d_device3_NextViewport(&device->IDirect3DDevice3_iface,
+ &vp->IDirect3DViewport3_iface, &res, flags);
+ *next = (IDirect3DViewport2 *)res;
return hr;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_1_NextViewport(IDirect3DDevice *iface,
- IDirect3DViewport *Viewport, IDirect3DViewport **lplpDirect3DViewport, DWORD Flags)
+static HRESULT WINAPI d3d_device1_NextViewport(IDirect3DDevice *iface,
+ IDirect3DViewport *viewport, IDirect3DViewport **next, DWORD flags)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice(iface);
- struct d3d_viewport *vp = unsafe_impl_from_IDirect3DViewport(Viewport);
+ struct d3d_device *device = impl_from_IDirect3DDevice(iface);
+ struct d3d_viewport *vp = unsafe_impl_from_IDirect3DViewport(viewport);
IDirect3DViewport3 *res;
HRESULT hr;
TRACE("iface %p, viewport %p, next %p, flags %#x.\n",
- iface, Viewport, lplpDirect3DViewport, Flags);
+ iface, viewport, next, flags);
- hr = IDirect3DDevice3_NextViewport(&This->IDirect3DDevice3_iface,
- &vp->IDirect3DViewport3_iface, &res, Flags);
- *lplpDirect3DViewport = (IDirect3DViewport *)res;
+ hr = d3d_device3_NextViewport(&device->IDirect3DDevice3_iface,
+ &vp->IDirect3DViewport3_iface, &res, flags);
+ *next = (IDirect3DViewport *)res;
return hr;
}
@@ -991,15 +971,11 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_NextViewport(IDirect3DDevice *iface,
* D3D_OK because it's a stub
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_1_Pick(IDirect3DDevice *iface,
- IDirect3DExecuteBuffer *ExecuteBuffer,
- IDirect3DViewport *Viewport,
- DWORD Flags,
- D3DRECT *Rect)
+static HRESULT WINAPI d3d_device1_Pick(IDirect3DDevice *iface, IDirect3DExecuteBuffer *buffer,
+ IDirect3DViewport *viewport, DWORD flags, D3DRECT *rect)
{
FIXME("iface %p, buffer %p, viewport %p, flags %#x, rect %s stub!\n",
- iface, ExecuteBuffer, Viewport, Flags, wine_dbgstr_rect((RECT *)Rect));
+ iface, buffer, viewport, flags, wine_dbgstr_rect((RECT *)rect));
return D3D_OK;
}
@@ -1020,12 +996,10 @@ IDirect3DDeviceImpl_1_Pick(IDirect3DDevice *iface,
* D3D_OK, because it's a stub
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_1_GetPickRecords(IDirect3DDevice *iface,
- DWORD *Count,
- D3DPICKRECORD *D3DPickRec)
+static HRESULT WINAPI d3d_device1_GetPickRecords(IDirect3DDevice *iface,
+ DWORD *count, D3DPICKRECORD *records)
{
- FIXME("iface %p, count %p, records %p stub!\n", iface, Count, D3DPickRec);
+ FIXME("iface %p, count %p, records %p stub!\n", iface, count, records);
return D3D_OK;
}
@@ -1049,12 +1023,10 @@ IDirect3DDeviceImpl_1_GetPickRecords(IDirect3DDevice *iface,
* DDERR_INVALIDPARAMS if Callback == NULL
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface,
- LPD3DENUMPIXELFORMATSCALLBACK Callback,
- void *Arg)
+static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface,
+ LPD3DENUMPIXELFORMATSCALLBACK callback, void *context)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
struct wined3d_display_mode mode;
HRESULT hr;
unsigned int i;
@@ -1088,15 +1060,15 @@ IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface,
WINED3DFMT_R10G10B10_SNORM_A2_UNORM
};
- TRACE("iface %p, callback %p, context %p.\n", iface, Callback, Arg);
+ TRACE("iface %p, callback %p, context %p.\n", iface, callback, context);
- if(!Callback)
+ if (!callback)
return DDERR_INVALIDPARAMS;
wined3d_mutex_lock();
memset(&mode, 0, sizeof(mode));
- hr = wined3d_device_get_display_mode(This->ddraw->wined3d_device, 0, &mode);
+ hr = wined3d_device_get_display_mode(device->ddraw->wined3d_device, 0, &mode);
if (FAILED(hr))
{
wined3d_mutex_unlock();
@@ -1106,7 +1078,7 @@ IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface,
for (i = 0; i < sizeof(FormatList) / sizeof(*FormatList); ++i)
{
- hr = wined3d_check_device_format(This->ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL,
+ hr = wined3d_check_device_format(device->ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3D_DEVICE_TYPE_HAL,
mode.format_id, 0, WINED3D_RTYPE_TEXTURE, FormatList[i], WINED3D_SURFACE_TYPE_OPENGL);
if (hr == D3D_OK)
{
@@ -1117,7 +1089,7 @@ IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface,
PixelFormat_WineD3DtoDD(&pformat, FormatList[i]);
TRACE("Enumerating WineD3DFormat %d\n", FormatList[i]);
- hr = Callback(&pformat, Arg);
+ hr = callback(&pformat, context);
if(hr != DDENUMRET_OK)
{
TRACE("Format enumeration cancelled by application\n");
@@ -1129,7 +1101,7 @@ IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface,
for (i = 0; i < sizeof(BumpFormatList) / sizeof(*BumpFormatList); ++i)
{
- hr = wined3d_check_device_format(This->ddraw->wined3d, WINED3DADAPTER_DEFAULT,
+ hr = wined3d_check_device_format(device->ddraw->wined3d, WINED3DADAPTER_DEFAULT,
WINED3D_DEVICE_TYPE_HAL, mode.format_id, WINED3DUSAGE_QUERY_LEGACYBUMPMAP,
WINED3D_RTYPE_TEXTURE, BumpFormatList[i], WINED3D_SURFACE_TYPE_OPENGL);
if (hr == D3D_OK)
@@ -1141,7 +1113,7 @@ IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface,
PixelFormat_WineD3DtoDD(&pformat, BumpFormatList[i]);
TRACE("Enumerating WineD3DFormat %d\n", BumpFormatList[i]);
- hr = Callback(&pformat, Arg);
+ hr = callback(&pformat, context);
if(hr != DDENUMRET_OK)
{
TRACE("Format enumeration cancelled by application\n");
@@ -1156,37 +1128,33 @@ IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface,
return D3D_OK;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_EnumTextureFormats_FPUSetup(IDirect3DDevice7 *iface,
- LPD3DENUMPIXELFORMATSCALLBACK Callback,
- void *Arg)
+static HRESULT WINAPI d3d_device7_EnumTextureFormats_FPUSetup(IDirect3DDevice7 *iface,
+ LPD3DENUMPIXELFORMATSCALLBACK callback, void *context)
{
- return IDirect3DDeviceImpl_7_EnumTextureFormats(iface, Callback, Arg);
+ return d3d_device7_EnumTextureFormats(iface, callback, context);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_EnumTextureFormats_FPUPreserve(IDirect3DDevice7 *iface,
- LPD3DENUMPIXELFORMATSCALLBACK Callback,
- void *Arg)
+static HRESULT WINAPI d3d_device7_EnumTextureFormats_FPUPreserve(IDirect3DDevice7 *iface,
+ LPD3DENUMPIXELFORMATSCALLBACK callback, void *context)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_EnumTextureFormats(iface, Callback, Arg);
+ hr = d3d_device7_EnumTextureFormats(iface, callback, context);
set_fpu_control_word(old_fpucw);
return hr;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_3_EnumTextureFormats(IDirect3DDevice3 *iface,
- LPD3DENUMPIXELFORMATSCALLBACK Callback, void *Arg)
+static HRESULT WINAPI d3d_device3_EnumTextureFormats(IDirect3DDevice3 *iface,
+ LPD3DENUMPIXELFORMATSCALLBACK callback, void *context)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
- TRACE("iface %p, callback %p, context %p.\n", iface, Callback, Arg);
+ TRACE("iface %p, callback %p, context %p.\n", iface, callback, context);
- return IDirect3DDevice7_EnumTextureFormats(&This->IDirect3DDevice7_iface, Callback, Arg);
+ return IDirect3DDevice7_EnumTextureFormats(&device->IDirect3DDevice7_iface, callback, context);
}
/*****************************************************************************
@@ -1199,12 +1167,10 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_EnumTextureFormats(IDirect3DDevice3
* formats
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_2_EnumTextureFormats(IDirect3DDevice2 *iface,
- LPD3DENUMTEXTUREFORMATSCALLBACK Callback,
- void *Arg)
+static HRESULT WINAPI d3d_device2_EnumTextureFormats(IDirect3DDevice2 *iface,
+ LPD3DENUMTEXTUREFORMATSCALLBACK callback, void *context)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
struct wined3d_display_mode mode;
HRESULT hr;
unsigned int i;
@@ -1225,15 +1191,15 @@ IDirect3DDeviceImpl_2_EnumTextureFormats(IDirect3DDevice2 *iface,
/* FOURCC codes - Not in this version*/
};
- TRACE("iface %p, callback %p, context %p.\n", iface, Callback, Arg);
+ TRACE("iface %p, callback %p, context %p.\n", iface, callback, context);
- if(!Callback)
+ if (!callback)
return DDERR_INVALIDPARAMS;
wined3d_mutex_lock();
memset(&mode, 0, sizeof(mode));
- hr = wined3d_device_get_display_mode(This->ddraw->wined3d_device, 0, &mode);
+ hr = wined3d_device_get_display_mode(device->ddraw->wined3d_device, 0, &mode);
if (FAILED(hr))
{
wined3d_mutex_unlock();
@@ -1243,7 +1209,7 @@ IDirect3DDeviceImpl_2_EnumTextureFormats(IDirect3DDevice2 *iface,
for (i = 0; i < sizeof(FormatList) / sizeof(*FormatList); ++i)
{
- hr = wined3d_check_device_format(This->ddraw->wined3d, 0, WINED3D_DEVICE_TYPE_HAL,
+ hr = wined3d_check_device_format(device->ddraw->wined3d, 0, WINED3D_DEVICE_TYPE_HAL,
mode.format_id, 0, WINED3D_RTYPE_TEXTURE, FormatList[i], WINED3D_SURFACE_TYPE_OPENGL);
if (hr == D3D_OK)
{
@@ -1257,7 +1223,7 @@ IDirect3DDeviceImpl_2_EnumTextureFormats(IDirect3DDevice2 *iface,
PixelFormat_WineD3DtoDD(&sdesc.ddpfPixelFormat, FormatList[i]);
TRACE("Enumerating WineD3DFormat %d\n", FormatList[i]);
- hr = Callback(&sdesc, Arg);
+ hr = callback(&sdesc, context);
if(hr != DDENUMRET_OK)
{
TRACE("Format enumeration cancelled by application\n");
@@ -1272,14 +1238,14 @@ IDirect3DDeviceImpl_2_EnumTextureFormats(IDirect3DDevice2 *iface,
return D3D_OK;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_1_EnumTextureFormats(IDirect3DDevice *iface,
- LPD3DENUMTEXTUREFORMATSCALLBACK Callback, void *Arg)
+static HRESULT WINAPI d3d_device1_EnumTextureFormats(IDirect3DDevice *iface,
+ LPD3DENUMTEXTUREFORMATSCALLBACK callback, void *context)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice(iface);
- TRACE("iface %p, callback %p, context %p.\n", iface, Callback, Arg);
+ TRACE("iface %p, callback %p, context %p.\n", iface, callback, context);
- return IDirect3DDevice2_EnumTextureFormats(&This->IDirect3DDevice2_iface, Callback, Arg);
+ return d3d_device2_EnumTextureFormats(&device->IDirect3DDevice2_iface, callback, context);
}
/*****************************************************************************
@@ -1298,10 +1264,9 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_EnumTextureFormats(IDirect3DDevice *
* DDERR_INVALIDPARAMS if D3DMatHandle = NULL
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_1_CreateMatrix(IDirect3DDevice *iface, D3DMATRIXHANDLE *D3DMatHandle)
+static HRESULT WINAPI d3d_device1_CreateMatrix(IDirect3DDevice *iface, D3DMATRIXHANDLE *D3DMatHandle)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice(iface);
D3DMATRIX *Matrix;
DWORD h;
@@ -1319,7 +1284,7 @@ IDirect3DDeviceImpl_1_CreateMatrix(IDirect3DDevice *iface, D3DMATRIXHANDLE *D3DM
wined3d_mutex_lock();
- h = ddraw_allocate_handle(&This->handle_table, Matrix, DDRAW_HANDLE_MATRIX);
+ h = ddraw_allocate_handle(&device->handle_table, Matrix, DDRAW_HANDLE_MATRIX);
if (h == DDRAW_INVALID_HANDLE)
{
ERR("Failed to allocate a matrix handle.\n");
@@ -1355,12 +1320,10 @@ IDirect3DDeviceImpl_1_CreateMatrix(IDirect3DDevice *iface, D3DMATRIXHANDLE *D3DM
* to set is NULL
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_1_SetMatrix(IDirect3DDevice *iface,
- D3DMATRIXHANDLE D3DMatHandle,
- D3DMATRIX *D3DMatrix)
+static HRESULT WINAPI d3d_device1_SetMatrix(IDirect3DDevice *iface,
+ D3DMATRIXHANDLE D3DMatHandle, D3DMATRIX *D3DMatrix)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice(iface);
+ struct d3d_device *This = impl_from_IDirect3DDevice(iface);
D3DMATRIX *m;
TRACE("iface %p, matrix_handle %#x, matrix %p.\n", iface, D3DMatHandle, D3DMatrix);
@@ -1415,12 +1378,10 @@ IDirect3DDeviceImpl_1_SetMatrix(IDirect3DDevice *iface,
* DDERR_INVALIDPARAMS if D3DMatHandle is invalid or D3DMatrix is NULL
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_1_GetMatrix(IDirect3DDevice *iface,
- D3DMATRIXHANDLE D3DMatHandle,
- D3DMATRIX *D3DMatrix)
+static HRESULT WINAPI d3d_device1_GetMatrix(IDirect3DDevice *iface,
+ D3DMATRIXHANDLE D3DMatHandle, D3DMATRIX *D3DMatrix)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice(iface);
D3DMATRIX *m;
TRACE("iface %p, matrix_handle %#x, matrix %p.\n", iface, D3DMatHandle, D3DMatrix);
@@ -1429,7 +1390,7 @@ IDirect3DDeviceImpl_1_GetMatrix(IDirect3DDevice *iface,
wined3d_mutex_lock();
- m = ddraw_get_object(&This->handle_table, D3DMatHandle - 1, DDRAW_HANDLE_MATRIX);
+ m = ddraw_get_object(&device->handle_table, D3DMatHandle - 1, DDRAW_HANDLE_MATRIX);
if (!m)
{
WARN("Invalid matrix handle.\n");
@@ -1459,18 +1420,16 @@ IDirect3DDeviceImpl_1_GetMatrix(IDirect3DDevice *iface,
* DDERR_INVALIDPARAMS if D3DMatHandle is invalid
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_1_DeleteMatrix(IDirect3DDevice *iface,
- D3DMATRIXHANDLE D3DMatHandle)
+static HRESULT WINAPI d3d_device1_DeleteMatrix(IDirect3DDevice *iface, D3DMATRIXHANDLE D3DMatHandle)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice(iface);
D3DMATRIX *m;
TRACE("iface %p, matrix_handle %#x.\n", iface, D3DMatHandle);
wined3d_mutex_lock();
- m = ddraw_free_handle(&This->handle_table, D3DMatHandle - 1, DDRAW_HANDLE_MATRIX);
+ m = ddraw_free_handle(&device->handle_table, D3DMatHandle - 1, DDRAW_HANDLE_MATRIX);
if (!m)
{
WARN("Invalid matrix handle.\n");
@@ -1499,63 +1458,63 @@ IDirect3DDeviceImpl_1_DeleteMatrix(IDirect3DDevice *iface,
* started scene).
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_BeginScene(IDirect3DDevice7 *iface)
+static HRESULT d3d_device7_BeginScene(IDirect3DDevice7 *iface)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
HRESULT hr;
TRACE("iface %p.\n", iface);
wined3d_mutex_lock();
- hr = wined3d_device_begin_scene(This->wined3d_device);
+ hr = wined3d_device_begin_scene(device->wined3d_device);
wined3d_mutex_unlock();
if(hr == WINED3D_OK) return D3D_OK;
else return D3DERR_SCENE_IN_SCENE; /* TODO: Other possible causes of failure */
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_BeginScene_FPUSetup(IDirect3DDevice7 *iface)
+static HRESULT WINAPI d3d_device7_BeginScene_FPUSetup(IDirect3DDevice7 *iface)
{
- return IDirect3DDeviceImpl_7_BeginScene(iface);
+ return d3d_device7_BeginScene(iface);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_BeginScene_FPUPreserve(IDirect3DDevice7 *iface)
+static HRESULT WINAPI d3d_device7_BeginScene_FPUPreserve(IDirect3DDevice7 *iface)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_BeginScene(iface);
+ hr = d3d_device7_BeginScene(iface);
set_fpu_control_word(old_fpucw);
return hr;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_3_BeginScene(IDirect3DDevice3 *iface)
+static HRESULT WINAPI d3d_device3_BeginScene(IDirect3DDevice3 *iface)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
+
TRACE("iface %p.\n", iface);
- return IDirect3DDevice7_BeginScene(&This->IDirect3DDevice7_iface);
+ return IDirect3DDevice7_BeginScene(&device->IDirect3DDevice7_iface);
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_BeginScene(IDirect3DDevice2 *iface)
+static HRESULT WINAPI d3d_device2_BeginScene(IDirect3DDevice2 *iface)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
+
TRACE("iface %p.\n", iface);
- return IDirect3DDevice7_BeginScene(&This->IDirect3DDevice7_iface);
+ return IDirect3DDevice7_BeginScene(&device->IDirect3DDevice7_iface);
}
-static HRESULT WINAPI IDirect3DDeviceImpl_1_BeginScene(IDirect3DDevice *iface)
+static HRESULT WINAPI d3d_device1_BeginScene(IDirect3DDevice *iface)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice(iface);
+
TRACE("iface %p.\n", iface);
- return IDirect3DDevice7_BeginScene(&This->IDirect3DDevice7_iface);
+ return IDirect3DDevice7_BeginScene(&device->IDirect3DDevice7_iface);
}
/*****************************************************************************
@@ -1572,63 +1531,63 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_BeginScene(IDirect3DDevice *iface)
* that only if the scene was already ended.
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_EndScene(IDirect3DDevice7 *iface)
+static HRESULT d3d_device7_EndScene(IDirect3DDevice7 *iface)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
HRESULT hr;
TRACE("iface %p.\n", iface);
wined3d_mutex_lock();
- hr = wined3d_device_end_scene(This->wined3d_device);
+ hr = wined3d_device_end_scene(device->wined3d_device);
wined3d_mutex_unlock();
if(hr == WINED3D_OK) return D3D_OK;
else return D3DERR_SCENE_NOT_IN_SCENE;
}
-static HRESULT WINAPI DECLSPEC_HOTPATCH
-IDirect3DDeviceImpl_7_EndScene_FPUSetup(IDirect3DDevice7 *iface)
+static HRESULT WINAPI DECLSPEC_HOTPATCH d3d_device7_EndScene_FPUSetup(IDirect3DDevice7 *iface)
{
- return IDirect3DDeviceImpl_7_EndScene(iface);
+ return d3d_device7_EndScene(iface);
}
-static HRESULT WINAPI DECLSPEC_HOTPATCH
-IDirect3DDeviceImpl_7_EndScene_FPUPreserve(IDirect3DDevice7 *iface)
+static HRESULT WINAPI DECLSPEC_HOTPATCH d3d_device7_EndScene_FPUPreserve(IDirect3DDevice7 *iface)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_EndScene(iface);
+ hr = d3d_device7_EndScene(iface);
set_fpu_control_word(old_fpucw);
return hr;
}
-static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDeviceImpl_3_EndScene(IDirect3DDevice3 *iface)
+static HRESULT WINAPI DECLSPEC_HOTPATCH d3d_device3_EndScene(IDirect3DDevice3 *iface)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
+
TRACE("iface %p.\n", iface);
- return IDirect3DDevice7_EndScene(&This->IDirect3DDevice7_iface);
+ return IDirect3DDevice7_EndScene(&device->IDirect3DDevice7_iface);
}
-static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDeviceImpl_2_EndScene(IDirect3DDevice2 *iface)
+static HRESULT WINAPI DECLSPEC_HOTPATCH d3d_device2_EndScene(IDirect3DDevice2 *iface)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
+
TRACE("iface %p.\n", iface);
- return IDirect3DDevice7_EndScene(&This->IDirect3DDevice7_iface);
+ return IDirect3DDevice7_EndScene(&device->IDirect3DDevice7_iface);
}
-static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDeviceImpl_1_EndScene(IDirect3DDevice *iface)
+static HRESULT WINAPI DECLSPEC_HOTPATCH d3d_device1_EndScene(IDirect3DDevice *iface)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice(iface);
+
TRACE("iface %p.\n", iface);
- return IDirect3DDevice7_EndScene(&This->IDirect3DDevice7_iface);
+ return IDirect3DDevice7_EndScene(&device->IDirect3DDevice7_iface);
}
/*****************************************************************************
@@ -1645,69 +1604,67 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDeviceImpl_1_EndScene(IDirect3D
* DDERR_INVALIDPARAMS if Direct3D7 == NULL
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_GetDirect3D(IDirect3DDevice7 *iface,
- IDirect3D7 **Direct3D7)
+static HRESULT WINAPI d3d_device7_GetDirect3D(IDirect3DDevice7 *iface, IDirect3D7 **d3d)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
- TRACE("iface %p, d3d %p.\n", iface, Direct3D7);
+ TRACE("iface %p, d3d %p.\n", iface, d3d);
- if(!Direct3D7)
+ if (!d3d)
return DDERR_INVALIDPARAMS;
- *Direct3D7 = &This->ddraw->IDirect3D7_iface;
- IDirect3D7_AddRef(*Direct3D7);
+ *d3d = &device->ddraw->IDirect3D7_iface;
+ IDirect3D7_AddRef(*d3d);
- TRACE(" returning interface %p\n", *Direct3D7);
+ TRACE("Returning interface %p.\n", *d3d);
return D3D_OK;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_3_GetDirect3D(IDirect3DDevice3 *iface,
- IDirect3D3 **Direct3D3)
+static HRESULT WINAPI d3d_device3_GetDirect3D(IDirect3DDevice3 *iface, IDirect3D3 **d3d)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
- TRACE("iface %p, d3d %p.\n", iface, Direct3D3);
+ TRACE("iface %p, d3d %p.\n", iface, d3d);
- if(!Direct3D3)
+ if (!d3d)
return DDERR_INVALIDPARAMS;
- IDirect3D3_AddRef(&This->ddraw->IDirect3D3_iface);
- *Direct3D3 = &This->ddraw->IDirect3D3_iface;
- TRACE(" returning interface %p\n", *Direct3D3);
+ *d3d = &device->ddraw->IDirect3D3_iface;
+ IDirect3D3_AddRef(*d3d);
+
+ TRACE("Returning interface %p.\n", *d3d);
return D3D_OK;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_GetDirect3D(IDirect3DDevice2 *iface,
- IDirect3D2 **Direct3D2)
+static HRESULT WINAPI d3d_device2_GetDirect3D(IDirect3DDevice2 *iface, IDirect3D2 **d3d)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
- TRACE("iface %p, d3d %p.\n", iface, Direct3D2);
+ TRACE("iface %p, d3d %p.\n", iface, d3d);
- if(!Direct3D2)
+ if (!d3d)
return DDERR_INVALIDPARAMS;
- IDirect3D2_AddRef(&This->ddraw->IDirect3D2_iface);
- *Direct3D2 = &This->ddraw->IDirect3D2_iface;
- TRACE(" returning interface %p\n", *Direct3D2);
+ *d3d = &device->ddraw->IDirect3D2_iface;
+ IDirect3D2_AddRef(*d3d);
+
+ TRACE("Returning interface %p.\n", *d3d);
return D3D_OK;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_1_GetDirect3D(IDirect3DDevice *iface,
- IDirect3D **Direct3D)
+static HRESULT WINAPI d3d_device1_GetDirect3D(IDirect3DDevice *iface, IDirect3D **d3d)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice(iface);
- TRACE("iface %p, d3d %p.\n", iface, Direct3D);
+ TRACE("iface %p, d3d %p.\n", iface, d3d);
- if(!Direct3D)
+ if (!d3d)
return DDERR_INVALIDPARAMS;
- IDirect3D_AddRef(&This->ddraw->IDirect3D_iface);
- *Direct3D = &This->ddraw->IDirect3D_iface;
- TRACE(" returning interface %p\n", *Direct3D);
+ *d3d = &device->ddraw->IDirect3D_iface;
+ IDirect3D_AddRef(*d3d);
+
+ TRACE("Returning interface %p.\n", *d3d);
return D3D_OK;
}
@@ -1727,11 +1684,9 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_GetDirect3D(IDirect3DDevice *iface,
* (Is a NULL viewport valid?)
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_3_SetCurrentViewport(IDirect3DDevice3 *iface,
- IDirect3DViewport3 *Direct3DViewport3)
+static HRESULT WINAPI d3d_device3_SetCurrentViewport(IDirect3DDevice3 *iface, IDirect3DViewport3 *Direct3DViewport3)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *This = impl_from_IDirect3DDevice3(iface);
struct d3d_viewport *vp = unsafe_impl_from_IDirect3DViewport3(Direct3DViewport3);
TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport3);
@@ -1771,16 +1726,14 @@ IDirect3DDeviceImpl_3_SetCurrentViewport(IDirect3DDevice3 *iface,
return D3D_OK;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_SetCurrentViewport(IDirect3DDevice2 *iface,
- IDirect3DViewport2 *Direct3DViewport2)
+static HRESULT WINAPI d3d_device2_SetCurrentViewport(IDirect3DDevice2 *iface, IDirect3DViewport2 *viewport)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
- struct d3d_viewport *vp = unsafe_impl_from_IDirect3DViewport2(Direct3DViewport2);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
+ struct d3d_viewport *vp = unsafe_impl_from_IDirect3DViewport2(viewport);
- TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport2);
+ TRACE("iface %p, viewport %p.\n", iface, viewport);
- return IDirect3DDevice3_SetCurrentViewport(&This->IDirect3DDevice3_iface,
- &vp->IDirect3DViewport3_iface);
+ return d3d_device3_SetCurrentViewport(&device->IDirect3DDevice3_iface, &vp->IDirect3DViewport3_iface);
}
/*****************************************************************************
@@ -1798,42 +1751,37 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_SetCurrentViewport(IDirect3DDevice2
* DDERR_INVALIDPARAMS if Direct3DViewport == NULL
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_3_GetCurrentViewport(IDirect3DDevice3 *iface,
- IDirect3DViewport3 **Direct3DViewport3)
+static HRESULT WINAPI d3d_device3_GetCurrentViewport(IDirect3DDevice3 *iface, IDirect3DViewport3 **viewport)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
- TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport3);
+ TRACE("iface %p, viewport %p.\n", iface, viewport);
- if(!Direct3DViewport3)
+ if (!viewport)
return DDERR_INVALIDPARAMS;
wined3d_mutex_lock();
- *Direct3DViewport3 = &This->current_viewport->IDirect3DViewport3_iface;
+ *viewport = &device->current_viewport->IDirect3DViewport3_iface;
/* AddRef the returned viewport */
- if(*Direct3DViewport3) IDirect3DViewport3_AddRef(*Direct3DViewport3);
+ if (*viewport)
+ IDirect3DViewport3_AddRef(*viewport);
- TRACE(" returning interface %p\n", *Direct3DViewport3);
+ TRACE("Returning interface %p.\n", *viewport);
wined3d_mutex_unlock();
return D3D_OK;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_GetCurrentViewport(IDirect3DDevice2 *iface,
- IDirect3DViewport2 **Direct3DViewport2)
+static HRESULT WINAPI d3d_device2_GetCurrentViewport(IDirect3DDevice2 *iface, IDirect3DViewport2 **viewport)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
- HRESULT hr;
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
- TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport2);
+ TRACE("iface %p, viewport %p.\n", iface, viewport);
- hr = IDirect3DDevice3_GetCurrentViewport(&This->IDirect3DDevice3_iface,
- (IDirect3DViewport3 **)Direct3DViewport2);
- if(hr != D3D_OK) return hr;
- return D3D_OK;
+ return d3d_device3_GetCurrentViewport(&device->IDirect3DDevice3_iface,
+ (IDirect3DViewport3 **)viewport);
}
/*****************************************************************************
@@ -1854,96 +1802,89 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_GetCurrentViewport(IDirect3DDevice2
* D3D_OK on success, for details see IWineD3DDevice::SetRenderTarget
*
*****************************************************************************/
-static HRESULT d3d_device_set_render_target(IDirect3DDeviceImpl *This, struct ddraw_surface *target)
+static HRESULT d3d_device_set_render_target(struct d3d_device *device, struct ddraw_surface *target)
{
HRESULT hr;
wined3d_mutex_lock();
- if (This->target == target)
+ if (device->target == target)
{
TRACE("No-op SetRenderTarget operation, not doing anything\n");
wined3d_mutex_unlock();
return D3D_OK;
}
- This->target = target;
- hr = wined3d_device_set_render_target(This->wined3d_device, 0,
+ device->target = target;
+ hr = wined3d_device_set_render_target(device->wined3d_device, 0,
target ? target->wined3d_surface : NULL, FALSE);
if(hr != D3D_OK)
{
wined3d_mutex_unlock();
return hr;
}
- IDirect3DDeviceImpl_UpdateDepthStencil(This);
+ d3d_device_update_depth_stencil(device);
wined3d_mutex_unlock();
return D3D_OK;
}
-static HRESULT
-IDirect3DDeviceImpl_7_SetRenderTarget(IDirect3DDevice7 *iface,
- IDirectDrawSurface7 *NewTarget,
- DWORD Flags)
+static HRESULT d3d_device7_SetRenderTarget(IDirect3DDevice7 *iface,
+ IDirectDrawSurface7 *NewTarget, DWORD flags)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
struct ddraw_surface *target = unsafe_impl_from_IDirectDrawSurface7(NewTarget);
- TRACE("iface %p, target %p, flags %#x.\n", iface, NewTarget, Flags);
- /* Flags: Not used */
+ TRACE("iface %p, target %p, flags %#x.\n", iface, NewTarget, flags);
IDirectDrawSurface7_AddRef(NewTarget);
- IDirectDrawSurface7_Release(&This->target->IDirectDrawSurface7_iface);
- return d3d_device_set_render_target(This, target);
+ IDirectDrawSurface7_Release(&device->target->IDirectDrawSurface7_iface);
+ return d3d_device_set_render_target(device, target);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_SetRenderTarget_FPUSetup(IDirect3DDevice7 *iface,
- IDirectDrawSurface7 *NewTarget,
- DWORD Flags)
+static HRESULT WINAPI d3d_device7_SetRenderTarget_FPUSetup(IDirect3DDevice7 *iface,
+ IDirectDrawSurface7 *NewTarget, DWORD flags)
{
- return IDirect3DDeviceImpl_7_SetRenderTarget(iface, NewTarget, Flags);
+ return d3d_device7_SetRenderTarget(iface, NewTarget, flags);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_SetRenderTarget_FPUPreserve(IDirect3DDevice7 *iface,
- IDirectDrawSurface7 *NewTarget,
- DWORD Flags)
+static HRESULT WINAPI d3d_device7_SetRenderTarget_FPUPreserve(IDirect3DDevice7 *iface,
+ IDirectDrawSurface7 *NewTarget, DWORD flags)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_SetRenderTarget(iface, NewTarget, Flags);
+ hr = d3d_device7_SetRenderTarget(iface, NewTarget, flags);
set_fpu_control_word(old_fpucw);
return hr;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_3_SetRenderTarget(IDirect3DDevice3 *iface,
- IDirectDrawSurface4 *NewRenderTarget, DWORD Flags)
+static HRESULT WINAPI d3d_device3_SetRenderTarget(IDirect3DDevice3 *iface,
+ IDirectDrawSurface4 *NewRenderTarget, DWORD flags)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
struct ddraw_surface *target = unsafe_impl_from_IDirectDrawSurface4(NewRenderTarget);
- TRACE("iface %p, target %p, flags %#x.\n", iface, NewRenderTarget, Flags);
+ TRACE("iface %p, target %p, flags %#x.\n", iface, NewRenderTarget, flags);
IDirectDrawSurface4_AddRef(NewRenderTarget);
- IDirectDrawSurface4_Release(&This->target->IDirectDrawSurface4_iface);
- return d3d_device_set_render_target(This, target);
+ IDirectDrawSurface4_Release(&device->target->IDirectDrawSurface4_iface);
+ return d3d_device_set_render_target(device, target);
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_SetRenderTarget(IDirect3DDevice2 *iface,
- IDirectDrawSurface *NewRenderTarget, DWORD Flags)
+static HRESULT WINAPI d3d_device2_SetRenderTarget(IDirect3DDevice2 *iface,
+ IDirectDrawSurface *NewRenderTarget, DWORD flags)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
struct ddraw_surface *target = unsafe_impl_from_IDirectDrawSurface(NewRenderTarget);
- TRACE("iface %p, target %p, flags %#x.\n", iface, NewRenderTarget, Flags);
+ TRACE("iface %p, target %p, flags %#x.\n", iface, NewRenderTarget, flags);
IDirectDrawSurface_AddRef(NewRenderTarget);
- IDirectDrawSurface_Release(&This->target->IDirectDrawSurface_iface);
- return d3d_device_set_render_target(This, target);
+ IDirectDrawSurface_Release(&device->target->IDirectDrawSurface_iface);
+ return d3d_device_set_render_target(device, target);
}
/*****************************************************************************
@@ -1963,11 +1904,9 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_SetRenderTarget(IDirect3DDevice2 *if
* DDERR_INVALIDPARAMS if RenderTarget == NULL
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_GetRenderTarget(IDirect3DDevice7 *iface,
- IDirectDrawSurface7 **RenderTarget)
+static HRESULT WINAPI d3d_device7_GetRenderTarget(IDirect3DDevice7 *iface, IDirectDrawSurface7 **RenderTarget)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
TRACE("iface %p, target %p.\n", iface, RenderTarget);
@@ -1975,17 +1914,16 @@ IDirect3DDeviceImpl_7_GetRenderTarget(IDirect3DDevice7 *iface,
return DDERR_INVALIDPARAMS;
wined3d_mutex_lock();
- *RenderTarget = &This->target->IDirectDrawSurface7_iface;
+ *RenderTarget = &device->target->IDirectDrawSurface7_iface;
IDirectDrawSurface7_AddRef(*RenderTarget);
wined3d_mutex_unlock();
return D3D_OK;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_3_GetRenderTarget(IDirect3DDevice3 *iface,
- IDirectDrawSurface4 **RenderTarget)
+static HRESULT WINAPI d3d_device3_GetRenderTarget(IDirect3DDevice3 *iface, IDirectDrawSurface4 **RenderTarget)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
IDirectDrawSurface7 *RenderTarget7;
struct ddraw_surface *RenderTargetImpl;
HRESULT hr;
@@ -1995,7 +1933,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_GetRenderTarget(IDirect3DDevice3 *if
if(!RenderTarget)
return DDERR_INVALIDPARAMS;
- hr = IDirect3DDevice7_GetRenderTarget(&This->IDirect3DDevice7_iface, &RenderTarget7);
+ hr = d3d_device7_GetRenderTarget(&device->IDirect3DDevice7_iface, &RenderTarget7);
if(hr != D3D_OK) return hr;
RenderTargetImpl = impl_from_IDirectDrawSurface7(RenderTarget7);
*RenderTarget = &RenderTargetImpl->IDirectDrawSurface4_iface;
@@ -2004,10 +1942,9 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_GetRenderTarget(IDirect3DDevice3 *if
return D3D_OK;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_GetRenderTarget(IDirect3DDevice2 *iface,
- IDirectDrawSurface **RenderTarget)
+static HRESULT WINAPI d3d_device2_GetRenderTarget(IDirect3DDevice2 *iface, IDirectDrawSurface **RenderTarget)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
IDirectDrawSurface7 *RenderTarget7;
struct ddraw_surface *RenderTargetImpl;
HRESULT hr;
@@ -2017,7 +1954,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_GetRenderTarget(IDirect3DDevice2 *if
if(!RenderTarget)
return DDERR_INVALIDPARAMS;
- hr = IDirect3DDevice7_GetRenderTarget(&This->IDirect3DDevice7_iface, &RenderTarget7);
+ hr = d3d_device7_GetRenderTarget(&device->IDirect3DDevice7_iface, &RenderTarget7);
if(hr != D3D_OK) return hr;
RenderTargetImpl = impl_from_IDirectDrawSurface7(RenderTarget7);
*RenderTarget = &RenderTargetImpl->IDirectDrawSurface_iface;
@@ -2044,48 +1981,45 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_GetRenderTarget(IDirect3DDevice2 *if
* D3D_OK on success
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_3_Begin(IDirect3DDevice3 *iface,
- D3DPRIMITIVETYPE PrimitiveType,
- DWORD VertexTypeDesc,
- DWORD Flags)
+static HRESULT WINAPI d3d_device3_Begin(IDirect3DDevice3 *iface,
+ D3DPRIMITIVETYPE primitive_type, DWORD fvf, DWORD flags)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
- TRACE("iface %p, primitive_type %#x, FVF %#x, flags %#x.\n",
- iface, PrimitiveType, VertexTypeDesc, Flags);
+ TRACE("iface %p, primitive_type %#x, fvf %#x, flags %#x.\n",
+ iface, primitive_type, fvf, flags);
wined3d_mutex_lock();
- This->primitive_type = PrimitiveType;
- This->vertex_type = VertexTypeDesc;
- This->render_flags = Flags;
- This->vertex_size = get_flexible_vertex_size(This->vertex_type);
- This->nb_vertices = 0;
+ device->primitive_type = primitive_type;
+ device->vertex_type = fvf;
+ device->render_flags = flags;
+ device->vertex_size = get_flexible_vertex_size(device->vertex_type);
+ device->nb_vertices = 0;
wined3d_mutex_unlock();
return D3D_OK;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_Begin(IDirect3DDevice2 *iface, D3DPRIMITIVETYPE d3dpt,
- D3DVERTEXTYPE dwVertexTypeDesc, DWORD dwFlags)
+static HRESULT WINAPI d3d_device2_Begin(IDirect3DDevice2 *iface,
+ D3DPRIMITIVETYPE primitive_type, D3DVERTEXTYPE vertex_type, DWORD flags)
{
- DWORD FVF;
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
+ DWORD fvf;
TRACE("iface %p, primitive_type %#x, vertex_type %#x, flags %#x.\n",
- iface, d3dpt, dwVertexTypeDesc, dwFlags);
+ iface, primitive_type, vertex_type, flags);
- switch(dwVertexTypeDesc)
+ switch (vertex_type)
{
- case D3DVT_VERTEX: FVF = D3DFVF_VERTEX; break;
- case D3DVT_LVERTEX: FVF = D3DFVF_LVERTEX; break;
- case D3DVT_TLVERTEX: FVF = D3DFVF_TLVERTEX; break;
+ case D3DVT_VERTEX: fvf = D3DFVF_VERTEX; break;
+ case D3DVT_LVERTEX: fvf = D3DFVF_LVERTEX; break;
+ case D3DVT_TLVERTEX: fvf = D3DFVF_TLVERTEX; break;
default:
- ERR("Unexpected vertex type %d\n", dwVertexTypeDesc);
+ ERR("Unexpected vertex type %#x.\n", vertex_type);
return DDERR_INVALIDPARAMS; /* Should never happen */
};
- return IDirect3DDevice3_Begin(&This->IDirect3DDevice3_iface, d3dpt, FVF, dwFlags);
+ return d3d_device3_Begin(&device->IDirect3DDevice3_iface, primitive_type, fvf, flags);
}
/*****************************************************************************
@@ -2107,43 +2041,39 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_Begin(IDirect3DDevice2 *iface, D3DPR
* D3D_OK, because it's a stub
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_3_BeginIndexed(IDirect3DDevice3 *iface,
- D3DPRIMITIVETYPE PrimitiveType,
- DWORD VertexType,
- void *Vertices,
- DWORD NumVertices,
- DWORD Flags)
+static HRESULT WINAPI d3d_device3_BeginIndexed(IDirect3DDevice3 *iface,
+ D3DPRIMITIVETYPE primitive_type, DWORD fvf,
+ void *vertices, DWORD vertex_count, DWORD flags)
{
- FIXME("iface %p, primitive_type %#x, FVF %#x, vertices %p, vertex_count %u, flags %#x stub!\n",
- iface, PrimitiveType, VertexType, Vertices, NumVertices, Flags);
+ FIXME("iface %p, primitive_type %#x, fvf %#x, vertices %p, vertex_count %u, flags %#x stub!\n",
+ iface, primitive_type, fvf, vertices, vertex_count, flags);
return D3D_OK;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_BeginIndexed(IDirect3DDevice2 *iface,
- D3DPRIMITIVETYPE d3dptPrimitiveType, D3DVERTEXTYPE d3dvtVertexType,
- void *lpvVertices, DWORD dwNumVertices, DWORD dwFlags)
+static HRESULT WINAPI d3d_device2_BeginIndexed(IDirect3DDevice2 *iface,
+ D3DPRIMITIVETYPE primitive_type, D3DVERTEXTYPE vertex_type,
+ void *vertices, DWORD vertex_count, DWORD flags)
{
- DWORD FVF;
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
+ DWORD fvf;
TRACE("iface %p, primitive_type %#x, vertex_type %#x, vertices %p, vertex_count %u, flags %#x stub!\n",
- iface, d3dptPrimitiveType, d3dvtVertexType, lpvVertices, dwNumVertices, dwFlags);
+ iface, primitive_type, vertex_type, vertices, vertex_count, flags);
- switch(d3dvtVertexType)
+ switch (vertex_type)
{
- case D3DVT_VERTEX: FVF = D3DFVF_VERTEX; break;
- case D3DVT_LVERTEX: FVF = D3DFVF_LVERTEX; break;
- case D3DVT_TLVERTEX: FVF = D3DFVF_TLVERTEX; break;
+ case D3DVT_VERTEX: fvf = D3DFVF_VERTEX; break;
+ case D3DVT_LVERTEX: fvf = D3DFVF_LVERTEX; break;
+ case D3DVT_TLVERTEX: fvf = D3DFVF_TLVERTEX; break;
default:
- ERR("Unexpected vertex type %d\n", d3dvtVertexType);
+ ERR("Unexpected vertex type %#x.\n", vertex_type);
return DDERR_INVALIDPARAMS; /* Should never happen */
};
- return IDirect3DDevice3_BeginIndexed(&This->IDirect3DDevice3_iface,
- d3dptPrimitiveType, FVF, lpvVertices, dwNumVertices, dwFlags);
+ return d3d_device3_BeginIndexed(&device->IDirect3DDevice3_iface,
+ primitive_type, fvf, vertices, vertex_count, flags);
}
/*****************************************************************************
@@ -2163,44 +2093,43 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_BeginIndexed(IDirect3DDevice2 *iface
* DDERR_INVALIDPARAMS if Vertex is NULL
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_3_Vertex(IDirect3DDevice3 *iface,
- void *Vertex)
+static HRESULT WINAPI d3d_device3_Vertex(IDirect3DDevice3 *iface, void *vertex)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
- TRACE("iface %p, vertex %p.\n", iface, Vertex);
+ TRACE("iface %p, vertex %p.\n", iface, vertex);
- if(!Vertex)
+ if (!vertex)
return DDERR_INVALIDPARAMS;
wined3d_mutex_lock();
- if ((This->nb_vertices+1)*This->vertex_size > This->buffer_size)
+ if ((device->nb_vertices + 1) * device->vertex_size > device->buffer_size)
{
BYTE *old_buffer;
- This->buffer_size = This->buffer_size ? This->buffer_size * 2 : This->vertex_size * 3;
- old_buffer = This->vertex_buffer;
- This->vertex_buffer = HeapAlloc(GetProcessHeap(), 0, This->buffer_size);
+
+ device->buffer_size = device->buffer_size ? device->buffer_size * 2 : device->vertex_size * 3;
+ old_buffer = device->vertex_buffer;
+ device->vertex_buffer = HeapAlloc(GetProcessHeap(), 0, device->buffer_size);
if (old_buffer)
{
- CopyMemory(This->vertex_buffer, old_buffer, This->nb_vertices * This->vertex_size);
+ memcpy(device->vertex_buffer, old_buffer, device->nb_vertices * device->vertex_size);
HeapFree(GetProcessHeap(), 0, old_buffer);
}
}
- CopyMemory(This->vertex_buffer + This->nb_vertices++ * This->vertex_size, Vertex, This->vertex_size);
+ memcpy(device->vertex_buffer + device->nb_vertices++ * device->vertex_size, vertex, device->vertex_size);
wined3d_mutex_unlock();
return D3D_OK;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_Vertex(IDirect3DDevice2 *iface, void *lpVertexType)
+static HRESULT WINAPI d3d_device2_Vertex(IDirect3DDevice2 *iface, void *vertex)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
- TRACE("iface %p, vertex %p.\n", iface, lpVertexType);
+ TRACE("iface %p, vertex %p.\n", iface, vertex);
- return IDirect3DDevice3_Vertex(&This->IDirect3DDevice3_iface, lpVertexType);
+ return d3d_device3_Vertex(&device->IDirect3DDevice3_iface, vertex);
}
/*****************************************************************************
@@ -2216,22 +2145,20 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_Vertex(IDirect3DDevice2 *iface, void
* D3D_OK because it's a stub
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_3_Index(IDirect3DDevice3 *iface,
- WORD VertexIndex)
+static HRESULT WINAPI d3d_device3_Index(IDirect3DDevice3 *iface, WORD index)
{
- FIXME("iface %p, index %#x stub!\n", iface, VertexIndex);
+ FIXME("iface %p, index %#x stub!\n", iface, index);
return D3D_OK;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_Index(IDirect3DDevice2 *iface, WORD wVertexIndex)
+static HRESULT WINAPI d3d_device2_Index(IDirect3DDevice2 *iface, WORD index)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
- TRACE("iface %p, index %#x.\n", iface, wVertexIndex);
+ TRACE("iface %p, index %#x.\n", iface, index);
- return IDirect3DDevice3_Index(&This->IDirect3DDevice3_iface, wVertexIndex);
+ return d3d_device3_Index(&device->IDirect3DDevice3_iface, index);
}
/*****************************************************************************
@@ -2252,25 +2179,23 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_Index(IDirect3DDevice2 *iface, WORD
* The return value of IDirect3DDevice7::DrawPrimitive
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_3_End(IDirect3DDevice3 *iface,
- DWORD Flags)
+static HRESULT WINAPI d3d_device3_End(IDirect3DDevice3 *iface, DWORD flags)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
- TRACE("iface %p, flags %#x.\n", iface, Flags);
+ TRACE("iface %p, flags %#x.\n", iface, flags);
- return IDirect3DDevice7_DrawPrimitive(&This->IDirect3DDevice7_iface, This->primitive_type,
- This->vertex_type, This->vertex_buffer, This->nb_vertices, This->render_flags);
+ return IDirect3DDevice7_DrawPrimitive(&device->IDirect3DDevice7_iface, device->primitive_type,
+ device->vertex_type, device->vertex_buffer, device->nb_vertices, device->render_flags);
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_End(IDirect3DDevice2 *iface, DWORD dwFlags)
+static HRESULT WINAPI d3d_device2_End(IDirect3DDevice2 *iface, DWORD flags)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
- TRACE("iface %p, flags %#x.\n", iface, dwFlags);
+ TRACE("iface %p, flags %#x.\n", iface, flags);
- return IDirect3DDevice3_End(&This->IDirect3DDevice3_iface, dwFlags);
+ return d3d_device3_End(&device->IDirect3DDevice3_iface, flags);
}
/*****************************************************************************
@@ -2290,37 +2215,37 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_End(IDirect3DDevice2 *iface, DWORD d
* DDERR_INVALIDPARAMS if Value == NULL
*
*****************************************************************************/
-static HRESULT IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface,
- D3DRENDERSTATETYPE RenderStateType, DWORD *Value)
+static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface,
+ D3DRENDERSTATETYPE state, DWORD *value)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
HRESULT hr;
- TRACE("iface %p, state %#x, value %p.\n", iface, RenderStateType, Value);
+ TRACE("iface %p, state %#x, value %p.\n", iface, state, value);
- if(!Value)
+ if (!value)
return DDERR_INVALIDPARAMS;
wined3d_mutex_lock();
- switch(RenderStateType)
+ switch (state)
{
case D3DRENDERSTATE_TEXTUREMAG:
{
enum wined3d_texture_filter_type tex_mag;
- hr = wined3d_device_get_sampler_state(This->wined3d_device, 0, WINED3D_SAMP_MAG_FILTER, &tex_mag);
+ hr = wined3d_device_get_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_MAG_FILTER, &tex_mag);
switch (tex_mag)
{
case WINED3D_TEXF_POINT:
- *Value = D3DFILTER_NEAREST;
+ *value = D3DFILTER_NEAREST;
break;
case WINED3D_TEXF_LINEAR:
- *Value = D3DFILTER_LINEAR;
+ *value = D3DFILTER_LINEAR;
break;
default:
ERR("Unhandled texture mag %d !\n",tex_mag);
- *Value = 0;
+ *value = 0;
}
break;
}
@@ -2330,14 +2255,14 @@ static HRESULT IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface,
enum wined3d_texture_filter_type tex_min;
enum wined3d_texture_filter_type tex_mip;
- hr = wined3d_device_get_sampler_state(This->wined3d_device,
+ hr = wined3d_device_get_sampler_state(device->wined3d_device,
0, WINED3D_SAMP_MIN_FILTER, &tex_min);
if (FAILED(hr))
{
wined3d_mutex_unlock();
return hr;
}
- hr = wined3d_device_get_sampler_state(This->wined3d_device,
+ hr = wined3d_device_get_sampler_state(device->wined3d_device,
0, WINED3D_SAMP_MIP_FILTER, &tex_mip);
switch (tex_min)
@@ -2346,17 +2271,17 @@ static HRESULT IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface,
switch (tex_mip)
{
case WINED3D_TEXF_NONE:
- *Value = D3DFILTER_NEAREST;
+ *value = D3DFILTER_NEAREST;
break;
case WINED3D_TEXF_POINT:
- *Value = D3DFILTER_MIPNEAREST;
+ *value = D3DFILTER_MIPNEAREST;
break;
case WINED3D_TEXF_LINEAR:
- *Value = D3DFILTER_LINEARMIPNEAREST;
+ *value = D3DFILTER_LINEARMIPNEAREST;
break;
default:
ERR("Unhandled mip filter %#x.\n", tex_mip);
- *Value = D3DFILTER_NEAREST;
+ *value = D3DFILTER_NEAREST;
break;
}
break;
@@ -2364,23 +2289,23 @@ static HRESULT IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface,
switch (tex_mip)
{
case WINED3D_TEXF_NONE:
- *Value = D3DFILTER_LINEAR;
+ *value = D3DFILTER_LINEAR;
break;
case WINED3D_TEXF_POINT:
- *Value = D3DFILTER_MIPLINEAR;
+ *value = D3DFILTER_MIPLINEAR;
break;
case WINED3D_TEXF_LINEAR:
- *Value = D3DFILTER_LINEARMIPLINEAR;
+ *value = D3DFILTER_LINEARMIPLINEAR;
break;
default:
ERR("Unhandled mip filter %#x.\n", tex_mip);
- *Value = D3DFILTER_LINEAR;
+ *value = D3DFILTER_LINEAR;
break;
}
break;
default:
ERR("Unhandled texture min filter %#x.\n",tex_min);
- *Value = D3DFILTER_NEAREST;
+ *value = D3DFILTER_NEAREST;
break;
}
break;
@@ -2388,12 +2313,12 @@ static HRESULT IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface,
case D3DRENDERSTATE_TEXTUREADDRESS:
case D3DRENDERSTATE_TEXTUREADDRESSU:
- hr = wined3d_device_get_sampler_state(This->wined3d_device,
- 0, WINED3D_SAMP_ADDRESS_U, Value);
+ hr = wined3d_device_get_sampler_state(device->wined3d_device,
+ 0, WINED3D_SAMP_ADDRESS_U, value);
break;
case D3DRENDERSTATE_TEXTUREADDRESSV:
- hr = wined3d_device_get_sampler_state(This->wined3d_device,
- 0, WINED3D_SAMP_ADDRESS_V, Value);
+ hr = wined3d_device_get_sampler_state(device->wined3d_device,
+ 0, WINED3D_SAMP_ADDRESS_V, value);
break;
case D3DRENDERSTATE_BORDERCOLOR:
@@ -2403,80 +2328,74 @@ static HRESULT IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface,
case D3DRENDERSTATE_TEXTUREHANDLE:
case D3DRENDERSTATE_TEXTUREMAPBLEND:
- WARN("Render state %#x is invalid in d3d7.\n", RenderStateType);
+ WARN("Render state %#x is invalid in d3d7.\n", state);
hr = DDERR_INVALIDPARAMS;
break;
case D3DRENDERSTATE_ZBIAS:
- hr = wined3d_device_get_render_state(This->wined3d_device, WINED3D_RS_DEPTHBIAS, Value);
+ hr = wined3d_device_get_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, value);
break;
default:
- if (RenderStateType >= D3DRENDERSTATE_STIPPLEPATTERN00
- && RenderStateType <= D3DRENDERSTATE_STIPPLEPATTERN31)
+ if (state >= D3DRENDERSTATE_STIPPLEPATTERN00
+ && state <= D3DRENDERSTATE_STIPPLEPATTERN31)
{
- FIXME("Unhandled stipple pattern render state (%#x).\n",
- RenderStateType);
+ FIXME("Unhandled stipple pattern render state (%#x).\n", state);
hr = E_NOTIMPL;
break;
}
- hr = wined3d_device_get_render_state(This->wined3d_device, RenderStateType, Value);
+ hr = wined3d_device_get_render_state(device->wined3d_device, state, value);
}
wined3d_mutex_unlock();
return hr;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_GetRenderState_FPUSetup(IDirect3DDevice7 *iface,
- D3DRENDERSTATETYPE RenderStateType,
- DWORD *Value)
+static HRESULT WINAPI d3d_device7_GetRenderState_FPUSetup(IDirect3DDevice7 *iface,
+ D3DRENDERSTATETYPE state, DWORD *value)
{
- return IDirect3DDeviceImpl_7_GetRenderState(iface, RenderStateType, Value);
+ return d3d_device7_GetRenderState(iface, state, value);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_GetRenderState_FPUPreserve(IDirect3DDevice7 *iface,
- D3DRENDERSTATETYPE RenderStateType,
- DWORD *Value)
+static HRESULT WINAPI d3d_device7_GetRenderState_FPUPreserve(IDirect3DDevice7 *iface,
+ D3DRENDERSTATETYPE state, DWORD *value)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_GetRenderState(iface, RenderStateType, Value);
+ hr = d3d_device7_GetRenderState(iface, state, value);
set_fpu_control_word(old_fpucw);
return hr;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_3_GetRenderState(IDirect3DDevice3 *iface,
- D3DRENDERSTATETYPE dwRenderStateType,
- DWORD *lpdwRenderState)
+static HRESULT WINAPI d3d_device3_GetRenderState(IDirect3DDevice3 *iface,
+ D3DRENDERSTATETYPE state, DWORD *value)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
HRESULT hr;
- TRACE("iface %p, state %#x, value %p.\n", iface, dwRenderStateType, lpdwRenderState);
+ TRACE("iface %p, state %#x, value %p.\n", iface, state, value);
- switch(dwRenderStateType)
+ switch (state)
{
case D3DRENDERSTATE_TEXTUREHANDLE:
{
/* This state is wrapped to SetTexture in SetRenderState, so
* it has to be wrapped to GetTexture here. */
struct wined3d_texture *tex = NULL;
- *lpdwRenderState = 0;
+ *value = 0;
wined3d_mutex_lock();
- hr = wined3d_device_get_texture(This->wined3d_device, 0, &tex);
+ hr = wined3d_device_get_texture(device->wined3d_device, 0, &tex);
if (SUCCEEDED(hr) && tex)
{
/* The parent of the texture is the IDirectDrawSurface7
* interface of the ddraw surface. */
struct ddraw_surface *parent = wined3d_texture_get_parent(tex);
- if (parent) *lpdwRenderState = parent->Handle;
+ if (parent)
+ *value = parent->Handle;
wined3d_texture_decref(tex);
}
wined3d_mutex_unlock();
@@ -2493,27 +2412,27 @@ IDirect3DDeviceImpl_3_GetRenderState(IDirect3DDevice3 *iface,
wined3d_mutex_lock();
- This->legacyTextureBlending = TRUE;
+ device->legacyTextureBlending = TRUE;
- wined3d_device_get_texture_stage_state(This->wined3d_device, 0, WINED3D_TSS_COLOR_OP, &colorop);
- wined3d_device_get_texture_stage_state(This->wined3d_device, 0, WINED3D_TSS_COLOR_ARG1, &colorarg1);
- wined3d_device_get_texture_stage_state(This->wined3d_device, 0, WINED3D_TSS_COLOR_ARG2, &colorarg2);
- wined3d_device_get_texture_stage_state(This->wined3d_device, 0, WINED3D_TSS_ALPHA_OP, &alphaop);
- wined3d_device_get_texture_stage_state(This->wined3d_device, 0, WINED3D_TSS_ALPHA_ARG1, &alphaarg1);
- wined3d_device_get_texture_stage_state(This->wined3d_device, 0, WINED3D_TSS_ALPHA_ARG2, &alphaarg2);
+ wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_COLOR_OP, &colorop);
+ wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_COLOR_ARG1, &colorarg1);
+ wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_COLOR_ARG2, &colorarg2);
+ wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_ALPHA_OP, &alphaop);
+ wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_ALPHA_ARG1, &alphaarg1);
+ wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_ALPHA_ARG2, &alphaarg2);
if (colorop == WINED3D_TOP_SELECT_ARG1 && colorarg1 == WINED3DTA_TEXTURE
&& alphaop == WINED3D_TOP_SELECT_ARG1 && alphaarg1 == WINED3DTA_TEXTURE)
- *lpdwRenderState = D3DTBLEND_DECAL;
+ *value = D3DTBLEND_DECAL;
else if (colorop == WINED3D_TOP_SELECT_ARG1 && colorarg1 == WINED3DTA_TEXTURE
&& alphaop == WINED3D_TOP_MODULATE
&& alphaarg1 == WINED3DTA_TEXTURE && alphaarg2 == WINED3DTA_CURRENT)
- *lpdwRenderState = D3DTBLEND_DECALALPHA;
+ *value = D3DTBLEND_DECALALPHA;
else if (colorop == WINED3D_TOP_MODULATE
&& colorarg1 == WINED3DTA_TEXTURE && colorarg2 == WINED3DTA_CURRENT
&& alphaop == WINED3D_TOP_MODULATE
&& alphaarg1 == WINED3DTA_TEXTURE && alphaarg2 == WINED3DTA_CURRENT)
- *lpdwRenderState = D3DTBLEND_MODULATEALPHA;
+ *value = D3DTBLEND_MODULATEALPHA;
else
{
struct wined3d_texture *tex = NULL;
@@ -2521,7 +2440,7 @@ IDirect3DDeviceImpl_3_GetRenderState(IDirect3DDevice3 *iface,
BOOL tex_alpha = FALSE;
DDPIXELFORMAT ddfmt;
- hr = wined3d_device_get_texture(This->wined3d_device, 0, &tex);
+ hr = wined3d_device_get_texture(device->wined3d_device, 0, &tex);
if(hr == WINED3D_OK && tex)
{
@@ -2546,7 +2465,7 @@ IDirect3DDeviceImpl_3_GetRenderState(IDirect3DDevice3 *iface,
&& alphaarg1 == WINED3DTA_TEXTURE && alphaarg2 == WINED3DTA_CURRENT))
ERR("Unexpected texture stage state setup, returning D3DTBLEND_MODULATE - likely erroneous.\n");
- *lpdwRenderState = D3DTBLEND_MODULATE;
+ *value = D3DTBLEND_MODULATE;
}
wined3d_mutex_unlock();
@@ -2555,19 +2474,18 @@ IDirect3DDeviceImpl_3_GetRenderState(IDirect3DDevice3 *iface,
}
default:
- return IDirect3DDevice7_GetRenderState(&This->IDirect3DDevice7_iface, dwRenderStateType, lpdwRenderState);
+ return IDirect3DDevice7_GetRenderState(&device->IDirect3DDevice7_iface, state, value);
}
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_GetRenderState(IDirect3DDevice2 *iface,
- D3DRENDERSTATETYPE dwRenderStateType, DWORD *lpdwRenderState)
+static HRESULT WINAPI d3d_device2_GetRenderState(IDirect3DDevice2 *iface,
+ D3DRENDERSTATETYPE state, DWORD *value)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
- TRACE("iface %p, state %#x, value %p.\n", iface, dwRenderStateType, lpdwRenderState);
+ TRACE("iface %p, state %#x, value %p.\n", iface, state, value);
- return IDirect3DDevice3_GetRenderState(&This->IDirect3DDevice3_iface,
- dwRenderStateType, lpdwRenderState);
+ return IDirect3DDevice3_GetRenderState(&device->IDirect3DDevice3_iface, state, value);
}
/*****************************************************************************
@@ -2587,19 +2505,17 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_GetRenderState(IDirect3DDevice2 *ifa
* for details see IWineD3DDevice::SetRenderState
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface,
- D3DRENDERSTATETYPE RenderStateType,
- DWORD Value)
+static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface,
+ D3DRENDERSTATETYPE state, DWORD value)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
HRESULT hr;
- TRACE("iface %p, state %#x, value %#x.\n", iface, RenderStateType, Value);
+ TRACE("iface %p, state %#x, value %#x.\n", iface, state, value);
wined3d_mutex_lock();
/* Some render states need special care */
- switch(RenderStateType)
+ switch (state)
{
/*
* The ddraw texture filter mapping works like this:
@@ -2618,7 +2534,7 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface,
{
enum wined3d_texture_filter_type tex_mag;
- switch (Value)
+ switch (value)
{
case D3DFILTER_NEAREST:
case D3DFILTER_MIPNEAREST:
@@ -2632,11 +2548,11 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface,
break;
default:
tex_mag = WINED3D_TEXF_POINT;
- ERR("Unhandled texture mag %d !\n",Value);
+ FIXME("Unhandled texture mag %#x.\n", value);
break;
}
- hr = wined3d_device_set_sampler_state(This->wined3d_device, 0, WINED3D_SAMP_MAG_FILTER, tex_mag);
+ hr = wined3d_device_set_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_MAG_FILTER, tex_mag);
break;
}
@@ -2645,7 +2561,7 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface,
enum wined3d_texture_filter_type tex_min;
enum wined3d_texture_filter_type tex_mip;
- switch ((D3DTEXTUREFILTER)Value)
+ switch (value)
{
case D3DFILTER_NEAREST:
tex_min = WINED3D_TEXF_POINT;
@@ -2673,30 +2589,30 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface,
break;
default:
- ERR("Unhandled texture min %d !\n",Value);
+ FIXME("Unhandled texture min %#x.\n",value);
tex_min = WINED3D_TEXF_POINT;
tex_mip = WINED3D_TEXF_NONE;
break;
}
- wined3d_device_set_sampler_state(This->wined3d_device,
+ wined3d_device_set_sampler_state(device->wined3d_device,
0, WINED3D_SAMP_MIP_FILTER, tex_mip);
- hr = wined3d_device_set_sampler_state(This->wined3d_device,
+ hr = wined3d_device_set_sampler_state(device->wined3d_device,
0, WINED3D_SAMP_MIN_FILTER, tex_min);
break;
}
case D3DRENDERSTATE_TEXTUREADDRESS:
- wined3d_device_set_sampler_state(This->wined3d_device,
- 0, WINED3D_SAMP_ADDRESS_V, Value);
+ wined3d_device_set_sampler_state(device->wined3d_device,
+ 0, WINED3D_SAMP_ADDRESS_V, value);
/* Drop through */
case D3DRENDERSTATE_TEXTUREADDRESSU:
- hr = wined3d_device_set_sampler_state(This->wined3d_device,
- 0, WINED3D_SAMP_ADDRESS_U, Value);
+ hr = wined3d_device_set_sampler_state(device->wined3d_device,
+ 0, WINED3D_SAMP_ADDRESS_U, value);
break;
case D3DRENDERSTATE_TEXTUREADDRESSV:
- hr = wined3d_device_set_sampler_state(This->wined3d_device,
- 0, WINED3D_SAMP_ADDRESS_V, Value);
+ hr = wined3d_device_set_sampler_state(device->wined3d_device,
+ 0, WINED3D_SAMP_ADDRESS_V, value);
break;
case D3DRENDERSTATE_BORDERCOLOR:
@@ -2708,25 +2624,24 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface,
case D3DRENDERSTATE_TEXTUREHANDLE:
case D3DRENDERSTATE_TEXTUREMAPBLEND:
- WARN("Render state %#x is invalid in d3d7.\n", RenderStateType);
+ WARN("Render state %#x is invalid in d3d7.\n", state);
hr = DDERR_INVALIDPARAMS;
break;
case D3DRENDERSTATE_ZBIAS:
- hr = wined3d_device_set_render_state(This->wined3d_device, WINED3D_RS_DEPTHBIAS, Value);
+ hr = wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, value);
break;
default:
- if (RenderStateType >= D3DRENDERSTATE_STIPPLEPATTERN00
- && RenderStateType <= D3DRENDERSTATE_STIPPLEPATTERN31)
+ if (state >= D3DRENDERSTATE_STIPPLEPATTERN00
+ && state <= D3DRENDERSTATE_STIPPLEPATTERN31)
{
- FIXME("Unhandled stipple pattern render state (%#x).\n",
- RenderStateType);
+ FIXME("Unhandled stipple pattern render state (%#x).\n", state);
hr = E_NOTIMPL;
break;
}
- hr = wined3d_device_set_render_state(This->wined3d_device, RenderStateType, Value);
+ hr = wined3d_device_set_render_state(device->wined3d_device, state, value);
break;
}
wined3d_mutex_unlock();
@@ -2734,33 +2649,27 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface,
return hr;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_SetRenderState_FPUSetup(IDirect3DDevice7 *iface,
- D3DRENDERSTATETYPE RenderStateType,
- DWORD Value)
+static HRESULT WINAPI d3d_device7_SetRenderState_FPUSetup(IDirect3DDevice7 *iface,
+ D3DRENDERSTATETYPE state, DWORD value)
{
- return IDirect3DDeviceImpl_7_SetRenderState(iface, RenderStateType, Value);
+ return d3d_device7_SetRenderState(iface, state, value);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_SetRenderState_FPUPreserve(IDirect3DDevice7 *iface,
- D3DRENDERSTATETYPE RenderStateType,
- DWORD Value)
+static HRESULT WINAPI d3d_device7_SetRenderState_FPUPreserve(IDirect3DDevice7 *iface,
+ D3DRENDERSTATETYPE state, DWORD value)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_SetRenderState(iface, RenderStateType, Value);
+ hr = d3d_device7_SetRenderState(iface, state, value);
set_fpu_control_word(old_fpucw);
return hr;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface,
- D3DRENDERSTATETYPE RenderStateType,
- DWORD Value)
+static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface,
+ D3DRENDERSTATETYPE state, DWORD value)
{
/* Note about D3DRENDERSTATE_TEXTUREMAPBLEND implementation: most of values
for this state can be directly mapped to texture stage colorop and alphaop, but
@@ -2781,26 +2690,26 @@ IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface,
GetTextureStageState and vice versa. Not so on Wine, but it is 'undefined' anyway so, probably, ok,
unless some broken game will be found that cares. */
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
HRESULT hr;
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
- TRACE("iface %p, state %#x, value %#x.\n", iface, RenderStateType, Value);
+ TRACE("iface %p, state %#x, value %#x.\n", iface, state, value);
wined3d_mutex_lock();
- switch(RenderStateType)
+ switch (state)
{
case D3DRENDERSTATE_TEXTUREHANDLE:
{
struct ddraw_surface *surf;
- if(Value == 0)
+ if (value == 0)
{
- hr = wined3d_device_set_texture(This->wined3d_device, 0, NULL);
+ hr = wined3d_device_set_texture(device->wined3d_device, 0, NULL);
break;
}
- surf = ddraw_get_object(&This->handle_table, Value - 1, DDRAW_HANDLE_SURFACE);
+ surf = ddraw_get_object(&device->handle_table, value - 1, DDRAW_HANDLE_SURFACE);
if (!surf)
{
WARN("Invalid texture handle.\n");
@@ -2814,9 +2723,9 @@ IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface,
case D3DRENDERSTATE_TEXTUREMAPBLEND:
{
- This->legacyTextureBlending = TRUE;
+ device->legacyTextureBlending = TRUE;
- switch ( (D3DTEXTUREBLEND) Value)
+ switch (value)
{
case D3DTBLEND_MODULATE:
{
@@ -2824,7 +2733,7 @@ IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface,
BOOL tex_alpha = FALSE;
DDPIXELFORMAT ddfmt;
- hr = wined3d_device_get_texture(This->wined3d_device, 0, &tex);
+ hr = wined3d_device_get_texture(device->wined3d_device, 0, &tex);
if(hr == WINED3D_OK && tex)
{
@@ -2844,79 +2753,79 @@ IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface,
}
if (tex_alpha)
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG1);
else
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG2);
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_ALPHA_ARG1, WINED3DTA_TEXTURE);
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_ALPHA_ARG2, WINED3DTA_CURRENT);
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_COLOR_ARG1, WINED3DTA_TEXTURE);
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_COLOR_ARG2, WINED3DTA_CURRENT);
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_COLOR_OP, WINED3D_TOP_MODULATE);
break;
}
case D3DTBLEND_ADD:
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_COLOR_OP, WINED3D_TOP_ADD);
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_COLOR_ARG1, WINED3DTA_TEXTURE);
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_COLOR_ARG2, WINED3DTA_CURRENT);
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG2);
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_ALPHA_ARG2, WINED3DTA_CURRENT);
break;
case D3DTBLEND_MODULATEALPHA:
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_COLOR_ARG1, WINED3DTA_TEXTURE);
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_ALPHA_ARG1, WINED3DTA_TEXTURE);
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_COLOR_ARG2, WINED3DTA_CURRENT);
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_ALPHA_ARG2, WINED3DTA_CURRENT);
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_COLOR_OP, WINED3D_TOP_MODULATE);
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_MODULATE);
break;
case D3DTBLEND_COPY:
case D3DTBLEND_DECAL:
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_COLOR_ARG1, WINED3DTA_TEXTURE);
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_ALPHA_ARG1, WINED3DTA_TEXTURE);
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_COLOR_OP, WINED3D_TOP_SELECT_ARG1);
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG1);
break;
case D3DTBLEND_DECALALPHA:
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_COLOR_OP, WINED3D_TOP_BLEND_TEXTURE_ALPHA);
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_COLOR_ARG1, WINED3DTA_TEXTURE);
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_COLOR_ARG2, WINED3DTA_CURRENT);
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG2);
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_ALPHA_ARG2, WINED3DTA_CURRENT);
break;
default:
- ERR("Unhandled texture environment %d !\n",Value);
+ FIXME("Unhandled texture environment %#x.\n", value);
}
hr = D3D_OK;
@@ -2924,7 +2833,7 @@ IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface,
}
default:
- hr = IDirect3DDevice7_SetRenderState(&This->IDirect3DDevice7_iface, RenderStateType, Value);
+ hr = IDirect3DDevice7_SetRenderState(&device->IDirect3DDevice7_iface, state, value);
break;
}
wined3d_mutex_unlock();
@@ -2932,14 +2841,14 @@ IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface,
return hr;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_SetRenderState(IDirect3DDevice2 *iface,
- D3DRENDERSTATETYPE RenderStateType, DWORD Value)
+static HRESULT WINAPI d3d_device2_SetRenderState(IDirect3DDevice2 *iface,
+ D3DRENDERSTATETYPE state, DWORD value)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
- TRACE("iface %p, state %#x, value %#x.\n", iface, RenderStateType, Value);
+ TRACE("iface %p, state %#x, value %#x.\n", iface, state, value);
- return IDirect3DDevice3_SetRenderState(&This->IDirect3DDevice3_iface, RenderStateType, Value);
+ return IDirect3DDevice3_SetRenderState(&device->IDirect3DDevice3_iface, state, value);
}
/*****************************************************************************
@@ -2960,26 +2869,24 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_SetRenderState(IDirect3DDevice2 *ifa
* Also check IDirect3DDevice7::SetRenderState
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_3_SetLightState(IDirect3DDevice3 *iface,
- D3DLIGHTSTATETYPE LightStateType,
- DWORD Value)
+static HRESULT WINAPI d3d_device3_SetLightState(IDirect3DDevice3 *iface,
+ D3DLIGHTSTATETYPE state, DWORD value)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
HRESULT hr;
- TRACE("iface %p, state %#x, value %#x.\n", iface, LightStateType, Value);
+ TRACE("iface %p, state %#x, value %#x.\n", iface, state, value);
- if (!LightStateType || (LightStateType > D3DLIGHTSTATE_COLORVERTEX))
+ if (!state || (state > D3DLIGHTSTATE_COLORVERTEX))
{
TRACE("Unexpected Light State Type\n");
return DDERR_INVALIDPARAMS;
}
wined3d_mutex_lock();
- if (LightStateType == D3DLIGHTSTATE_MATERIAL /* 1 */)
+ if (state == D3DLIGHTSTATE_MATERIAL)
{
- struct d3d_material *m = ddraw_get_object(&This->handle_table, Value - 1, DDRAW_HANDLE_MATERIAL);
+ struct d3d_material *m = ddraw_get_object(&device->handle_table, value - 1, DDRAW_HANDLE_MATERIAL);
if (!m)
{
WARN("Invalid material handle.\n");
@@ -2990,11 +2897,11 @@ IDirect3DDeviceImpl_3_SetLightState(IDirect3DDevice3 *iface,
TRACE(" activating material %p.\n", m);
material_activate(m);
- This->material = Value;
+ device->material = value;
}
- else if (LightStateType == D3DLIGHTSTATE_COLORMODEL /* 3 */)
+ else if (state == D3DLIGHTSTATE_COLORMODEL)
{
- switch (Value)
+ switch (value)
{
case D3DCOLOR_MONO:
ERR("DDCOLOR_MONO should not happen!\n");
@@ -3012,7 +2919,7 @@ IDirect3DDeviceImpl_3_SetLightState(IDirect3DDevice3 *iface,
else
{
D3DRENDERSTATETYPE rs;
- switch (LightStateType)
+ switch (state)
{
case D3DLIGHTSTATE_AMBIENT: /* 2 */
rs = D3DRENDERSTATE_AMBIENT;
@@ -3033,12 +2940,12 @@ IDirect3DDeviceImpl_3_SetLightState(IDirect3DDevice3 *iface,
rs = D3DRENDERSTATE_COLORVERTEX;
break;
default:
- ERR("Unknown D3DLIGHTSTATETYPE %d.\n", LightStateType);
+ FIXME("Unhandled D3DLIGHTSTATETYPE %#x.\n", state);
wined3d_mutex_unlock();
return DDERR_INVALIDPARAMS;
}
- hr = IDirect3DDevice7_SetRenderState(&This->IDirect3DDevice7_iface, rs, Value);
+ hr = IDirect3DDevice7_SetRenderState(&device->IDirect3DDevice7_iface, rs, value);
wined3d_mutex_unlock();
return hr;
}
@@ -3047,14 +2954,14 @@ IDirect3DDeviceImpl_3_SetLightState(IDirect3DDevice3 *iface,
return D3D_OK;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_SetLightState(IDirect3DDevice2 *iface,
- D3DLIGHTSTATETYPE LightStateType, DWORD Value)
+static HRESULT WINAPI d3d_device2_SetLightState(IDirect3DDevice2 *iface,
+ D3DLIGHTSTATETYPE state, DWORD value)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
- TRACE("iface %p, state %#x, value %#x.\n", iface, LightStateType, Value);
+ TRACE("iface %p, state %#x, value %#x.\n", iface, state, value);
- return IDirect3DDevice3_SetLightState(&This->IDirect3DDevice3_iface, LightStateType, Value);
+ return d3d_device3_SetLightState(&device->IDirect3DDevice3_iface, state, value);
}
/*****************************************************************************
@@ -3075,38 +2982,36 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_SetLightState(IDirect3DDevice2 *ifac
* Also see IDirect3DDevice7::GetRenderState
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_3_GetLightState(IDirect3DDevice3 *iface,
- D3DLIGHTSTATETYPE LightStateType,
- DWORD *Value)
+static HRESULT WINAPI d3d_device3_GetLightState(IDirect3DDevice3 *iface,
+ D3DLIGHTSTATETYPE state, DWORD *value)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
HRESULT hr;
- TRACE("iface %p, state %#x, value %p.\n", iface, LightStateType, Value);
+ TRACE("iface %p, state %#x, value %p.\n", iface, state, value);
- if (!LightStateType || (LightStateType > D3DLIGHTSTATE_COLORVERTEX))
+ if (!state || (state > D3DLIGHTSTATE_COLORVERTEX))
{
TRACE("Unexpected Light State Type\n");
return DDERR_INVALIDPARAMS;
}
- if(!Value)
+ if (!value)
return DDERR_INVALIDPARAMS;
wined3d_mutex_lock();
- if (LightStateType == D3DLIGHTSTATE_MATERIAL /* 1 */)
+ if (state == D3DLIGHTSTATE_MATERIAL)
{
- *Value = This->material;
+ *value = device->material;
}
- else if (LightStateType == D3DLIGHTSTATE_COLORMODEL /* 3 */)
+ else if (state == D3DLIGHTSTATE_COLORMODEL)
{
- *Value = D3DCOLOR_RGB;
+ *value = D3DCOLOR_RGB;
}
else
{
D3DRENDERSTATETYPE rs;
- switch (LightStateType)
+ switch (state)
{
case D3DLIGHTSTATE_AMBIENT: /* 2 */
rs = D3DRENDERSTATE_AMBIENT;
@@ -3127,12 +3032,12 @@ IDirect3DDeviceImpl_3_GetLightState(IDirect3DDevice3 *iface,
rs = D3DRENDERSTATE_COLORVERTEX;
break;
default:
- ERR("Unknown D3DLIGHTSTATETYPE %d.\n", LightStateType);
+ FIXME("Unhandled D3DLIGHTSTATETYPE %#x.\n", state);
wined3d_mutex_unlock();
return DDERR_INVALIDPARAMS;
}
- hr = IDirect3DDevice7_GetRenderState(&This->IDirect3DDevice7_iface, rs, Value);
+ hr = IDirect3DDevice7_GetRenderState(&device->IDirect3DDevice7_iface, rs, value);
wined3d_mutex_unlock();
return hr;
}
@@ -3141,14 +3046,14 @@ IDirect3DDeviceImpl_3_GetLightState(IDirect3DDevice3 *iface,
return D3D_OK;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_GetLightState(IDirect3DDevice2 *iface,
- D3DLIGHTSTATETYPE LightStateType, DWORD *Value)
+static HRESULT WINAPI d3d_device2_GetLightState(IDirect3DDevice2 *iface,
+ D3DLIGHTSTATETYPE state, DWORD *value)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
- TRACE("iface %p, state %#x, value %p.\n", iface, LightStateType, Value);
+ TRACE("iface %p, state %#x, value %p.\n", iface, state, value);
- return IDirect3DDevice3_GetLightState(&This->IDirect3DDevice3_iface, LightStateType, Value);
+ return d3d_device3_GetLightState(&device->IDirect3DDevice3_iface, state, value);
}
/*****************************************************************************
@@ -3172,73 +3077,67 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_GetLightState(IDirect3DDevice2 *ifac
* For details see IWineD3DDevice::SetTransform
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_SetTransform(IDirect3DDevice7 *iface,
- D3DTRANSFORMSTATETYPE TransformStateType,
- D3DMATRIX *Matrix)
+static HRESULT d3d_device7_SetTransform(IDirect3DDevice7 *iface,
+ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
- D3DTRANSFORMSTATETYPE type;
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
+ enum wined3d_transform_state wined3d_state;
HRESULT hr;
- TRACE("iface %p, state %#x, matrix %p.\n", iface, TransformStateType, Matrix);
+ TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix);
- switch (TransformStateType)
+ switch (state)
{
case D3DTRANSFORMSTATE_WORLD:
- type = WINED3D_TS_WORLD_MATRIX(0);
+ wined3d_state = WINED3D_TS_WORLD_MATRIX(0);
break;
case D3DTRANSFORMSTATE_WORLD1:
- type = WINED3D_TS_WORLD_MATRIX(1);
+ wined3d_state = WINED3D_TS_WORLD_MATRIX(1);
break;
case D3DTRANSFORMSTATE_WORLD2:
- type = WINED3D_TS_WORLD_MATRIX(2);
+ wined3d_state = WINED3D_TS_WORLD_MATRIX(2);
break;
case D3DTRANSFORMSTATE_WORLD3:
- type = WINED3D_TS_WORLD_MATRIX(3);
+ wined3d_state = WINED3D_TS_WORLD_MATRIX(3);
break;
default:
- type = TransformStateType;
+ wined3d_state = state;
}
- if (!Matrix)
+ if (!matrix)
return DDERR_INVALIDPARAMS;
/* Note: D3DMATRIX is compatible with struct wined3d_matrix. */
wined3d_mutex_lock();
- hr = wined3d_device_set_transform(This->wined3d_device, type, (struct wined3d_matrix *)Matrix);
+ hr = wined3d_device_set_transform(device->wined3d_device, wined3d_state, (struct wined3d_matrix *)matrix);
wined3d_mutex_unlock();
return hr;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_SetTransform_FPUSetup(IDirect3DDevice7 *iface,
- D3DTRANSFORMSTATETYPE TransformStateType,
- D3DMATRIX *Matrix)
+static HRESULT WINAPI d3d_device7_SetTransform_FPUSetup(IDirect3DDevice7 *iface,
+ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix)
{
- return IDirect3DDeviceImpl_7_SetTransform(iface, TransformStateType, Matrix);
+ return d3d_device7_SetTransform(iface, state, matrix);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_SetTransform_FPUPreserve(IDirect3DDevice7 *iface,
- D3DTRANSFORMSTATETYPE TransformStateType,
- D3DMATRIX *Matrix)
+static HRESULT WINAPI d3d_device7_SetTransform_FPUPreserve(IDirect3DDevice7 *iface,
+ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_SetTransform(iface, TransformStateType, Matrix);
+ hr = d3d_device7_SetTransform(iface, state, matrix);
set_fpu_control_word(old_fpucw);
return hr;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_3_SetTransform(IDirect3DDevice3 *iface,
+static HRESULT WINAPI d3d_device3_SetTransform(IDirect3DDevice3 *iface,
D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix);
@@ -3251,27 +3150,27 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_SetTransform(IDirect3DDevice3 *iface
HRESULT hr;
wined3d_mutex_lock();
- multiply_matrix(&projection, &This->legacy_clipspace, matrix);
- hr = wined3d_device_set_transform(This->wined3d_device,
+ multiply_matrix(&projection, &device->legacy_clipspace, matrix);
+ hr = wined3d_device_set_transform(device->wined3d_device,
WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection);
if (SUCCEEDED(hr))
- This->legacy_projection = *matrix;
+ device->legacy_projection = *matrix;
wined3d_mutex_unlock();
return hr;
}
- return IDirect3DDevice7_SetTransform(&This->IDirect3DDevice7_iface, state, matrix);
+ return IDirect3DDevice7_SetTransform(&device->IDirect3DDevice7_iface, state, matrix);
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_SetTransform(IDirect3DDevice2 *iface,
- D3DTRANSFORMSTATETYPE TransformStateType, D3DMATRIX *D3DMatrix)
+static HRESULT WINAPI d3d_device2_SetTransform(IDirect3DDevice2 *iface,
+ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
- TRACE("iface %p, state %#x, matrix %p.\n", iface, TransformStateType, D3DMatrix);
+ TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix);
- return IDirect3DDevice7_SetTransform(&This->IDirect3DDevice7_iface, TransformStateType, D3DMatrix);
+ return IDirect3DDevice7_SetTransform(&device->IDirect3DDevice7_iface, state, matrix);
}
/*****************************************************************************
@@ -3291,73 +3190,67 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_SetTransform(IDirect3DDevice2 *iface
* For details, see IWineD3DDevice::GetTransform
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_GetTransform(IDirect3DDevice7 *iface,
- D3DTRANSFORMSTATETYPE TransformStateType,
- D3DMATRIX *Matrix)
+static HRESULT d3d_device7_GetTransform(IDirect3DDevice7 *iface,
+ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
- D3DTRANSFORMSTATETYPE type;
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
+ enum wined3d_transform_state wined3d_state;
HRESULT hr;
- TRACE("iface %p, state %#x, matrix %p.\n", iface, TransformStateType, Matrix);
+ TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix);
- switch(TransformStateType)
+ switch (state)
{
case D3DTRANSFORMSTATE_WORLD:
- type = WINED3D_TS_WORLD_MATRIX(0);
+ wined3d_state = WINED3D_TS_WORLD_MATRIX(0);
break;
case D3DTRANSFORMSTATE_WORLD1:
- type = WINED3D_TS_WORLD_MATRIX(1);
+ wined3d_state = WINED3D_TS_WORLD_MATRIX(1);
break;
case D3DTRANSFORMSTATE_WORLD2:
- type = WINED3D_TS_WORLD_MATRIX(2);
+ wined3d_state = WINED3D_TS_WORLD_MATRIX(2);
break;
case D3DTRANSFORMSTATE_WORLD3:
- type = WINED3D_TS_WORLD_MATRIX(3);
+ wined3d_state = WINED3D_TS_WORLD_MATRIX(3);
break;
default:
- type = TransformStateType;
+ wined3d_state = state;
}
- if(!Matrix)
+ if (!matrix)
return DDERR_INVALIDPARAMS;
/* Note: D3DMATRIX is compatible with struct wined3d_matrix. */
wined3d_mutex_lock();
- hr = wined3d_device_get_transform(This->wined3d_device, type, (struct wined3d_matrix *)Matrix);
+ hr = wined3d_device_get_transform(device->wined3d_device, wined3d_state, (struct wined3d_matrix *)matrix);
wined3d_mutex_unlock();
return hr;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_GetTransform_FPUSetup(IDirect3DDevice7 *iface,
- D3DTRANSFORMSTATETYPE TransformStateType,
- D3DMATRIX *Matrix)
+static HRESULT WINAPI d3d_device7_GetTransform_FPUSetup(IDirect3DDevice7 *iface,
+ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix)
{
- return IDirect3DDeviceImpl_7_GetTransform(iface, TransformStateType, Matrix);
+ return d3d_device7_GetTransform(iface, state, matrix);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_GetTransform_FPUPreserve(IDirect3DDevice7 *iface,
- D3DTRANSFORMSTATETYPE TransformStateType,
- D3DMATRIX *Matrix)
+static HRESULT WINAPI d3d_device7_GetTransform_FPUPreserve(IDirect3DDevice7 *iface,
+ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_GetTransform(iface, TransformStateType, Matrix);
+ hr = d3d_device7_GetTransform(iface, state, matrix);
set_fpu_control_word(old_fpucw);
return hr;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_3_GetTransform(IDirect3DDevice3 *iface,
+static HRESULT WINAPI d3d_device3_GetTransform(IDirect3DDevice3 *iface,
D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix);
@@ -3367,22 +3260,22 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_GetTransform(IDirect3DDevice3 *iface
if (state == D3DTRANSFORMSTATE_PROJECTION)
{
wined3d_mutex_lock();
- *matrix = This->legacy_projection;
+ *matrix = device->legacy_projection;
wined3d_mutex_unlock();
return DD_OK;
}
- return IDirect3DDevice7_GetTransform(&This->IDirect3DDevice7_iface, state, matrix);
+ return IDirect3DDevice7_GetTransform(&device->IDirect3DDevice7_iface, state, matrix);
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_GetTransform(IDirect3DDevice2 *iface,
- D3DTRANSFORMSTATETYPE TransformStateType, D3DMATRIX *D3DMatrix)
+static HRESULT WINAPI d3d_device2_GetTransform(IDirect3DDevice2 *iface,
+ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
- TRACE("iface %p, state %#x, matrix %p.\n", iface, TransformStateType, D3DMatrix);
+ TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix);
- return IDirect3DDevice7_GetTransform(&This->IDirect3DDevice7_iface, TransformStateType, D3DMatrix);
+ return IDirect3DDevice7_GetTransform(&device->IDirect3DDevice7_iface, state, matrix);
}
/*****************************************************************************
@@ -3403,71 +3296,65 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_GetTransform(IDirect3DDevice2 *iface
* For details, see IWineD3DDevice::MultiplyTransform
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_MultiplyTransform(IDirect3DDevice7 *iface,
- D3DTRANSFORMSTATETYPE TransformStateType,
- D3DMATRIX *D3DMatrix)
+static HRESULT d3d_device7_MultiplyTransform(IDirect3DDevice7 *iface,
+ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
+ enum wined3d_transform_state wined3d_state;
HRESULT hr;
- D3DTRANSFORMSTATETYPE type;
- TRACE("iface %p, state %#x, matrix %p.\n", iface, TransformStateType, D3DMatrix);
+ TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix);
- switch(TransformStateType)
+ switch (state)
{
case D3DTRANSFORMSTATE_WORLD:
- type = WINED3D_TS_WORLD_MATRIX(0);
+ wined3d_state = WINED3D_TS_WORLD_MATRIX(0);
break;
case D3DTRANSFORMSTATE_WORLD1:
- type = WINED3D_TS_WORLD_MATRIX(1);
+ wined3d_state = WINED3D_TS_WORLD_MATRIX(1);
break;
case D3DTRANSFORMSTATE_WORLD2:
- type = WINED3D_TS_WORLD_MATRIX(2);
+ wined3d_state = WINED3D_TS_WORLD_MATRIX(2);
break;
case D3DTRANSFORMSTATE_WORLD3:
- type = WINED3D_TS_WORLD_MATRIX(3);
+ wined3d_state = WINED3D_TS_WORLD_MATRIX(3);
break;
default:
- type = TransformStateType;
+ wined3d_state = state;
}
/* Note: D3DMATRIX is compatible with struct wined3d_matrix. */
wined3d_mutex_lock();
- hr = wined3d_device_multiply_transform(This->wined3d_device,
- type, (struct wined3d_matrix *)D3DMatrix);
+ hr = wined3d_device_multiply_transform(device->wined3d_device,
+ wined3d_state, (struct wined3d_matrix *)matrix);
wined3d_mutex_unlock();
return hr;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_MultiplyTransform_FPUSetup(IDirect3DDevice7 *iface,
- D3DTRANSFORMSTATETYPE TransformStateType,
- D3DMATRIX *D3DMatrix)
+static HRESULT WINAPI d3d_device7_MultiplyTransform_FPUSetup(IDirect3DDevice7 *iface,
+ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix)
{
- return IDirect3DDeviceImpl_7_MultiplyTransform(iface, TransformStateType, D3DMatrix);
+ return d3d_device7_MultiplyTransform(iface, state, matrix);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_MultiplyTransform_FPUPreserve(IDirect3DDevice7 *iface,
- D3DTRANSFORMSTATETYPE TransformStateType,
- D3DMATRIX *D3DMatrix)
+static HRESULT WINAPI d3d_device7_MultiplyTransform_FPUPreserve(IDirect3DDevice7 *iface,
+ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_MultiplyTransform(iface, TransformStateType, D3DMatrix);
+ hr = d3d_device7_MultiplyTransform(iface, state, matrix);
set_fpu_control_word(old_fpucw);
return hr;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_3_MultiplyTransform(IDirect3DDevice3 *iface,
+static HRESULT WINAPI d3d_device3_MultiplyTransform(IDirect3DDevice3 *iface,
D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix);
@@ -3477,28 +3364,28 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_MultiplyTransform(IDirect3DDevice3 *
HRESULT hr;
wined3d_mutex_lock();
- multiply_matrix(&tmp, &This->legacy_projection, matrix);
- multiply_matrix(&projection, &This->legacy_clipspace, &tmp);
- hr = wined3d_device_set_transform(This->wined3d_device,
+ multiply_matrix(&tmp, &device->legacy_projection, matrix);
+ multiply_matrix(&projection, &device->legacy_clipspace, &tmp);
+ hr = wined3d_device_set_transform(device->wined3d_device,
WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection);
if (SUCCEEDED(hr))
- This->legacy_projection = tmp;
+ device->legacy_projection = tmp;
wined3d_mutex_unlock();
return hr;
}
- return IDirect3DDevice7_MultiplyTransform(&This->IDirect3DDevice7_iface, state, matrix);
+ return IDirect3DDevice7_MultiplyTransform(&device->IDirect3DDevice7_iface, state, matrix);
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_MultiplyTransform(IDirect3DDevice2 *iface,
- D3DTRANSFORMSTATETYPE TransformStateType, D3DMATRIX *D3DMatrix)
+static HRESULT WINAPI d3d_device2_MultiplyTransform(IDirect3DDevice2 *iface,
+ D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
- TRACE("iface %p, state %#x, matrix %p.\n", iface, TransformStateType, D3DMatrix);
+ TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix);
- return IDirect3DDevice7_MultiplyTransform(&This->IDirect3DDevice7_iface, TransformStateType, D3DMatrix);
+ return IDirect3DDevice7_MultiplyTransform(&device->IDirect3DDevice7_iface, state, matrix);
}
/*****************************************************************************
@@ -3522,107 +3409,96 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_MultiplyTransform(IDirect3DDevice2 *
* For details, see IWineD3DDevice::DrawPrimitiveUP
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_DrawPrimitive(IDirect3DDevice7 *iface,
- D3DPRIMITIVETYPE PrimitiveType,
- DWORD VertexType,
- void *Vertices,
- DWORD VertexCount,
- DWORD Flags)
-{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+static HRESULT d3d_device7_DrawPrimitive(IDirect3DDevice7 *iface,
+ D3DPRIMITIVETYPE primitive_type, DWORD fvf, void *vertices,
+ DWORD vertex_count, DWORD flags)
+{
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
UINT stride;
HRESULT hr;
- TRACE("iface %p, primitive_type %#x, FVF %#x, vertices %p, vertex_count %u, flags %#x.\n",
- iface, PrimitiveType, VertexType, Vertices, VertexCount, Flags);
+ TRACE("iface %p, primitive_type %#x, fvf %#x, vertices %p, vertex_count %u, flags %#x.\n",
+ iface, primitive_type, fvf, vertices, vertex_count, flags);
- if(!Vertices)
+ if (!vertices)
return DDERR_INVALIDPARAMS;
/* Get the stride */
- stride = get_flexible_vertex_size(VertexType);
+ stride = get_flexible_vertex_size(fvf);
/* Set the FVF */
wined3d_mutex_lock();
- hr = wined3d_device_set_vertex_declaration(This->wined3d_device, ddraw_find_decl(This->ddraw, VertexType));
- if(hr != D3D_OK)
+ hr = wined3d_device_set_vertex_declaration(device->wined3d_device, ddraw_find_decl(device->ddraw, fvf));
+ if (hr != D3D_OK)
{
wined3d_mutex_unlock();
return hr;
}
/* This method translates to the user pointer draw of WineD3D */
- wined3d_device_set_primitive_type(This->wined3d_device, PrimitiveType);
- hr = wined3d_device_draw_primitive_up(This->wined3d_device, VertexCount, Vertices, stride);
+ wined3d_device_set_primitive_type(device->wined3d_device, primitive_type);
+ hr = wined3d_device_draw_primitive_up(device->wined3d_device, vertex_count, vertices, stride);
wined3d_mutex_unlock();
return hr;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_DrawPrimitive_FPUSetup(IDirect3DDevice7 *iface,
- D3DPRIMITIVETYPE PrimitiveType,
- DWORD VertexType,
- void *Vertices,
- DWORD VertexCount,
- DWORD Flags)
+static HRESULT WINAPI d3d_device7_DrawPrimitive_FPUSetup(IDirect3DDevice7 *iface,
+ D3DPRIMITIVETYPE primitive_type, DWORD fvf, void *vertices,
+ DWORD vertex_count, DWORD flags)
{
- return IDirect3DDeviceImpl_7_DrawPrimitive(iface, PrimitiveType, VertexType, Vertices, VertexCount, Flags);
+ return d3d_device7_DrawPrimitive(iface, primitive_type, fvf, vertices, vertex_count, flags);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_DrawPrimitive_FPUPreserve(IDirect3DDevice7 *iface,
- D3DPRIMITIVETYPE PrimitiveType,
- DWORD VertexType,
- void *Vertices,
- DWORD VertexCount,
- DWORD Flags)
+static HRESULT WINAPI d3d_device7_DrawPrimitive_FPUPreserve(IDirect3DDevice7 *iface,
+ D3DPRIMITIVETYPE primitive_type, DWORD fvf, void *vertices,
+ DWORD vertex_count, DWORD flags)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_DrawPrimitive(iface, PrimitiveType, VertexType, Vertices, VertexCount, Flags);
+ hr = d3d_device7_DrawPrimitive(iface, primitive_type, fvf, vertices, vertex_count, flags);
set_fpu_control_word(old_fpucw);
return hr;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_3_DrawPrimitive(IDirect3DDevice3 *iface,
- D3DPRIMITIVETYPE PrimitiveType, DWORD VertexType, void *Vertices, DWORD VertexCount,
- DWORD Flags)
+static HRESULT WINAPI d3d_device3_DrawPrimitive(IDirect3DDevice3 *iface,
+ D3DPRIMITIVETYPE primitive_type, DWORD fvf, void *vertices, DWORD vertex_count,
+ DWORD flags)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
- TRACE("iface %p, primitive_type %#x, FVF %#x, vertices %p, vertex_count %u, flags %#x.\n",
- iface, PrimitiveType, VertexType, Vertices, VertexCount, Flags);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
+
+ TRACE("iface %p, primitive_type %#x, fvf %#x, vertices %p, vertex_count %u, flags %#x.\n",
+ iface, primitive_type, fvf, vertices, vertex_count, flags);
- return IDirect3DDevice7_DrawPrimitive(&This->IDirect3DDevice7_iface,
- PrimitiveType, VertexType, Vertices, VertexCount, Flags);
+ return IDirect3DDevice7_DrawPrimitive(&device->IDirect3DDevice7_iface,
+ primitive_type, fvf, vertices, vertex_count, flags);
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_DrawPrimitive(IDirect3DDevice2 *iface,
- D3DPRIMITIVETYPE PrimitiveType, D3DVERTEXTYPE VertexType, void *Vertices,
- DWORD VertexCount, DWORD Flags)
+static HRESULT WINAPI d3d_device2_DrawPrimitive(IDirect3DDevice2 *iface,
+ D3DPRIMITIVETYPE primitive_type, D3DVERTEXTYPE vertex_type, void *vertices,
+ DWORD vertex_count, DWORD flags)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
- DWORD FVF;
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
+ DWORD fvf;
TRACE("iface %p, primitive_type %#x, vertex_type %#x, vertices %p, vertex_count %u, flags %#x.\n",
- iface, PrimitiveType, VertexType, Vertices, VertexCount, Flags);
+ iface, primitive_type, vertex_type, vertices, vertex_count, flags);
- switch(VertexType)
+ switch (vertex_type)
{
- case D3DVT_VERTEX: FVF = D3DFVF_VERTEX; break;
- case D3DVT_LVERTEX: FVF = D3DFVF_LVERTEX; break;
- case D3DVT_TLVERTEX: FVF = D3DFVF_TLVERTEX; break;
+ case D3DVT_VERTEX: fvf = D3DFVF_VERTEX; break;
+ case D3DVT_LVERTEX: fvf = D3DFVF_LVERTEX; break;
+ case D3DVT_TLVERTEX: fvf = D3DFVF_TLVERTEX; break;
default:
- ERR("Unexpected vertex type %d\n", VertexType);
+ FIXME("Unhandled vertex type %#x.\n", vertex_type);
return DDERR_INVALIDPARAMS; /* Should never happen */
}
- return IDirect3DDevice7_DrawPrimitive(&This->IDirect3DDevice7_iface,
- PrimitiveType, FVF, Vertices, VertexCount, Flags);
+ return IDirect3DDevice7_DrawPrimitive(&device->IDirect3DDevice7_iface,
+ primitive_type, fvf, vertices, vertex_count, flags);
}
/*****************************************************************************
@@ -3649,107 +3525,95 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_DrawPrimitive(IDirect3DDevice2 *ifac
* For details, see IWineD3DDevice::DrawIndexedPrimitiveUP
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_DrawIndexedPrimitive(IDirect3DDevice7 *iface,
- D3DPRIMITIVETYPE PrimitiveType,
- DWORD VertexType,
- void *Vertices,
- DWORD VertexCount,
- WORD *Indices,
- DWORD IndexCount,
- DWORD Flags)
-{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface,
+ D3DPRIMITIVETYPE primitive_type, DWORD fvf, void *vertices, DWORD vertex_count,
+ WORD *indices, DWORD index_count, DWORD flags)
+{
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
HRESULT hr;
- TRACE("iface %p, primitive_type %#x, FVF %#x, vertices %p, vertex_count %u, indices %p, index_count %u, flags %#x.\n",
- iface, PrimitiveType, VertexType, Vertices, VertexCount, Indices, IndexCount, Flags);
+ TRACE("iface %p, primitive_type %#x, fvf %#x, vertices %p, vertex_count %u, "
+ "indices %p, index_count %u, flags %#x.\n",
+ iface, primitive_type, fvf, vertices, vertex_count, indices, index_count, flags);
/* Set the D3DDevice's FVF */
wined3d_mutex_lock();
- hr = wined3d_device_set_vertex_declaration(This->wined3d_device, ddraw_find_decl(This->ddraw, VertexType));
- if(FAILED(hr))
+ hr = wined3d_device_set_vertex_declaration(device->wined3d_device, ddraw_find_decl(device->ddraw, fvf));
+ if (FAILED(hr))
{
- ERR(" (%p) Setting the FVF failed, hr = %x!\n", This, hr);
+ WARN("Failed to set vertex declaration, hr %#x.\n", hr);
wined3d_mutex_unlock();
return hr;
}
- wined3d_device_set_primitive_type(This->wined3d_device, PrimitiveType);
- hr = wined3d_device_draw_indexed_primitive_up(This->wined3d_device, IndexCount, Indices,
- WINED3DFMT_R16_UINT, Vertices, get_flexible_vertex_size(VertexType));
+ wined3d_device_set_primitive_type(device->wined3d_device, primitive_type);
+ hr = wined3d_device_draw_indexed_primitive_up(device->wined3d_device, index_count, indices,
+ WINED3DFMT_R16_UINT, vertices, get_flexible_vertex_size(fvf));
wined3d_mutex_unlock();
return hr;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_DrawIndexedPrimitive_FPUSetup(IDirect3DDevice7 *iface,
- D3DPRIMITIVETYPE PrimitiveType,
- DWORD VertexType,
- void *Vertices,
- DWORD VertexCount,
- WORD *Indices,
- DWORD IndexCount,
- DWORD Flags)
+static HRESULT WINAPI d3d_device7_DrawIndexedPrimitive_FPUSetup(IDirect3DDevice7 *iface,
+ D3DPRIMITIVETYPE primitive_type, DWORD fvf, void *vertices, DWORD vertex_count,
+ WORD *indices, DWORD index_count, DWORD flags)
{
- return IDirect3DDeviceImpl_7_DrawIndexedPrimitive(iface, PrimitiveType, VertexType, Vertices, VertexCount, Indices, IndexCount, Flags);
+ return d3d_device7_DrawIndexedPrimitive(iface, primitive_type, fvf,
+ vertices, vertex_count, indices, index_count, flags);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_DrawIndexedPrimitive_FPUPreserve(IDirect3DDevice7 *iface,
- D3DPRIMITIVETYPE PrimitiveType,
- DWORD VertexType,
- void *Vertices,
- DWORD VertexCount,
- WORD *Indices,
- DWORD IndexCount,
- DWORD Flags)
+static HRESULT WINAPI d3d_device7_DrawIndexedPrimitive_FPUPreserve(IDirect3DDevice7 *iface,
+ D3DPRIMITIVETYPE primitive_type, DWORD fvf, void *vertices, DWORD vertex_count,
+ WORD *indices, DWORD index_count, DWORD flags)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_DrawIndexedPrimitive(iface, PrimitiveType, VertexType, Vertices, VertexCount, Indices, IndexCount, Flags);
+ hr = d3d_device7_DrawIndexedPrimitive(iface, primitive_type, fvf,
+ vertices, vertex_count, indices, index_count, flags);
set_fpu_control_word(old_fpucw);
return hr;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_3_DrawIndexedPrimitive(IDirect3DDevice3 *iface,
- D3DPRIMITIVETYPE PrimitiveType, DWORD VertexType, void *Vertices, DWORD VertexCount,
- WORD *Indices, DWORD IndexCount, DWORD Flags)
+static HRESULT WINAPI d3d_device3_DrawIndexedPrimitive(IDirect3DDevice3 *iface,
+ D3DPRIMITIVETYPE primitive_type, DWORD fvf, void *vertices, DWORD vertex_count,
+ WORD *indices, DWORD index_count, DWORD flags)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
- TRACE("iface %p, primitive_type %#x, FVF %#x, vertices %p, vertex_count %u, indices %p, index_count %u, flags %#x.\n",
- iface, PrimitiveType, VertexType, Vertices, VertexCount, Indices, IndexCount, Flags);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
- return IDirect3DDevice7_DrawIndexedPrimitive(&This->IDirect3DDevice7_iface,
- PrimitiveType, VertexType, Vertices, VertexCount, Indices, IndexCount, Flags);
+ TRACE("iface %p, primitive_type %#x, fvf %#x, vertices %p, vertex_count %u, "
+ "indices %p, index_count %u, flags %#x.\n",
+ iface, primitive_type, fvf, vertices, vertex_count, indices, index_count, flags);
+
+ return IDirect3DDevice7_DrawIndexedPrimitive(&device->IDirect3DDevice7_iface,
+ primitive_type, fvf, vertices, vertex_count, indices, index_count, flags);
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_DrawIndexedPrimitive(IDirect3DDevice2 *iface,
- D3DPRIMITIVETYPE PrimitiveType, D3DVERTEXTYPE VertexType, void *Vertices,
- DWORD VertexCount, WORD *Indices, DWORD IndexCount, DWORD Flags)
+static HRESULT WINAPI d3d_device2_DrawIndexedPrimitive(IDirect3DDevice2 *iface,
+ D3DPRIMITIVETYPE primitive_type, D3DVERTEXTYPE vertex_type, void *vertices,
+ DWORD vertex_count, WORD *indices, DWORD index_count, DWORD flags)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
- DWORD FVF;
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
+ DWORD fvf;
- TRACE("iface %p, primitive_type %#x, vertex_type %#x, vertices %p, vertex_count %u, indices %p, index_count %u, flags %#x.\n",
- iface, PrimitiveType, VertexType, Vertices, VertexCount, Indices, IndexCount, Flags);
+ TRACE("iface %p, primitive_type %#x, vertex_type %#x, vertices %p, vertex_count %u, "
+ "indices %p, index_count %u, flags %#x.\n",
+ iface, primitive_type, vertex_type, vertices, vertex_count, indices, index_count, flags);
- switch(VertexType)
+ switch (vertex_type)
{
- case D3DVT_VERTEX: FVF = D3DFVF_VERTEX; break;
- case D3DVT_LVERTEX: FVF = D3DFVF_LVERTEX; break;
- case D3DVT_TLVERTEX: FVF = D3DFVF_TLVERTEX; break;
+ case D3DVT_VERTEX: fvf = D3DFVF_VERTEX; break;
+ case D3DVT_LVERTEX: fvf = D3DFVF_LVERTEX; break;
+ case D3DVT_TLVERTEX: fvf = D3DFVF_TLVERTEX; break;
default:
- ERR("Unexpected vertex type %d\n", VertexType);
+ ERR("Unhandled vertex type %#x.\n", vertex_type);
return DDERR_INVALIDPARAMS; /* Should never happen */
}
- return IDirect3DDevice7_DrawIndexedPrimitive(&This->IDirect3DDevice7_iface,
- PrimitiveType, FVF, Vertices, VertexCount, Indices, IndexCount, Flags);
+ return IDirect3DDevice7_DrawIndexedPrimitive(&device->IDirect3DDevice7_iface,
+ primitive_type, fvf, vertices, vertex_count, indices, index_count, flags);
}
/*****************************************************************************
@@ -3768,11 +3632,9 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_DrawIndexedPrimitive(IDirect3DDevice
* (DDERR_INVALIDPARAMS if ClipStatus == NULL)
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_SetClipStatus(IDirect3DDevice7 *iface,
- D3DCLIPSTATUS *ClipStatus)
+static HRESULT WINAPI d3d_device7_SetClipStatus(IDirect3DDevice7 *iface, D3DCLIPSTATUS *clip_status)
{
- FIXME("iface %p, clip_status %p stub!\n", iface, ClipStatus);
+ FIXME("iface %p, clip_status %p stub!\n", iface, clip_status);
/* D3DCLIPSTATUS and WINED3DCLIPSTATUS are different. I don't know how to convert them
* Perhaps this needs a new data type and an additional IWineD3DDevice method
@@ -3781,22 +3643,22 @@ IDirect3DDeviceImpl_7_SetClipStatus(IDirect3DDevice7 *iface,
return D3D_OK;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_3_SetClipStatus(IDirect3DDevice3 *iface,
- D3DCLIPSTATUS *ClipStatus)
+static HRESULT WINAPI d3d_device3_SetClipStatus(IDirect3DDevice3 *iface, D3DCLIPSTATUS *clip_status)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
- TRACE("iface %p, clip_status %p.\n", iface, ClipStatus);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
+
+ TRACE("iface %p, clip_status %p.\n", iface, clip_status);
- return IDirect3DDevice7_SetClipStatus(&This->IDirect3DDevice7_iface, ClipStatus);
+ return IDirect3DDevice7_SetClipStatus(&device->IDirect3DDevice7_iface, clip_status);
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_SetClipStatus(IDirect3DDevice2 *iface,
- D3DCLIPSTATUS *ClipStatus)
+static HRESULT WINAPI d3d_device2_SetClipStatus(IDirect3DDevice2 *iface, D3DCLIPSTATUS *clip_status)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
- TRACE("iface %p, clip_status %p.\n", iface, ClipStatus);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
- return IDirect3DDevice7_SetClipStatus(&This->IDirect3DDevice7_iface, ClipStatus);
+ TRACE("iface %p, clip_status %p.\n", iface, clip_status);
+
+ return IDirect3DDevice7_SetClipStatus(&device->IDirect3DDevice7_iface, clip_status);
}
/*****************************************************************************
@@ -3811,33 +3673,31 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_SetClipStatus(IDirect3DDevice2 *ifac
* D3D_OK because it's a stub
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_GetClipStatus(IDirect3DDevice7 *iface,
- D3DCLIPSTATUS *ClipStatus)
+static HRESULT WINAPI d3d_device7_GetClipStatus(IDirect3DDevice7 *iface, D3DCLIPSTATUS *clip_status)
{
- FIXME("iface %p, clip_status %p stub!\n", iface, ClipStatus);
+ FIXME("iface %p, clip_status %p stub!\n", iface, clip_status);
/* D3DCLIPSTATUS and WINED3DCLIPSTATUS are different. I don't know how to convert them */
/* return IWineD3DDevice_GetClipStatus(This->wineD3DDevice, ClipStatus);*/
return D3D_OK;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_3_GetClipStatus(IDirect3DDevice3 *iface,
- D3DCLIPSTATUS *ClipStatus)
+static HRESULT WINAPI d3d_device3_GetClipStatus(IDirect3DDevice3 *iface, D3DCLIPSTATUS *clip_status)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
- TRACE("iface %p, clip_status %p.\n", iface, ClipStatus);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
+
+ TRACE("iface %p, clip_status %p.\n", iface, clip_status);
- return IDirect3DDevice7_GetClipStatus(&This->IDirect3DDevice7_iface, ClipStatus);
+ return IDirect3DDevice7_GetClipStatus(&device->IDirect3DDevice7_iface, clip_status);
}
-static HRESULT WINAPI IDirect3DDeviceImpl_2_GetClipStatus(IDirect3DDevice2 *iface,
- D3DCLIPSTATUS *ClipStatus)
+static HRESULT WINAPI d3d_device2_GetClipStatus(IDirect3DDevice2 *iface, D3DCLIPSTATUS *clip_status)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice2(iface);
- TRACE("iface %p, clip_status %p.\n", iface, ClipStatus);
+ struct d3d_device *device = impl_from_IDirect3DDevice2(iface);
- return IDirect3DDevice7_GetClipStatus(&This->IDirect3DDevice7_iface, ClipStatus);
+ TRACE("iface %p, clip_status %p.\n", iface, clip_status);
+
+ return IDirect3DDevice7_GetClipStatus(&device->IDirect3DDevice7_iface, clip_status);
}
/*****************************************************************************
@@ -3861,15 +3721,10 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_GetClipStatus(IDirect3DDevice2 *ifac
* (For details, see IWineD3DDevice::DrawPrimitiveStrided)
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_DrawPrimitiveStrided(IDirect3DDevice7 *iface,
- D3DPRIMITIVETYPE PrimitiveType,
- DWORD VertexType,
- D3DDRAWPRIMITIVESTRIDEDDATA *D3DDrawPrimStrideData,
- DWORD VertexCount,
- DWORD Flags)
-{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+static HRESULT d3d_device7_DrawPrimitiveStrided(IDirect3DDevice7 *iface, D3DPRIMITIVETYPE PrimitiveType,
+ DWORD VertexType, D3DDRAWPRIMITIVESTRIDEDDATA *D3DDrawPrimStrideData, DWORD VertexCount, DWORD Flags)
+{
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
struct wined3d_strided_data wined3d_strided;
DWORD i;
HRESULT hr;
@@ -3938,52 +3793,46 @@ IDirect3DDeviceImpl_7_DrawPrimitiveStrided(IDirect3DDevice7 *iface,
/* WineD3D doesn't need the FVF here */
wined3d_mutex_lock();
- wined3d_device_set_primitive_type(This->wined3d_device, PrimitiveType);
- hr = wined3d_device_draw_primitive_strided(This->wined3d_device, VertexCount, &wined3d_strided);
+ wined3d_device_set_primitive_type(device->wined3d_device, PrimitiveType);
+ hr = wined3d_device_draw_primitive_strided(device->wined3d_device, VertexCount, &wined3d_strided);
wined3d_mutex_unlock();
return hr;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_DrawPrimitiveStrided_FPUSetup(IDirect3DDevice7 *iface,
- D3DPRIMITIVETYPE PrimitiveType,
- DWORD VertexType,
- D3DDRAWPRIMITIVESTRIDEDDATA *D3DDrawPrimStrideData,
- DWORD VertexCount,
- DWORD Flags)
+static HRESULT WINAPI d3d_device7_DrawPrimitiveStrided_FPUSetup(IDirect3DDevice7 *iface,
+ D3DPRIMITIVETYPE PrimitiveType, DWORD VertexType,
+ D3DDRAWPRIMITIVESTRIDEDDATA *D3DDrawPrimStrideData, DWORD VertexCount, DWORD Flags)
{
- return IDirect3DDeviceImpl_7_DrawPrimitiveStrided(iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Flags);
+ return d3d_device7_DrawPrimitiveStrided(iface, PrimitiveType,
+ VertexType, D3DDrawPrimStrideData, VertexCount, Flags);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_DrawPrimitiveStrided_FPUPreserve(IDirect3DDevice7 *iface,
- D3DPRIMITIVETYPE PrimitiveType,
- DWORD VertexType,
- D3DDRAWPRIMITIVESTRIDEDDATA *D3DDrawPrimStrideData,
- DWORD VertexCount,
- DWORD Flags)
+static HRESULT WINAPI d3d_device7_DrawPrimitiveStrided_FPUPreserve(IDirect3DDevice7 *iface,
+ D3DPRIMITIVETYPE PrimitiveType, DWORD VertexType,
+ D3DDRAWPRIMITIVESTRIDEDDATA *D3DDrawPrimStrideData, DWORD VertexCount, DWORD Flags)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_DrawPrimitiveStrided(iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Flags);
+ hr = d3d_device7_DrawPrimitiveStrided(iface, PrimitiveType,
+ VertexType, D3DDrawPrimStrideData, VertexCount, Flags);
set_fpu_control_word(old_fpucw);
return hr;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_3_DrawPrimitiveStrided(IDirect3DDevice3 *iface,
+static HRESULT WINAPI d3d_device3_DrawPrimitiveStrided(IDirect3DDevice3 *iface,
D3DPRIMITIVETYPE PrimitiveType, DWORD VertexType,
D3DDRAWPRIMITIVESTRIDEDDATA *D3DDrawPrimStrideData, DWORD VertexCount, DWORD Flags)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
TRACE("iface %p, primitive_type %#x, FVF %#x, strided_data %p, vertex_count %u, flags %#x.\n",
iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Flags);
- return IDirect3DDevice7_DrawPrimitiveStrided(&This->IDirect3DDevice7_iface,
+ return IDirect3DDevice7_DrawPrimitiveStrided(&device->IDirect3DDevice7_iface,
PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Flags);
}
@@ -4004,17 +3853,12 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_DrawPrimitiveStrided(IDirect3DDevice
* (For more details, see IWineD3DDevice::DrawIndexedPrimitiveStrided)
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface,
- D3DPRIMITIVETYPE PrimitiveType,
- DWORD VertexType,
- D3DDRAWPRIMITIVESTRIDEDDATA *D3DDrawPrimStrideData,
- DWORD VertexCount,
- WORD *Indices,
- DWORD IndexCount,
- DWORD Flags)
-{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+static HRESULT d3d_device7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface,
+ D3DPRIMITIVETYPE PrimitiveType, DWORD VertexType,
+ D3DDRAWPRIMITIVESTRIDEDDATA *D3DDrawPrimStrideData, DWORD VertexCount,
+ WORD *Indices, DWORD IndexCount, DWORD Flags)
+{
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
struct wined3d_strided_data wined3d_strided;
DWORD i;
HRESULT hr;
@@ -4082,58 +3926,50 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface,
/* WineD3D doesn't need the FVF here */
wined3d_mutex_lock();
- wined3d_device_set_primitive_type(This->wined3d_device, PrimitiveType);
- hr = wined3d_device_draw_indexed_primitive_strided(This->wined3d_device,
+ wined3d_device_set_primitive_type(device->wined3d_device, PrimitiveType);
+ hr = wined3d_device_draw_indexed_primitive_strided(device->wined3d_device,
IndexCount, &wined3d_strided, VertexCount, Indices, WINED3DFMT_R16_UINT);
wined3d_mutex_unlock();
return hr;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_DrawIndexedPrimitiveStrided_FPUSetup(IDirect3DDevice7 *iface,
- D3DPRIMITIVETYPE PrimitiveType,
- DWORD VertexType,
- D3DDRAWPRIMITIVESTRIDEDDATA *D3DDrawPrimStrideData,
- DWORD VertexCount,
- WORD *Indices,
- DWORD IndexCount,
- DWORD Flags)
+static HRESULT WINAPI d3d_device7_DrawIndexedPrimitiveStrided_FPUSetup(IDirect3DDevice7 *iface,
+ D3DPRIMITIVETYPE PrimitiveType, DWORD VertexType,
+ D3DDRAWPRIMITIVESTRIDEDDATA *D3DDrawPrimStrideData, DWORD VertexCount,
+ WORD *Indices, DWORD IndexCount, DWORD Flags)
{
- return IDirect3DDeviceImpl_7_DrawIndexedPrimitiveStrided(iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags);
+ return d3d_device7_DrawIndexedPrimitiveStrided(iface, PrimitiveType, VertexType,
+ D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_DrawIndexedPrimitiveStrided_FPUPreserve(IDirect3DDevice7 *iface,
- D3DPRIMITIVETYPE PrimitiveType,
- DWORD VertexType,
- D3DDRAWPRIMITIVESTRIDEDDATA *D3DDrawPrimStrideData,
- DWORD VertexCount,
- WORD *Indices,
- DWORD IndexCount,
- DWORD Flags)
+static HRESULT WINAPI d3d_device7_DrawIndexedPrimitiveStrided_FPUPreserve(IDirect3DDevice7 *iface,
+ D3DPRIMITIVETYPE PrimitiveType, DWORD VertexType,
+ D3DDRAWPRIMITIVESTRIDEDDATA *D3DDrawPrimStrideData, DWORD VertexCount,
+ WORD *Indices, DWORD IndexCount, DWORD Flags)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_DrawIndexedPrimitiveStrided(iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags);
+ hr = d3d_device7_DrawIndexedPrimitiveStrided(iface, PrimitiveType, VertexType,
+ D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags);
set_fpu_control_word(old_fpucw);
return hr;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_3_DrawIndexedPrimitiveStrided(IDirect3DDevice3 *iface,
+static HRESULT WINAPI d3d_device3_DrawIndexedPrimitiveStrided(IDirect3DDevice3 *iface,
D3DPRIMITIVETYPE PrimitiveType, DWORD VertexType,
D3DDRAWPRIMITIVESTRIDEDDATA *D3DDrawPrimStrideData, DWORD VertexCount, WORD *Indices,
DWORD IndexCount, DWORD Flags)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
TRACE("iface %p, primitive_type %#x, FVF %#x, strided_data %p, vertex_count %u, indices %p, index_count %u, flags %#x.\n",
iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags);
- return IDirect3DDevice7_DrawIndexedPrimitiveStrided(&This->IDirect3DDevice7_iface,
+ return IDirect3DDevice7_DrawIndexedPrimitiveStrided(&device->IDirect3DDevice7_iface,
PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags);
}
@@ -4156,15 +3992,10 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_DrawIndexedPrimitiveStrided(IDirect3
* DDERR_INVALIDPARAMS if D3DVertexBuf is NULL
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_DrawPrimitiveVB(IDirect3DDevice7 *iface,
- D3DPRIMITIVETYPE PrimitiveType,
- IDirect3DVertexBuffer7 *D3DVertexBuf,
- DWORD StartVertex,
- DWORD NumVertices,
- DWORD Flags)
-{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVETYPE PrimitiveType,
+ IDirect3DVertexBuffer7 *D3DVertexBuf, DWORD StartVertex, DWORD NumVertices, DWORD Flags)
+{
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
IDirect3DVertexBufferImpl *vb = unsafe_impl_from_IDirect3DVertexBuffer7(D3DVertexBuf);
HRESULT hr;
DWORD stride;
@@ -4173,79 +4004,68 @@ IDirect3DDeviceImpl_7_DrawPrimitiveVB(IDirect3DDevice7 *iface,
iface, PrimitiveType, D3DVertexBuf, StartVertex, NumVertices, Flags);
/* Sanity checks */
- if(!vb)
+ if (!vb)
{
- ERR("(%p) No Vertex buffer specified\n", This);
+ WARN("No Vertex buffer specified.\n");
return DDERR_INVALIDPARAMS;
}
stride = get_flexible_vertex_size(vb->fvf);
wined3d_mutex_lock();
- hr = wined3d_device_set_vertex_declaration(This->wined3d_device, vb->wineD3DVertexDeclaration);
+ hr = wined3d_device_set_vertex_declaration(device->wined3d_device, vb->wineD3DVertexDeclaration);
if (FAILED(hr))
{
- ERR(" (%p) Setting the FVF failed, hr = %x!\n", This, hr);
+ WARN("Failed to set vertex declaration, hr %#x.\n", hr);
wined3d_mutex_unlock();
return hr;
}
/* Set the vertex stream source */
- hr = wined3d_device_set_stream_source(This->wined3d_device, 0, vb->wineD3DVertexBuffer, 0, stride);
- if(hr != D3D_OK)
+ hr = wined3d_device_set_stream_source(device->wined3d_device, 0, vb->wineD3DVertexBuffer, 0, stride);
+ if (FAILED(hr))
{
- ERR("(%p) IDirect3DDevice::SetStreamSource failed with hr = %08x\n", This, hr);
+ WARN("Failed to set stream source, hr %#x.\n", hr);
wined3d_mutex_unlock();
return hr;
}
/* Now draw the primitives */
- wined3d_device_set_primitive_type(This->wined3d_device, PrimitiveType);
- hr = wined3d_device_draw_primitive(This->wined3d_device, StartVertex, NumVertices);
+ wined3d_device_set_primitive_type(device->wined3d_device, PrimitiveType);
+ hr = wined3d_device_draw_primitive(device->wined3d_device, StartVertex, NumVertices);
wined3d_mutex_unlock();
return hr;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_DrawPrimitiveVB_FPUSetup(IDirect3DDevice7 *iface,
- D3DPRIMITIVETYPE PrimitiveType,
- IDirect3DVertexBuffer7 *D3DVertexBuf,
- DWORD StartVertex,
- DWORD NumVertices,
- DWORD Flags)
+static HRESULT WINAPI d3d_device7_DrawPrimitiveVB_FPUSetup(IDirect3DDevice7 *iface, D3DPRIMITIVETYPE PrimitiveType,
+ IDirect3DVertexBuffer7 *D3DVertexBuf, DWORD StartVertex, DWORD NumVertices, DWORD Flags)
{
- return IDirect3DDeviceImpl_7_DrawPrimitiveVB(iface, PrimitiveType, D3DVertexBuf, StartVertex, NumVertices, Flags);
+ return d3d_device7_DrawPrimitiveVB(iface, PrimitiveType, D3DVertexBuf, StartVertex, NumVertices, Flags);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_DrawPrimitiveVB_FPUPreserve(IDirect3DDevice7 *iface,
- D3DPRIMITIVETYPE PrimitiveType,
- IDirect3DVertexBuffer7 *D3DVertexBuf,
- DWORD StartVertex,
- DWORD NumVertices,
- DWORD Flags)
+static HRESULT WINAPI d3d_device7_DrawPrimitiveVB_FPUPreserve(IDirect3DDevice7 *iface, D3DPRIMITIVETYPE PrimitiveType,
+ IDirect3DVertexBuffer7 *D3DVertexBuf, DWORD StartVertex, DWORD NumVertices, DWORD Flags)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_DrawPrimitiveVB(iface, PrimitiveType, D3DVertexBuf, StartVertex, NumVertices, Flags);
+ hr = d3d_device7_DrawPrimitiveVB(iface, PrimitiveType, D3DVertexBuf, StartVertex, NumVertices, Flags);
set_fpu_control_word(old_fpucw);
return hr;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_3_DrawPrimitiveVB(IDirect3DDevice3 *iface,
- D3DPRIMITIVETYPE PrimitiveType, IDirect3DVertexBuffer *D3DVertexBuf, DWORD StartVertex,
- DWORD NumVertices, DWORD Flags)
+static HRESULT WINAPI d3d_device3_DrawPrimitiveVB(IDirect3DDevice3 *iface, D3DPRIMITIVETYPE PrimitiveType,
+ IDirect3DVertexBuffer *D3DVertexBuf, DWORD StartVertex, DWORD NumVertices, DWORD Flags)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
IDirect3DVertexBufferImpl *vb = unsafe_impl_from_IDirect3DVertexBuffer(D3DVertexBuf);
TRACE("iface %p, primitive_type %#x, vb %p, start_vertex %u, vertex_count %u, flags %#x.\n",
iface, PrimitiveType, D3DVertexBuf, StartVertex, NumVertices, Flags);
- return IDirect3DDevice7_DrawPrimitiveVB(&This->IDirect3DDevice7_iface,
+ return IDirect3DDevice7_DrawPrimitiveVB(&device->IDirect3DDevice7_iface,
PrimitiveType, &vb->IDirect3DVertexBuffer7_iface, StartVertex, NumVertices, Flags);
}
@@ -4267,17 +4087,11 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_DrawPrimitiveVB(IDirect3DDevice3 *if
* Return values
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface,
- D3DPRIMITIVETYPE PrimitiveType,
- IDirect3DVertexBuffer7 *D3DVertexBuf,
- DWORD StartVertex,
- DWORD NumVertices,
- WORD *Indices,
- DWORD IndexCount,
- DWORD Flags)
-{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface,
+ D3DPRIMITIVETYPE PrimitiveType, IDirect3DVertexBuffer7 *D3DVertexBuf,
+ DWORD StartVertex, DWORD NumVertices, WORD *Indices, DWORD IndexCount, DWORD Flags)
+{
+ struct d3d_device *This = impl_from_IDirect3DDevice7(iface);
IDirect3DVertexBufferImpl *vb = unsafe_impl_from_IDirect3DVertexBuffer7(D3DVertexBuf);
DWORD stride = get_flexible_vertex_size(vb->fvf);
struct wined3d_resource *wined3d_resource;
@@ -4366,52 +4180,41 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface,
return hr;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB_FPUSetup(IDirect3DDevice7 *iface,
- D3DPRIMITIVETYPE PrimitiveType,
- IDirect3DVertexBuffer7 *D3DVertexBuf,
- DWORD StartVertex,
- DWORD NumVertices,
- WORD *Indices,
- DWORD IndexCount,
- DWORD Flags)
+static HRESULT WINAPI d3d_device7_DrawIndexedPrimitiveVB_FPUSetup(IDirect3DDevice7 *iface,
+ D3DPRIMITIVETYPE PrimitiveType, IDirect3DVertexBuffer7 *D3DVertexBuf,
+ DWORD StartVertex, DWORD NumVertices, WORD *Indices, DWORD IndexCount, DWORD Flags)
{
- return IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(iface, PrimitiveType, D3DVertexBuf, StartVertex, NumVertices, Indices, IndexCount, Flags);
+ return d3d_device7_DrawIndexedPrimitiveVB(iface, PrimitiveType,
+ D3DVertexBuf, StartVertex, NumVertices, Indices, IndexCount, Flags);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB_FPUPreserve(IDirect3DDevice7 *iface,
- D3DPRIMITIVETYPE PrimitiveType,
- IDirect3DVertexBuffer7 *D3DVertexBuf,
- DWORD StartVertex,
- DWORD NumVertices,
- WORD *Indices,
- DWORD IndexCount,
- DWORD Flags)
+static HRESULT WINAPI d3d_device7_DrawIndexedPrimitiveVB_FPUPreserve(IDirect3DDevice7 *iface,
+ D3DPRIMITIVETYPE PrimitiveType, IDirect3DVertexBuffer7 *D3DVertexBuf,
+ DWORD StartVertex, DWORD NumVertices, WORD *Indices, DWORD IndexCount, DWORD Flags)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(iface, PrimitiveType, D3DVertexBuf, StartVertex, NumVertices, Indices, IndexCount, Flags);
+ hr = d3d_device7_DrawIndexedPrimitiveVB(iface, PrimitiveType,
+ D3DVertexBuf, StartVertex, NumVertices, Indices, IndexCount, Flags);
set_fpu_control_word(old_fpucw);
return hr;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_3_DrawIndexedPrimitiveVB(IDirect3DDevice3 *iface,
+static HRESULT WINAPI d3d_device3_DrawIndexedPrimitiveVB(IDirect3DDevice3 *iface,
D3DPRIMITIVETYPE PrimitiveType, IDirect3DVertexBuffer *D3DVertexBuf, WORD *Indices,
DWORD IndexCount, DWORD Flags)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
IDirect3DVertexBufferImpl *vb = unsafe_impl_from_IDirect3DVertexBuffer(D3DVertexBuf);
TRACE("iface %p, primitive_type %#x, vb %p, indices %p, index_count %u, flags %#x.\n",
iface, PrimitiveType, D3DVertexBuf, Indices, IndexCount, Flags);
- return IDirect3DDevice7_DrawIndexedPrimitiveVB(&This->IDirect3DDevice7_iface,
- PrimitiveType, &vb->IDirect3DVertexBuffer7_iface, 0, IndexCount, Indices, IndexCount,
- Flags);
+ return IDirect3DDevice7_DrawIndexedPrimitiveVB(&device->IDirect3DDevice7_iface, PrimitiveType,
+ &vb->IDirect3DVertexBuffer7_iface, 0, IndexCount, Indices, IndexCount, Flags);
}
/*****************************************************************************
@@ -4453,13 +4256,8 @@ static DWORD in_plane(UINT plane, D3DVECTOR normal, D3DVALUE origin_plane, D3DVE
return 0;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_ComputeSphereVisibility(IDirect3DDevice7 *iface,
- D3DVECTOR *Centers,
- D3DVALUE *Radii,
- DWORD NumSpheres,
- DWORD Flags,
- DWORD *ReturnValues)
+static HRESULT WINAPI d3d_device7_ComputeSphereVisibility(IDirect3DDevice7 *iface,
+ D3DVECTOR *centers, D3DVALUE *radii, DWORD sphere_count, DWORD flags, DWORD *return_values)
{
D3DMATRIX m, temp;
D3DVALUE origin_plane[6];
@@ -4468,15 +4266,15 @@ IDirect3DDeviceImpl_7_ComputeSphereVisibility(IDirect3DDevice7 *iface,
UINT i, j;
TRACE("iface %p, centers %p, radii %p, sphere_count %u, flags %#x, return_values %p.\n",
- iface, Centers, Radii, NumSpheres, Flags, ReturnValues);
+ iface, centers, radii, sphere_count, flags, return_values);
- hr = IDirect3DDeviceImpl_7_GetTransform(iface, D3DTRANSFORMSTATE_WORLD, &m);
+ hr = d3d_device7_GetTransform(iface, D3DTRANSFORMSTATE_WORLD, &m);
if ( hr != DD_OK ) return DDERR_INVALIDPARAMS;
- hr = IDirect3DDeviceImpl_7_GetTransform(iface, D3DTRANSFORMSTATE_VIEW, &temp);
+ hr = d3d_device7_GetTransform(iface, D3DTRANSFORMSTATE_VIEW, &temp);
if ( hr != DD_OK ) return DDERR_INVALIDPARAMS;
multiply_matrix(&m, &temp, &m);
- hr = IDirect3DDeviceImpl_7_GetTransform(iface, D3DTRANSFORMSTATE_PROJECTION, &temp);
+ hr = d3d_device7_GetTransform(iface, D3DTRANSFORMSTATE_PROJECTION, &temp);
if ( hr != DD_OK ) return DDERR_INVALIDPARAMS;
multiply_matrix(&m, &temp, &m);
@@ -4516,25 +4314,26 @@ IDirect3DDeviceImpl_7_ComputeSphereVisibility(IDirect3DDevice7 *iface,
vec[5].u3.z = m._34 - m._33;
origin_plane[5] = m._44 - m._43;
- for(i=0; i<NumSpheres; i++)
+ for (i = 0; i < sphere_count; ++i)
{
- ReturnValues[i] = 0;
- for(j=0; j<6; j++) ReturnValues[i] |= in_plane(j, vec[j], origin_plane[j], Centers[i], Radii[i]);
+ return_values[i] = 0;
+ for (j = 0; j < 6; ++j)
+ return_values[i] |= in_plane(j, vec[j], origin_plane[j], centers[i], radii[i]);
}
return D3D_OK;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_3_ComputeSphereVisibility(IDirect3DDevice3 *iface,
- D3DVECTOR *Centers, D3DVALUE *Radii, DWORD NumSpheres, DWORD Flags, DWORD *ReturnValues)
+static HRESULT WINAPI d3d_device3_ComputeSphereVisibility(IDirect3DDevice3 *iface,
+ D3DVECTOR *centers, D3DVALUE *radii, DWORD sphere_count, DWORD flags, DWORD *return_values)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
TRACE("iface %p, centers %p, radii %p, sphere_count %u, flags %#x, return_values %p.\n",
- iface, Centers, Radii, NumSpheres, Flags, ReturnValues);
+ iface, centers, radii, sphere_count, flags, return_values);
- return IDirect3DDevice7_ComputeSphereVisibility(&This->IDirect3DDevice7_iface,
- Centers, Radii, NumSpheres, Flags, ReturnValues);
+ return IDirect3DDevice7_ComputeSphereVisibility(&device->IDirect3DDevice7_iface,
+ centers, radii, sphere_count, flags, return_values);
}
/*****************************************************************************
@@ -4556,76 +4355,66 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_ComputeSphereVisibility(IDirect3DDev
* For details, see IWineD3DDevice::GetTexture
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_GetTexture(IDirect3DDevice7 *iface,
- DWORD Stage,
- IDirectDrawSurface7 **Texture)
+static HRESULT d3d_device7_GetTexture(IDirect3DDevice7 *iface,
+ DWORD stage, IDirectDrawSurface7 **texture)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
struct wined3d_texture *wined3d_texture;
struct ddraw_surface *surface;
HRESULT hr;
- TRACE("iface %p, stage %u, texture %p.\n", iface, Stage, Texture);
+ TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture);
- if(!Texture)
- {
- TRACE("Texture == NULL, failing with DDERR_INVALIDPARAMS\n");
+ if (!texture)
return DDERR_INVALIDPARAMS;
- }
wined3d_mutex_lock();
- hr = wined3d_device_get_texture(This->wined3d_device, Stage, &wined3d_texture);
+ hr = wined3d_device_get_texture(device->wined3d_device, stage, &wined3d_texture);
if (FAILED(hr) || !wined3d_texture)
{
- *Texture = NULL;
+ *texture = NULL;
wined3d_mutex_unlock();
return hr;
}
surface = wined3d_texture_get_parent(wined3d_texture);
- *Texture = &surface->IDirectDrawSurface7_iface;
- IDirectDrawSurface7_AddRef(*Texture);
+ *texture = &surface->IDirectDrawSurface7_iface;
+ IDirectDrawSurface7_AddRef(*texture);
wined3d_texture_decref(wined3d_texture);
wined3d_mutex_unlock();
return hr;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_GetTexture_FPUSetup(IDirect3DDevice7 *iface,
- DWORD Stage,
- IDirectDrawSurface7 **Texture)
+static HRESULT WINAPI d3d_device7_GetTexture_FPUSetup(IDirect3DDevice7 *iface,
+ DWORD stage, IDirectDrawSurface7 **Texture)
{
- return IDirect3DDeviceImpl_7_GetTexture(iface, Stage, Texture);
+ return d3d_device7_GetTexture(iface, stage, Texture);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_GetTexture_FPUPreserve(IDirect3DDevice7 *iface,
- DWORD Stage,
- IDirectDrawSurface7 **Texture)
+static HRESULT WINAPI d3d_device7_GetTexture_FPUPreserve(IDirect3DDevice7 *iface,
+ DWORD stage, IDirectDrawSurface7 **Texture)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_GetTexture(iface, Stage, Texture);
+ hr = d3d_device7_GetTexture(iface, stage, Texture);
set_fpu_control_word(old_fpucw);
return hr;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_3_GetTexture(IDirect3DDevice3 *iface, DWORD Stage,
- IDirect3DTexture2 **Texture2)
+static HRESULT WINAPI d3d_device3_GetTexture(IDirect3DDevice3 *iface, DWORD stage, IDirect3DTexture2 **Texture2)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
struct ddraw_surface *ret_val_impl;
HRESULT ret;
IDirectDrawSurface7 *ret_val;
- TRACE("iface %p, stage %u, texture %p.\n", iface, Stage, Texture2);
+ TRACE("iface %p, stage %u, texture %p.\n", iface, stage, Texture2);
- ret = IDirect3DDevice7_GetTexture(&This->IDirect3DDevice7_iface, Stage, &ret_val);
+ ret = IDirect3DDevice7_GetTexture(&device->IDirect3DDevice7_iface, stage, &ret_val);
ret_val_impl = unsafe_impl_from_IDirectDrawSurface7(ret_val);
*Texture2 = ret_val_impl ? &ret_val_impl->IDirect3DTexture2_iface : NULL;
@@ -4651,78 +4440,70 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_GetTexture(IDirect3DDevice3 *iface,
* For details, see IWineD3DDevice::SetTexture
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_SetTexture(IDirect3DDevice7 *iface,
- DWORD Stage,
- IDirectDrawSurface7 *Texture)
+static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface,
+ DWORD stage, IDirectDrawSurface7 *texture)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
- struct ddraw_surface *surf = unsafe_impl_from_IDirectDrawSurface7(Texture);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
+ struct ddraw_surface *surf = unsafe_impl_from_IDirectDrawSurface7(texture);
HRESULT hr;
- TRACE("iface %p, stage %u, texture %p.\n", iface, Stage, Texture);
+ TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture);
/* Texture may be NULL here */
wined3d_mutex_lock();
- hr = wined3d_device_set_texture(This->wined3d_device,
- Stage, surf ? surf->wined3d_texture : NULL);
+ hr = wined3d_device_set_texture(device->wined3d_device,
+ stage, surf ? surf->wined3d_texture : NULL);
wined3d_mutex_unlock();
return hr;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_SetTexture_FPUSetup(IDirect3DDevice7 *iface,
- DWORD Stage,
- IDirectDrawSurface7 *Texture)
+static HRESULT WINAPI d3d_device7_SetTexture_FPUSetup(IDirect3DDevice7 *iface,
+ DWORD stage, IDirectDrawSurface7 *texture)
{
- return IDirect3DDeviceImpl_7_SetTexture(iface, Stage, Texture);
+ return d3d_device7_SetTexture(iface, stage, texture);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_SetTexture_FPUPreserve(IDirect3DDevice7 *iface,
- DWORD Stage,
- IDirectDrawSurface7 *Texture)
+static HRESULT WINAPI d3d_device7_SetTexture_FPUPreserve(IDirect3DDevice7 *iface,
+ DWORD stage, IDirectDrawSurface7 *texture)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_SetTexture(iface, Stage, Texture);
+ hr = d3d_device7_SetTexture(iface, stage, texture);
set_fpu_control_word(old_fpucw);
return hr;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_3_SetTexture(IDirect3DDevice3 *iface,
- DWORD Stage,
- IDirect3DTexture2 *Texture2)
+static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface,
+ DWORD stage, IDirect3DTexture2 *texture)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
- struct ddraw_surface *tex = unsafe_impl_from_IDirect3DTexture2(Texture2);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
+ struct ddraw_surface *tex = unsafe_impl_from_IDirect3DTexture2(texture);
DWORD texmapblend;
HRESULT hr;
- TRACE("iface %p, stage %u, texture %p.\n", iface, Stage, Texture2);
+ TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture);
wined3d_mutex_lock();
- if (This->legacyTextureBlending)
+ if (device->legacyTextureBlending)
IDirect3DDevice3_GetRenderState(iface, D3DRENDERSTATE_TEXTUREMAPBLEND, &texmapblend);
- hr = IDirect3DDevice7_SetTexture(&This->IDirect3DDevice7_iface, Stage, &tex->IDirectDrawSurface7_iface);
+ hr = IDirect3DDevice7_SetTexture(&device->IDirect3DDevice7_iface, stage, &tex->IDirectDrawSurface7_iface);
- if (This->legacyTextureBlending && texmapblend == D3DTBLEND_MODULATE)
+ if (device->legacyTextureBlending && texmapblend == D3DTBLEND_MODULATE)
{
/* This fixup is required by the way D3DTBLEND_MODULATE maps to texture stage states.
- See IDirect3DDeviceImpl_3_SetRenderState for details. */
+ See d3d_device3_SetRenderState() for details. */
struct wined3d_texture *tex = NULL;
BOOL tex_alpha = FALSE;
DDPIXELFORMAT ddfmt;
HRESULT result;
- result = wined3d_device_get_texture(This->wined3d_device, 0, &tex);
+ result = wined3d_device_get_texture(device->wined3d_device, 0, &tex);
if (result == WINED3D_OK && tex)
{
struct wined3d_resource *sub_resource;
@@ -4742,10 +4523,10 @@ IDirect3DDeviceImpl_3_SetTexture(IDirect3DDevice3 *iface,
/* Arg 1/2 are already set to WINED3DTA_TEXTURE/WINED3DTA_CURRENT in case of D3DTBLEND_MODULATE */
if (tex_alpha)
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG1);
else
- wined3d_device_set_texture_stage_state(This->wined3d_device,
+ wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG2);
}
@@ -4806,55 +4587,52 @@ tss_lookup[] =
* For details, see IWineD3DDevice::GetTextureStageState
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_GetTextureStageState(IDirect3DDevice7 *iface,
- DWORD Stage,
- D3DTEXTURESTAGESTATETYPE TexStageStateType,
- DWORD *State)
+static HRESULT d3d_device7_GetTextureStageState(IDirect3DDevice7 *iface,
+ DWORD stage, D3DTEXTURESTAGESTATETYPE state, DWORD *value)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
HRESULT hr;
const struct tss_lookup *l;
TRACE("iface %p, stage %u, state %#x, value %p.\n",
- iface, Stage, TexStageStateType, State);
+ iface, stage, state, value);
- if(!State)
+ if (!value)
return DDERR_INVALIDPARAMS;
- if (TexStageStateType > D3DTSS_TEXTURETRANSFORMFLAGS)
+ if (state > D3DTSS_TEXTURETRANSFORMFLAGS)
{
- WARN("Invalid TexStageStateType %#x passed.\n", TexStageStateType);
+ WARN("Invalid state %#x passed.\n", state);
return DD_OK;
}
- l = &tss_lookup[TexStageStateType];
+ l = &tss_lookup[state];
wined3d_mutex_lock();
if (l->sampler_state)
{
- hr = wined3d_device_get_sampler_state(This->wined3d_device, Stage, l->state, State);
+ hr = wined3d_device_get_sampler_state(device->wined3d_device, stage, l->state, value);
- switch(TexStageStateType)
+ switch (state)
{
/* Mipfilter is a sampler state with different values */
case D3DTSS_MIPFILTER:
{
- switch(*State)
+ switch (*value)
{
case WINED3D_TEXF_NONE:
- *State = D3DTFP_NONE;
+ *value = D3DTFP_NONE;
break;
case WINED3D_TEXF_POINT:
- *State = D3DTFP_POINT;
+ *value = D3DTFP_POINT;
break;
case WINED3D_TEXF_LINEAR:
- *State = D3DTFP_LINEAR;
+ *value = D3DTFP_LINEAR;
break;
default:
- ERR("Unexpected mipfilter value %#x\n", *State);
- *State = D3DTFP_NONE;
+ ERR("Unexpected mipfilter value %#x.\n", *value);
+ *value = D3DTFP_NONE;
break;
}
break;
@@ -4863,26 +4641,26 @@ IDirect3DDeviceImpl_7_GetTextureStageState(IDirect3DDevice7 *iface,
/* Magfilter has slightly different values */
case D3DTSS_MAGFILTER:
{
- switch(*State)
+ switch (*value)
{
case WINED3D_TEXF_POINT:
- *State = D3DTFG_POINT;
+ *value = D3DTFG_POINT;
break;
case WINED3D_TEXF_LINEAR:
- *State = D3DTFG_LINEAR;
+ *value = D3DTFG_LINEAR;
break;
case WINED3D_TEXF_ANISOTROPIC:
- *State = D3DTFG_ANISOTROPIC;
+ *value = D3DTFG_ANISOTROPIC;
break;
case WINED3D_TEXF_FLAT_CUBIC:
- *State = D3DTFG_FLATCUBIC;
+ *value = D3DTFG_FLATCUBIC;
break;
case WINED3D_TEXF_GAUSSIAN_CUBIC:
- *State = D3DTFG_GAUSSIANCUBIC;
+ *value = D3DTFG_GAUSSIANCUBIC;
break;
default:
- ERR("Unexpected wined3d mag filter value %#x\n", *State);
- *State = D3DTFG_POINT;
+ ERR("Unexpected wined3d mag filter value %#x.\n", *value);
+ *value = D3DTFG_POINT;
break;
}
break;
@@ -4894,7 +4672,7 @@ IDirect3DDeviceImpl_7_GetTextureStageState(IDirect3DDevice7 *iface,
}
else
{
- hr = wined3d_device_get_texture_stage_state(This->wined3d_device, Stage, l->state, State);
+ hr = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, l->state, value);
}
wined3d_mutex_unlock();
@@ -4902,41 +4680,34 @@ IDirect3DDeviceImpl_7_GetTextureStageState(IDirect3DDevice7 *iface,
return hr;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_GetTextureStageState_FPUSetup(IDirect3DDevice7 *iface,
- DWORD Stage,
- D3DTEXTURESTAGESTATETYPE TexStageStateType,
- DWORD *State)
+static HRESULT WINAPI d3d_device7_GetTextureStageState_FPUSetup(IDirect3DDevice7 *iface,
+ DWORD stage, D3DTEXTURESTAGESTATETYPE state, DWORD *value)
{
- return IDirect3DDeviceImpl_7_GetTextureStageState(iface, Stage, TexStageStateType, State);
+ return d3d_device7_GetTextureStageState(iface, stage, state, value);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_GetTextureStageState_FPUPreserve(IDirect3DDevice7 *iface,
- DWORD Stage,
- D3DTEXTURESTAGESTATETYPE TexStageStateType,
- DWORD *State)
+static HRESULT WINAPI d3d_device7_GetTextureStageState_FPUPreserve(IDirect3DDevice7 *iface,
+ DWORD stage, D3DTEXTURESTAGESTATETYPE state, DWORD *value)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_GetTextureStageState(iface, Stage, TexStageStateType, State);
+ hr = d3d_device7_GetTextureStageState(iface, stage, state, value);
set_fpu_control_word(old_fpucw);
return hr;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_3_GetTextureStageState(IDirect3DDevice3 *iface,
- DWORD Stage, D3DTEXTURESTAGESTATETYPE TexStageStateType, DWORD *State)
+static HRESULT WINAPI d3d_device3_GetTextureStageState(IDirect3DDevice3 *iface,
+ DWORD stage, D3DTEXTURESTAGESTATETYPE state, DWORD *value)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
TRACE("iface %p, stage %u, state %#x, value %p.\n",
- iface, Stage, TexStageStateType, State);
+ iface, stage, state, value);
- return IDirect3DDevice7_GetTextureStageState(&This->IDirect3DDevice7_iface,
- Stage, TexStageStateType, State);
+ return IDirect3DDevice7_GetTextureStageState(&device->IDirect3DDevice7_iface, stage, state, value);
}
/*****************************************************************************
@@ -4957,51 +4728,48 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_GetTextureStageState(IDirect3DDevice
* For details, see IWineD3DDevice::SetTextureStageState
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_SetTextureStageState(IDirect3DDevice7 *iface,
- DWORD Stage,
- D3DTEXTURESTAGESTATETYPE TexStageStateType,
- DWORD State)
+static HRESULT d3d_device7_SetTextureStageState(IDirect3DDevice7 *iface,
+ DWORD stage, D3DTEXTURESTAGESTATETYPE state, DWORD value)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
const struct tss_lookup *l;
HRESULT hr;
TRACE("iface %p, stage %u, state %#x, value %#x.\n",
- iface, Stage, TexStageStateType, State);
+ iface, stage, state, value);
- if (TexStageStateType > D3DTSS_TEXTURETRANSFORMFLAGS)
+ if (state > D3DTSS_TEXTURETRANSFORMFLAGS)
{
- WARN("Invalid TexStageStateType %#x passed.\n", TexStageStateType);
+ WARN("Invalid state %#x passed.\n", state);
return DD_OK;
}
- l = &tss_lookup[TexStageStateType];
+ l = &tss_lookup[state];
wined3d_mutex_lock();
if (l->sampler_state)
{
- switch(TexStageStateType)
+ switch (state)
{
/* Mipfilter is a sampler state with different values */
case D3DTSS_MIPFILTER:
{
- switch(State)
+ switch (value)
{
case D3DTFP_NONE:
- State = WINED3D_TEXF_NONE;
+ value = WINED3D_TEXF_NONE;
break;
case D3DTFP_POINT:
- State = WINED3D_TEXF_POINT;
+ value = WINED3D_TEXF_POINT;
break;
case 0: /* Unchecked */
case D3DTFP_LINEAR:
- State = WINED3D_TEXF_LINEAR;
+ value = WINED3D_TEXF_LINEAR;
break;
default:
- ERR("Unexpected mipfilter value %d\n", State);
- State = WINED3D_TEXF_NONE;
+ ERR("Unexpected mipfilter value %#x.\n", value);
+ value = WINED3D_TEXF_NONE;
break;
}
break;
@@ -5010,44 +4778,44 @@ IDirect3DDeviceImpl_7_SetTextureStageState(IDirect3DDevice7 *iface,
/* Magfilter has slightly different values */
case D3DTSS_MAGFILTER:
{
- switch(State)
+ switch (value)
{
case D3DTFG_POINT:
- State = WINED3D_TEXF_POINT;
+ value = WINED3D_TEXF_POINT;
break;
case D3DTFG_LINEAR:
- State = WINED3D_TEXF_LINEAR;
+ value = WINED3D_TEXF_LINEAR;
break;
case D3DTFG_FLATCUBIC:
- State = WINED3D_TEXF_FLAT_CUBIC;
+ value = WINED3D_TEXF_FLAT_CUBIC;
break;
case D3DTFG_GAUSSIANCUBIC:
- State = WINED3D_TEXF_GAUSSIAN_CUBIC;
+ value = WINED3D_TEXF_GAUSSIAN_CUBIC;
break;
case D3DTFG_ANISOTROPIC:
- State = WINED3D_TEXF_ANISOTROPIC;
+ value = WINED3D_TEXF_ANISOTROPIC;
break;
default:
- ERR("Unexpected d3d7 mag filter type %d\n", State);
- State = WINED3D_TEXF_POINT;
+ ERR("Unexpected d3d7 mag filter value %#x.\n", value);
+ value = WINED3D_TEXF_POINT;
break;
}
break;
}
case D3DTSS_ADDRESS:
- wined3d_device_set_sampler_state(This->wined3d_device, Stage, WINED3D_SAMP_ADDRESS_V, State);
+ wined3d_device_set_sampler_state(device->wined3d_device, stage, WINED3D_SAMP_ADDRESS_V, value);
break;
default:
break;
}
- hr = wined3d_device_set_sampler_state(This->wined3d_device, Stage, l->state, State);
+ hr = wined3d_device_set_sampler_state(device->wined3d_device, stage, l->state, value);
}
else
{
- hr = wined3d_device_set_texture_stage_state(This->wined3d_device, Stage, l->state, State);
+ hr = wined3d_device_set_texture_stage_state(device->wined3d_device, stage, l->state, value);
}
wined3d_mutex_unlock();
@@ -5055,41 +4823,34 @@ IDirect3DDeviceImpl_7_SetTextureStageState(IDirect3DDevice7 *iface,
return hr;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_SetTextureStageState_FPUSetup(IDirect3DDevice7 *iface,
- DWORD Stage,
- D3DTEXTURESTAGESTATETYPE TexStageStateType,
- DWORD State)
+static HRESULT WINAPI d3d_device7_SetTextureStageState_FPUSetup(IDirect3DDevice7 *iface,
+ DWORD stage, D3DTEXTURESTAGESTATETYPE state, DWORD value)
{
- return IDirect3DDeviceImpl_7_SetTextureStageState(iface, Stage, TexStageStateType, State);
+ return d3d_device7_SetTextureStageState(iface, stage, state, value);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_SetTextureStageState_FPUPreserve(IDirect3DDevice7 *iface,
- DWORD Stage,
- D3DTEXTURESTAGESTATETYPE TexStageStateType,
- DWORD State)
+static HRESULT WINAPI d3d_device7_SetTextureStageState_FPUPreserve(IDirect3DDevice7 *iface,
+ DWORD stage, D3DTEXTURESTAGESTATETYPE state, DWORD value)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_SetTextureStageState(iface, Stage, TexStageStateType, State);
+ hr = d3d_device7_SetTextureStageState(iface, stage, state, value);
set_fpu_control_word(old_fpucw);
return hr;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_3_SetTextureStageState(IDirect3DDevice3 *iface,
- DWORD Stage, D3DTEXTURESTAGESTATETYPE TexStageStateType, DWORD State)
+static HRESULT WINAPI d3d_device3_SetTextureStageState(IDirect3DDevice3 *iface,
+ DWORD stage, D3DTEXTURESTAGESTATETYPE state, DWORD value)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
TRACE("iface %p, stage %u, state %#x, value %#x.\n",
- iface, Stage, TexStageStateType, State);
+ iface, stage, state, value);
- return IDirect3DDevice7_SetTextureStageState(&This->IDirect3DDevice7_iface,
- Stage, TexStageStateType, State);
+ return IDirect3DDevice7_SetTextureStageState(&device->IDirect3DDevice7_iface, stage, state, value);
}
/*****************************************************************************
@@ -5110,50 +4871,44 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_SetTextureStageState(IDirect3DDevice
* See IWineD3DDevice::ValidateDevice for more details
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_ValidateDevice(IDirect3DDevice7 *iface,
- DWORD *NumPasses)
+static HRESULT d3d_device7_ValidateDevice(IDirect3DDevice7 *iface, DWORD *pass_count)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
HRESULT hr;
- TRACE("iface %p, pass_count %p.\n", iface, NumPasses);
+ TRACE("iface %p, pass_count %p.\n", iface, pass_count);
wined3d_mutex_lock();
- hr = wined3d_device_validate_device(This->wined3d_device, NumPasses);
+ hr = wined3d_device_validate_device(device->wined3d_device, pass_count);
wined3d_mutex_unlock();
return hr;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_ValidateDevice_FPUSetup(IDirect3DDevice7 *iface,
- DWORD *NumPasses)
+static HRESULT WINAPI d3d_device7_ValidateDevice_FPUSetup(IDirect3DDevice7 *iface, DWORD *pass_count)
{
- return IDirect3DDeviceImpl_7_ValidateDevice(iface, NumPasses);
+ return d3d_device7_ValidateDevice(iface, pass_count);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_ValidateDevice_FPUPreserve(IDirect3DDevice7 *iface,
- DWORD *NumPasses)
+static HRESULT WINAPI d3d_device7_ValidateDevice_FPUPreserve(IDirect3DDevice7 *iface, DWORD *pass_count)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_ValidateDevice(iface, NumPasses);
+ hr = d3d_device7_ValidateDevice(iface, pass_count);
set_fpu_control_word(old_fpucw);
return hr;
}
-static HRESULT WINAPI IDirect3DDeviceImpl_3_ValidateDevice(IDirect3DDevice3 *iface, DWORD *Passes)
+static HRESULT WINAPI d3d_device3_ValidateDevice(IDirect3DDevice3 *iface, DWORD *pass_count)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice3(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
- TRACE("iface %p, pass_count %p.\n", iface, Passes);
+ TRACE("iface %p, pass_count %p.\n", iface, pass_count);
- return IDirect3DDevice7_ValidateDevice(&This->IDirect3DDevice7_iface, Passes);
+ return IDirect3DDevice7_ValidateDevice(&device->IDirect3DDevice7_iface, pass_count);
}
/*****************************************************************************
@@ -5177,7 +4932,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_ValidateDevice(IDirect3DDevice3 *ifa
* For details, see IWineD3DDevice::Clear
*
*****************************************************************************/
-static HRESULT IDirect3DDeviceImpl_7_Clear(IDirect3DDevice7 *iface, DWORD count,
+static HRESULT d3d_device7_Clear(IDirect3DDevice7 *iface, DWORD count,
D3DRECT *rects, DWORD flags, D3DCOLOR color, D3DVALUE z, DWORD stencil)
{
const struct wined3d_color c =
@@ -5187,7 +4942,7 @@ static HRESULT IDirect3DDeviceImpl_7_Clear(IDirect3DDevice7 *iface, DWORD count,
(color & 0xff) / 255.0f,
((color >> 24) & 0xff) / 255.0f,
};
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *This = impl_from_IDirect3DDevice7(iface);
HRESULT hr;
TRACE("iface %p, count %u, rects %p, flags %#x, color 0x%08x, z %.8e, stencil %#x.\n",
@@ -5200,32 +4955,20 @@ static HRESULT IDirect3DDeviceImpl_7_Clear(IDirect3DDevice7 *iface, DWORD count,
return hr;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_Clear_FPUSetup(IDirect3DDevice7 *iface,
- DWORD Count,
- D3DRECT *Rects,
- DWORD Flags,
- D3DCOLOR Color,
- D3DVALUE Z,
- DWORD Stencil)
+static HRESULT WINAPI d3d_device7_Clear_FPUSetup(IDirect3DDevice7 *iface, DWORD count,
+ D3DRECT *rects, DWORD flags, D3DCOLOR color, D3DVALUE z, DWORD stencil)
{
- return IDirect3DDeviceImpl_7_Clear(iface, Count, Rects, Flags, Color, Z, Stencil);
+ return d3d_device7_Clear(iface, count, rects, flags, color, z, stencil);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_Clear_FPUPreserve(IDirect3DDevice7 *iface,
- DWORD Count,
- D3DRECT *Rects,
- DWORD Flags,
- D3DCOLOR Color,
- D3DVALUE Z,
- DWORD Stencil)
+static HRESULT WINAPI d3d_device7_Clear_FPUPreserve(IDirect3DDevice7 *iface, DWORD count,
+ D3DRECT *rects, DWORD flags, D3DCOLOR color, D3DVALUE z, DWORD stencil)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_Clear(iface, Count, Rects, Flags, Color, Z, Stencil);
+ hr = d3d_device7_Clear(iface, count, rects, flags, color, z, stencil);
set_fpu_control_word(old_fpucw);
return hr;
@@ -5248,42 +4991,36 @@ IDirect3DDeviceImpl_7_Clear_FPUPreserve(IDirect3DDevice7 *iface,
* For more details, see IWineDDDevice::SetViewport
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_SetViewport(IDirect3DDevice7 *iface,
- D3DVIEWPORT7 *Data)
+static HRESULT d3d_device7_SetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *viewport)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
HRESULT hr;
- TRACE("iface %p, viewport %p.\n", iface, Data);
+ TRACE("iface %p, viewport %p.\n", iface, viewport);
- if(!Data)
+ if (!viewport)
return DDERR_INVALIDPARAMS;
/* Note: D3DVIEWPORT7 is compatible with struct wined3d_viewport. */
wined3d_mutex_lock();
- hr = wined3d_device_set_viewport(This->wined3d_device, (struct wined3d_viewport *)Data);
+ hr = wined3d_device_set_viewport(device->wined3d_device, (struct wined3d_viewport *)viewport);
wined3d_mutex_unlock();
return hr;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_SetViewport_FPUSetup(IDirect3DDevice7 *iface,
- D3DVIEWPORT7 *Data)
+static HRESULT WINAPI d3d_device7_SetViewport_FPUSetup(IDirect3DDevice7 *iface, D3DVIEWPORT7 *viewport)
{
- return IDirect3DDeviceImpl_7_SetViewport(iface, Data);
+ return d3d_device7_SetViewport(iface, viewport);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_SetViewport_FPUPreserve(IDirect3DDevice7 *iface,
- D3DVIEWPORT7 *Data)
+static HRESULT WINAPI d3d_device7_SetViewport_FPUPreserve(IDirect3DDevice7 *iface, D3DVIEWPORT7 *viewport)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_SetViewport(iface, Data);
+ hr = d3d_device7_SetViewport(iface, viewport);
set_fpu_control_word(old_fpucw);
return hr;
@@ -5305,42 +5042,36 @@ IDirect3DDeviceImpl_7_SetViewport_FPUPreserve(IDirect3DDevice7 *iface,
* For more details, see IWineD3DDevice::GetViewport
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_GetViewport(IDirect3DDevice7 *iface,
- D3DVIEWPORT7 *Data)
+static HRESULT d3d_device7_GetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *viewport)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
HRESULT hr;
- TRACE("iface %p, viewport %p.\n", iface, Data);
+ TRACE("iface %p, viewport %p.\n", iface, viewport);
- if(!Data)
+ if (!viewport)
return DDERR_INVALIDPARAMS;
/* Note: D3DVIEWPORT7 is compatible with struct wined3d_viewport. */
wined3d_mutex_lock();
- hr = wined3d_device_get_viewport(This->wined3d_device, (struct wined3d_viewport *)Data);
+ hr = wined3d_device_get_viewport(device->wined3d_device, (struct wined3d_viewport *)viewport);
wined3d_mutex_unlock();
return hr_ddraw_from_wined3d(hr);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_GetViewport_FPUSetup(IDirect3DDevice7 *iface,
- D3DVIEWPORT7 *Data)
+static HRESULT WINAPI d3d_device7_GetViewport_FPUSetup(IDirect3DDevice7 *iface, D3DVIEWPORT7 *viewport)
{
- return IDirect3DDeviceImpl_7_GetViewport(iface, Data);
+ return d3d_device7_GetViewport(iface, viewport);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_GetViewport_FPUPreserve(IDirect3DDevice7 *iface,
- D3DVIEWPORT7 *Data)
+static HRESULT WINAPI d3d_device7_GetViewport_FPUPreserve(IDirect3DDevice7 *iface, D3DVIEWPORT7 *viewport)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_GetViewport(iface, Data);
+ hr = d3d_device7_GetViewport(iface, viewport);
set_fpu_control_word(old_fpucw);
return hr;
@@ -5362,41 +5093,36 @@ IDirect3DDeviceImpl_7_GetViewport_FPUPreserve(IDirect3DDevice7 *iface,
* For more details, see IWineD3DDevice::SetMaterial
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_SetMaterial(IDirect3DDevice7 *iface,
- D3DMATERIAL7 *Mat)
+static HRESULT d3d_device7_SetMaterial(IDirect3DDevice7 *iface, D3DMATERIAL7 *material)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
HRESULT hr;
- TRACE("iface %p, material %p.\n", iface, Mat);
+ TRACE("iface %p, material %p.\n", iface, material);
- if (!Mat) return DDERR_INVALIDPARAMS;
+ if (!material)
+ return DDERR_INVALIDPARAMS;
wined3d_mutex_lock();
/* Note: D3DMATERIAL7 is compatible with struct wined3d_material. */
- hr = wined3d_device_set_material(This->wined3d_device, (struct wined3d_material *)Mat);
+ hr = wined3d_device_set_material(device->wined3d_device, (struct wined3d_material *)material);
wined3d_mutex_unlock();
return hr_ddraw_from_wined3d(hr);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_SetMaterial_FPUSetup(IDirect3DDevice7 *iface,
- D3DMATERIAL7 *Mat)
+static HRESULT WINAPI d3d_device7_SetMaterial_FPUSetup(IDirect3DDevice7 *iface, D3DMATERIAL7 *material)
{
- return IDirect3DDeviceImpl_7_SetMaterial(iface, Mat);
+ return d3d_device7_SetMaterial(iface, material);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_SetMaterial_FPUPreserve(IDirect3DDevice7 *iface,
- D3DMATERIAL7 *Mat)
+static HRESULT WINAPI d3d_device7_SetMaterial_FPUPreserve(IDirect3DDevice7 *iface, D3DMATERIAL7 *material)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_SetMaterial(iface, Mat);
+ hr = d3d_device7_SetMaterial(iface, material);
set_fpu_control_word(old_fpucw);
return hr;
@@ -5418,39 +5144,33 @@ IDirect3DDeviceImpl_7_SetMaterial_FPUPreserve(IDirect3DDevice7 *iface,
* For more details, see IWineD3DDevice::GetMaterial
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_GetMaterial(IDirect3DDevice7 *iface,
- D3DMATERIAL7 *Mat)
+static HRESULT d3d_device7_GetMaterial(IDirect3DDevice7 *iface, D3DMATERIAL7 *material)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
HRESULT hr;
- TRACE("iface %p, material %p.\n", iface, Mat);
+ TRACE("iface %p, material %p.\n", iface, material);
wined3d_mutex_lock();
/* Note: D3DMATERIAL7 is compatible with struct wined3d_material. */
- hr = wined3d_device_get_material(This->wined3d_device, (struct wined3d_material *)Mat);
+ hr = wined3d_device_get_material(device->wined3d_device, (struct wined3d_material *)material);
wined3d_mutex_unlock();
return hr_ddraw_from_wined3d(hr);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_GetMaterial_FPUSetup(IDirect3DDevice7 *iface,
- D3DMATERIAL7 *Mat)
+static HRESULT WINAPI d3d_device7_GetMaterial_FPUSetup(IDirect3DDevice7 *iface, D3DMATERIAL7 *material)
{
- return IDirect3DDeviceImpl_7_GetMaterial(iface, Mat);
+ return d3d_device7_GetMaterial(iface, material);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_GetMaterial_FPUPreserve(IDirect3DDevice7 *iface,
- D3DMATERIAL7 *Mat)
+static HRESULT WINAPI d3d_device7_GetMaterial_FPUPreserve(IDirect3DDevice7 *iface, D3DMATERIAL7 *material)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_GetMaterial(iface, Mat);
+ hr = d3d_device7_GetMaterial(iface, material);
set_fpu_control_word(old_fpucw);
return hr;
@@ -5472,42 +5192,33 @@ IDirect3DDeviceImpl_7_GetMaterial_FPUPreserve(IDirect3DDevice7 *iface,
* For more details, see IWineD3DDevice::SetLight
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_SetLight(IDirect3DDevice7 *iface,
- DWORD LightIndex,
- D3DLIGHT7 *Light)
+static HRESULT d3d_device7_SetLight(IDirect3DDevice7 *iface, DWORD light_idx, D3DLIGHT7 *light)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
HRESULT hr;
- TRACE("iface %p, light_idx %u, light %p.\n", iface, LightIndex, Light);
+ TRACE("iface %p, light_idx %u, light %p.\n", iface, light_idx, light);
wined3d_mutex_lock();
/* Note: D3DLIGHT7 is compatible with struct wined3d_light. */
- hr = wined3d_device_set_light(This->wined3d_device, LightIndex, (struct wined3d_light *)Light);
+ hr = wined3d_device_set_light(device->wined3d_device, light_idx, (struct wined3d_light *)light);
wined3d_mutex_unlock();
return hr_ddraw_from_wined3d(hr);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_SetLight_FPUSetup(IDirect3DDevice7 *iface,
- DWORD LightIndex,
- D3DLIGHT7 *Light)
+static HRESULT WINAPI d3d_device7_SetLight_FPUSetup(IDirect3DDevice7 *iface, DWORD light_idx, D3DLIGHT7 *light)
{
- return IDirect3DDeviceImpl_7_SetLight(iface, LightIndex, Light);
+ return d3d_device7_SetLight(iface, light_idx, light);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_SetLight_FPUPreserve(IDirect3DDevice7 *iface,
- DWORD LightIndex,
- D3DLIGHT7 *Light)
+static HRESULT WINAPI d3d_device7_SetLight_FPUPreserve(IDirect3DDevice7 *iface, DWORD light_idx, D3DLIGHT7 *light)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_SetLight(iface, LightIndex, Light);
+ hr = d3d_device7_SetLight(iface, light_idx, light);
set_fpu_control_word(old_fpucw);
return hr;
@@ -5527,43 +5238,34 @@ IDirect3DDeviceImpl_7_SetLight_FPUPreserve(IDirect3DDevice7 *iface,
* For details, see IWineD3DDevice::GetLight
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_GetLight(IDirect3DDevice7 *iface,
- DWORD LightIndex,
- D3DLIGHT7 *Light)
+static HRESULT d3d_device7_GetLight(IDirect3DDevice7 *iface, DWORD light_idx, D3DLIGHT7 *light)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
HRESULT rc;
- TRACE("iface %p, light_idx %u, light %p.\n", iface, LightIndex, Light);
+ TRACE("iface %p, light_idx %u, light %p.\n", iface, light_idx, light);
wined3d_mutex_lock();
/* Note: D3DLIGHT7 is compatible with struct wined3d_light. */
- rc = wined3d_device_get_light(This->wined3d_device, LightIndex, (struct wined3d_light *)Light);
+ rc = wined3d_device_get_light(device->wined3d_device, light_idx, (struct wined3d_light *)light);
wined3d_mutex_unlock();
/* Translate the result. WineD3D returns other values than D3D7 */
return hr_ddraw_from_wined3d(rc);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_GetLight_FPUSetup(IDirect3DDevice7 *iface,
- DWORD LightIndex,
- D3DLIGHT7 *Light)
+static HRESULT WINAPI d3d_device7_GetLight_FPUSetup(IDirect3DDevice7 *iface, DWORD light_idx, D3DLIGHT7 *light)
{
- return IDirect3DDeviceImpl_7_GetLight(iface, LightIndex, Light);
+ return d3d_device7_GetLight(iface, light_idx, light);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_GetLight_FPUPreserve(IDirect3DDevice7 *iface,
- DWORD LightIndex,
- D3DLIGHT7 *Light)
+static HRESULT WINAPI d3d_device7_GetLight_FPUPreserve(IDirect3DDevice7 *iface, DWORD light_idx, D3DLIGHT7 *light)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_GetLight(iface, LightIndex, Light);
+ hr = d3d_device7_GetLight(iface, light_idx, light);
set_fpu_control_word(old_fpucw);
return hr;
@@ -5581,35 +5283,32 @@ IDirect3DDeviceImpl_7_GetLight_FPUPreserve(IDirect3DDevice7 *iface,
* For details see IWineD3DDevice::BeginStateBlock
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_BeginStateBlock(IDirect3DDevice7 *iface)
+static HRESULT d3d_device7_BeginStateBlock(IDirect3DDevice7 *iface)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
HRESULT hr;
TRACE("iface %p.\n", iface);
wined3d_mutex_lock();
- hr = wined3d_device_begin_stateblock(This->wined3d_device);
+ hr = wined3d_device_begin_stateblock(device->wined3d_device);
wined3d_mutex_unlock();
return hr_ddraw_from_wined3d(hr);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_BeginStateBlock_FPUSetup(IDirect3DDevice7 *iface)
+static HRESULT WINAPI d3d_device7_BeginStateBlock_FPUSetup(IDirect3DDevice7 *iface)
{
- return IDirect3DDeviceImpl_7_BeginStateBlock(iface);
+ return d3d_device7_BeginStateBlock(iface);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_BeginStateBlock_FPUPreserve(IDirect3DDevice7 *iface)
+static HRESULT WINAPI d3d_device7_BeginStateBlock_FPUPreserve(IDirect3DDevice7 *iface)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_BeginStateBlock(iface);
+ hr = d3d_device7_BeginStateBlock(iface);
set_fpu_control_word(old_fpucw);
return hr;
@@ -5632,66 +5331,57 @@ IDirect3DDeviceImpl_7_BeginStateBlock_FPUPreserve(IDirect3DDevice7 *iface)
* See IWineD3DDevice::EndStateBlock for more details
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_EndStateBlock(IDirect3DDevice7 *iface,
- DWORD *BlockHandle)
+static HRESULT d3d_device7_EndStateBlock(IDirect3DDevice7 *iface, DWORD *stateblock)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
struct wined3d_stateblock *wined3d_sb;
HRESULT hr;
DWORD h;
- TRACE("iface %p, stateblock %p.\n", iface, BlockHandle);
+ TRACE("iface %p, stateblock %p.\n", iface, stateblock);
- if(!BlockHandle)
- {
- WARN("BlockHandle == NULL, returning DDERR_INVALIDPARAMS\n");
+ if (!stateblock)
return DDERR_INVALIDPARAMS;
- }
wined3d_mutex_lock();
- hr = wined3d_device_end_stateblock(This->wined3d_device, &wined3d_sb);
+ hr = wined3d_device_end_stateblock(device->wined3d_device, &wined3d_sb);
if (FAILED(hr))
{
WARN("Failed to end stateblock, hr %#x.\n", hr);
wined3d_mutex_unlock();
- *BlockHandle = 0;
+ *stateblock = 0;
return hr_ddraw_from_wined3d(hr);
}
- h = ddraw_allocate_handle(&This->handle_table, wined3d_sb, DDRAW_HANDLE_STATEBLOCK);
+ h = ddraw_allocate_handle(&device->handle_table, wined3d_sb, DDRAW_HANDLE_STATEBLOCK);
if (h == DDRAW_INVALID_HANDLE)
{
ERR("Failed to allocate a stateblock handle.\n");
wined3d_stateblock_decref(wined3d_sb);
wined3d_mutex_unlock();
- *BlockHandle = 0;
+ *stateblock = 0;
return DDERR_OUTOFMEMORY;
}
wined3d_mutex_unlock();
- *BlockHandle = h + 1;
+ *stateblock = h + 1;
return hr_ddraw_from_wined3d(hr);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_EndStateBlock_FPUSetup(IDirect3DDevice7 *iface,
- DWORD *BlockHandle)
+static HRESULT WINAPI d3d_device7_EndStateBlock_FPUSetup(IDirect3DDevice7 *iface, DWORD *stateblock)
{
- return IDirect3DDeviceImpl_7_EndStateBlock(iface, BlockHandle);
+ return d3d_device7_EndStateBlock(iface, stateblock);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_EndStateBlock_FPUPreserve(IDirect3DDevice7 *iface,
- DWORD *BlockHandle)
+static HRESULT WINAPI d3d_device7_EndStateBlock_FPUPreserve(IDirect3DDevice7 *iface, DWORD *stateblock)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_EndStateBlock(iface, BlockHandle);
+ hr = d3d_device7_EndStateBlock(iface, stateblock);
set_fpu_control_word(old_fpucw);
return hr;
@@ -5714,15 +5404,13 @@ IDirect3DDeviceImpl_7_EndStateBlock_FPUPreserve(IDirect3DDevice7 *iface,
* See IWineD3DSurface::PreLoad for details
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_PreLoad(IDirect3DDevice7 *iface,
- IDirectDrawSurface7 *Texture)
+static HRESULT d3d_device7_PreLoad(IDirect3DDevice7 *iface, IDirectDrawSurface7 *texture)
{
- struct ddraw_surface *surface = unsafe_impl_from_IDirectDrawSurface7(Texture);
+ struct ddraw_surface *surface = unsafe_impl_from_IDirectDrawSurface7(texture);
- TRACE("iface %p, texture %p.\n", iface, Texture);
+ TRACE("iface %p, texture %p.\n", iface, texture);
- if(!Texture)
+ if (!texture)
return DDERR_INVALIDPARAMS;
wined3d_mutex_lock();
@@ -5732,22 +5420,18 @@ IDirect3DDeviceImpl_7_PreLoad(IDirect3DDevice7 *iface,
return D3D_OK;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_PreLoad_FPUSetup(IDirect3DDevice7 *iface,
- IDirectDrawSurface7 *Texture)
+static HRESULT WINAPI d3d_device7_PreLoad_FPUSetup(IDirect3DDevice7 *iface, IDirectDrawSurface7 *texture)
{
- return IDirect3DDeviceImpl_7_PreLoad(iface, Texture);
+ return d3d_device7_PreLoad(iface, texture);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_PreLoad_FPUPreserve(IDirect3DDevice7 *iface,
- IDirectDrawSurface7 *Texture)
+static HRESULT WINAPI d3d_device7_PreLoad_FPUPreserve(IDirect3DDevice7 *iface, IDirectDrawSurface7 *texture)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_PreLoad(iface, Texture);
+ hr = d3d_device7_PreLoad(iface, texture);
set_fpu_control_word(old_fpucw);
return hr;
@@ -5766,18 +5450,16 @@ IDirect3DDeviceImpl_7_PreLoad_FPUPreserve(IDirect3DDevice7 *iface,
* D3DERR_INVALIDSTATEBLOCK if BlockHandle is NULL
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_ApplyStateBlock(IDirect3DDevice7 *iface,
- DWORD BlockHandle)
+static HRESULT d3d_device7_ApplyStateBlock(IDirect3DDevice7 *iface, DWORD stateblock)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
struct wined3d_stateblock *wined3d_sb;
HRESULT hr;
- TRACE("iface %p, stateblock %#x.\n", iface, BlockHandle);
+ TRACE("iface %p, stateblock %#x.\n", iface, stateblock);
wined3d_mutex_lock();
- wined3d_sb = ddraw_get_object(&This->handle_table, BlockHandle - 1, DDRAW_HANDLE_STATEBLOCK);
+ wined3d_sb = ddraw_get_object(&device->handle_table, stateblock - 1, DDRAW_HANDLE_STATEBLOCK);
if (!wined3d_sb)
{
WARN("Invalid stateblock handle.\n");
@@ -5791,22 +5473,18 @@ IDirect3DDeviceImpl_7_ApplyStateBlock(IDirect3DDevice7 *iface,
return hr_ddraw_from_wined3d(hr);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_ApplyStateBlock_FPUSetup(IDirect3DDevice7 *iface,
- DWORD BlockHandle)
+static HRESULT WINAPI d3d_device7_ApplyStateBlock_FPUSetup(IDirect3DDevice7 *iface, DWORD stateblock)
{
- return IDirect3DDeviceImpl_7_ApplyStateBlock(iface, BlockHandle);
+ return d3d_device7_ApplyStateBlock(iface, stateblock);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_ApplyStateBlock_FPUPreserve(IDirect3DDevice7 *iface,
- DWORD BlockHandle)
+static HRESULT WINAPI d3d_device7_ApplyStateBlock_FPUPreserve(IDirect3DDevice7 *iface, DWORD stateblock)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_ApplyStateBlock(iface, BlockHandle);
+ hr = d3d_device7_ApplyStateBlock(iface, stateblock);
set_fpu_control_word(old_fpucw);
return hr;
@@ -5828,18 +5506,16 @@ IDirect3DDeviceImpl_7_ApplyStateBlock_FPUPreserve(IDirect3DDevice7 *iface,
* See IWineD3DDevice::CaptureStateBlock for more details
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_CaptureStateBlock(IDirect3DDevice7 *iface,
- DWORD BlockHandle)
+static HRESULT d3d_device7_CaptureStateBlock(IDirect3DDevice7 *iface, DWORD stateblock)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
struct wined3d_stateblock *wined3d_sb;
HRESULT hr;
- TRACE("iface %p, stateblock %#x.\n", iface, BlockHandle);
+ TRACE("iface %p, stateblock %#x.\n", iface, stateblock);
wined3d_mutex_lock();
- wined3d_sb = ddraw_get_object(&This->handle_table, BlockHandle - 1, DDRAW_HANDLE_STATEBLOCK);
+ wined3d_sb = ddraw_get_object(&device->handle_table, stateblock - 1, DDRAW_HANDLE_STATEBLOCK);
if (!wined3d_sb)
{
WARN("Invalid stateblock handle.\n");
@@ -5853,22 +5529,18 @@ IDirect3DDeviceImpl_7_CaptureStateBlock(IDirect3DDevice7 *iface,
return hr_ddraw_from_wined3d(hr);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_CaptureStateBlock_FPUSetup(IDirect3DDevice7 *iface,
- DWORD BlockHandle)
+static HRESULT WINAPI d3d_device7_CaptureStateBlock_FPUSetup(IDirect3DDevice7 *iface, DWORD stateblock)
{
- return IDirect3DDeviceImpl_7_CaptureStateBlock(iface, BlockHandle);
+ return d3d_device7_CaptureStateBlock(iface, stateblock);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_CaptureStateBlock_FPUPreserve(IDirect3DDevice7 *iface,
- DWORD BlockHandle)
+static HRESULT WINAPI d3d_device7_CaptureStateBlock_FPUPreserve(IDirect3DDevice7 *iface, DWORD stateblock)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_CaptureStateBlock(iface, BlockHandle);
+ hr = d3d_device7_CaptureStateBlock(iface, stateblock);
set_fpu_control_word(old_fpucw);
return hr;
@@ -5889,19 +5561,17 @@ IDirect3DDeviceImpl_7_CaptureStateBlock_FPUPreserve(IDirect3DDevice7 *iface,
* D3DERR_INVALIDSTATEBLOCK if BlockHandle is 0
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_DeleteStateBlock(IDirect3DDevice7 *iface,
- DWORD BlockHandle)
+static HRESULT d3d_device7_DeleteStateBlock(IDirect3DDevice7 *iface, DWORD stateblock)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
struct wined3d_stateblock *wined3d_sb;
ULONG ref;
- TRACE("iface %p, stateblock %#x.\n", iface, BlockHandle);
+ TRACE("iface %p, stateblock %#x.\n", iface, stateblock);
wined3d_mutex_lock();
- wined3d_sb = ddraw_free_handle(&This->handle_table, BlockHandle - 1, DDRAW_HANDLE_STATEBLOCK);
+ wined3d_sb = ddraw_free_handle(&device->handle_table, stateblock - 1, DDRAW_HANDLE_STATEBLOCK);
if (!wined3d_sb)
{
WARN("Invalid stateblock handle.\n");
@@ -5919,22 +5589,18 @@ IDirect3DDeviceImpl_7_DeleteStateBlock(IDirect3DDevice7 *iface,
return D3D_OK;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_DeleteStateBlock_FPUSetup(IDirect3DDevice7 *iface,
- DWORD BlockHandle)
+static HRESULT WINAPI d3d_device7_DeleteStateBlock_FPUSetup(IDirect3DDevice7 *iface, DWORD stateblock)
{
- return IDirect3DDeviceImpl_7_DeleteStateBlock(iface, BlockHandle);
+ return d3d_device7_DeleteStateBlock(iface, stateblock);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_DeleteStateBlock_FPUPreserve(IDirect3DDevice7 *iface,
- DWORD BlockHandle)
+static HRESULT WINAPI d3d_device7_DeleteStateBlock_FPUPreserve(IDirect3DDevice7 *iface, DWORD stateblock)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_DeleteStateBlock(iface, BlockHandle);
+ hr = d3d_device7_DeleteStateBlock(iface, stateblock);
set_fpu_control_word(old_fpucw);
return hr;
@@ -5956,25 +5622,23 @@ IDirect3DDeviceImpl_7_DeleteStateBlock_FPUPreserve(IDirect3DDevice7 *iface,
* DDERR_INVALIDPARAMS if BlockHandle is NULL
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_CreateStateBlock(IDirect3DDevice7 *iface,
- D3DSTATEBLOCKTYPE Type,
- DWORD *BlockHandle)
+static HRESULT d3d_device7_CreateStateBlock(IDirect3DDevice7 *iface,
+ D3DSTATEBLOCKTYPE type, DWORD *stateblock)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
struct wined3d_stateblock *wined3d_sb;
HRESULT hr;
DWORD h;
- TRACE("iface %p, type %#x, stateblock %p.\n", iface, Type, BlockHandle);
+ TRACE("iface %p, type %#x, stateblock %p.\n", iface, type, stateblock);
- if(!BlockHandle)
- {
- WARN("BlockHandle == NULL, returning DDERR_INVALIDPARAMS\n");
+ if (!stateblock)
return DDERR_INVALIDPARAMS;
- }
- if(Type != D3DSBT_ALL && Type != D3DSBT_PIXELSTATE &&
- Type != D3DSBT_VERTEXSTATE ) {
+
+ if (type != D3DSBT_ALL
+ && type != D3DSBT_PIXELSTATE
+ && type != D3DSBT_VERTEXSTATE)
+ {
WARN("Unexpected stateblock type, returning DDERR_INVALIDPARAMS\n");
return DDERR_INVALIDPARAMS;
}
@@ -5982,7 +5646,7 @@ IDirect3DDeviceImpl_7_CreateStateBlock(IDirect3DDevice7 *iface,
wined3d_mutex_lock();
/* The D3DSTATEBLOCKTYPE enum is fine here. */
- hr = wined3d_stateblock_create(This->wined3d_device, Type, &wined3d_sb);
+ hr = wined3d_stateblock_create(device->wined3d_device, type, &wined3d_sb);
if (FAILED(hr))
{
WARN("Failed to create stateblock, hr %#x.\n", hr);
@@ -5990,7 +5654,7 @@ IDirect3DDeviceImpl_7_CreateStateBlock(IDirect3DDevice7 *iface,
return hr_ddraw_from_wined3d(hr);
}
- h = ddraw_allocate_handle(&This->handle_table, wined3d_sb, DDRAW_HANDLE_STATEBLOCK);
+ h = ddraw_allocate_handle(&device->handle_table, wined3d_sb, DDRAW_HANDLE_STATEBLOCK);
if (h == DDRAW_INVALID_HANDLE)
{
ERR("Failed to allocate stateblock handle.\n");
@@ -5999,36 +5663,31 @@ IDirect3DDeviceImpl_7_CreateStateBlock(IDirect3DDevice7 *iface,
return DDERR_OUTOFMEMORY;
}
- *BlockHandle = h + 1;
+ *stateblock = h + 1;
wined3d_mutex_unlock();
return hr_ddraw_from_wined3d(hr);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_CreateStateBlock_FPUSetup(IDirect3DDevice7 *iface,
- D3DSTATEBLOCKTYPE Type,
- DWORD *BlockHandle)
+static HRESULT WINAPI d3d_device7_CreateStateBlock_FPUSetup(IDirect3DDevice7 *iface,
+ D3DSTATEBLOCKTYPE type, DWORD *stateblock)
{
- return IDirect3DDeviceImpl_7_CreateStateBlock(iface, Type, BlockHandle);
+ return d3d_device7_CreateStateBlock(iface, type, stateblock);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_CreateStateBlock_FPUPreserve(IDirect3DDevice7 *iface,
- D3DSTATEBLOCKTYPE Type,
- DWORD *BlockHandle)
+static HRESULT WINAPI d3d_device7_CreateStateBlock_FPUPreserve(IDirect3DDevice7 *iface,
+ D3DSTATEBLOCKTYPE type, DWORD *stateblock)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr =IDirect3DDeviceImpl_7_CreateStateBlock(iface, Type, BlockHandle);
+ hr = d3d_device7_CreateStateBlock(iface, type, stateblock);
set_fpu_control_word(old_fpucw);
return hr;
}
-/* Helper function for IDirect3DDeviceImpl_7_Load. */
static BOOL is_mip_level_subset(struct ddraw_surface *dest, struct ddraw_surface *src)
{
struct ddraw_surface *src_level, *dest_level;
@@ -6076,8 +5735,7 @@ static BOOL is_mip_level_subset(struct ddraw_surface *dest, struct ddraw_surface
return !dest_level && levelFound;
}
-/* Helper function for IDirect3DDeviceImpl_7_Load. */
-static void copy_mipmap_chain(IDirect3DDeviceImpl *device, struct ddraw_surface *dest,
+static void copy_mipmap_chain(struct d3d_device *device, struct ddraw_surface *dest,
struct ddraw_surface *src, const POINT *DestPoint, const RECT *SrcRect)
{
struct ddraw_surface *src_level, *dest_level;
@@ -6189,43 +5847,38 @@ static void copy_mipmap_chain(IDirect3DDeviceImpl *device, struct ddraw_surface
*
*
*****************************************************************************/
-
-static HRESULT
-IDirect3DDeviceImpl_7_Load(IDirect3DDevice7 *iface,
- IDirectDrawSurface7 *DestTex,
- POINT *DestPoint,
- IDirectDrawSurface7 *SrcTex,
- RECT *SrcRect,
- DWORD Flags)
-{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
- struct ddraw_surface *dest = unsafe_impl_from_IDirectDrawSurface7(DestTex);
- struct ddraw_surface *src = unsafe_impl_from_IDirectDrawSurface7(SrcTex);
+static HRESULT d3d_device7_Load(IDirect3DDevice7 *iface, IDirectDrawSurface7 *dst_texture, POINT *dst_pos,
+ IDirectDrawSurface7 *src_texture, RECT *src_rect, DWORD flags)
+{
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
+ struct ddraw_surface *dest = unsafe_impl_from_IDirectDrawSurface7(dst_texture);
+ struct ddraw_surface *src = unsafe_impl_from_IDirectDrawSurface7(src_texture);
POINT destpoint;
RECT srcrect;
TRACE("iface %p, dst_texture %p, dst_pos %s, src_texture %p, src_rect %s, flags %#x.\n",
- iface, DestTex, wine_dbgstr_point(DestPoint), SrcTex, wine_dbgstr_rect(SrcRect), Flags);
+ iface, dst_texture, wine_dbgstr_point(dst_pos), src_texture, wine_dbgstr_rect(src_rect), flags);
if( (!src) || (!dest) )
return DDERR_INVALIDPARAMS;
wined3d_mutex_lock();
- if (SrcRect) srcrect = *SrcRect;
- else
+ if (!src_rect)
{
srcrect.left = srcrect.top = 0;
srcrect.right = src->surface_desc.dwWidth;
srcrect.bottom = src->surface_desc.dwHeight;
}
-
- if (DestPoint) destpoint = *DestPoint;
else
- {
+ srcrect = *src_rect;
+
+ if (!dst_pos)
destpoint.x = destpoint.y = 0;
- }
- /* Check bad dimensions. DestPoint is validated against src, not dest, because
+ else
+ destpoint = *dst_pos;
+
+ /* Check bad dimensions. dst_pos is validated against src, not dest, because
* destination can be a subset of mip levels, in which case actual coordinates used
* for it may be divided. If any dimension of dest is larger than source, it can't be
* mip level subset, so an error can be returned early.
@@ -6287,9 +5940,9 @@ IDirect3DDeviceImpl_7_Load(IDirect3DDevice7 *iface,
return DDERR_INVALIDPARAMS;
}
}
- else if (Flags & dest_face_flag)
+ else if (flags & dest_face_flag)
{
- copy_mipmap_chain(This, dest_face, src_face, &destpoint, &srcrect);
+ copy_mipmap_chain(device, dest_face, src_face, &destpoint, &srcrect);
}
if (src_face_flag < DDSCAPS2_CUBEMAP_NEGATIVEZ)
@@ -6357,37 +6010,27 @@ IDirect3DDeviceImpl_7_Load(IDirect3DDevice7 *iface,
return DDERR_INVALIDPARAMS;
}
- copy_mipmap_chain(This, dest, src, &destpoint, &srcrect);
+ copy_mipmap_chain(device, dest, src, &destpoint, &srcrect);
wined3d_mutex_unlock();
return D3D_OK;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_Load_FPUSetup(IDirect3DDevice7 *iface,
- IDirectDrawSurface7 *DestTex,
- POINT *DestPoint,
- IDirectDrawSurface7 *SrcTex,
- RECT *SrcRect,
- DWORD Flags)
+static HRESULT WINAPI d3d_device7_Load_FPUSetup(IDirect3DDevice7 *iface, IDirectDrawSurface7 *dst_texture,
+ POINT *dst_pos, IDirectDrawSurface7 *src_texture, RECT *src_rect, DWORD flags)
{
- return IDirect3DDeviceImpl_7_Load(iface, DestTex, DestPoint, SrcTex, SrcRect, Flags);
+ return d3d_device7_Load(iface, dst_texture, dst_pos, src_texture, src_rect, flags);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_Load_FPUPreserve(IDirect3DDevice7 *iface,
- IDirectDrawSurface7 *DestTex,
- POINT *DestPoint,
- IDirectDrawSurface7 *SrcTex,
- RECT *SrcRect,
- DWORD Flags)
+static HRESULT WINAPI d3d_device7_Load_FPUPreserve(IDirect3DDevice7 *iface, IDirectDrawSurface7 *dst_texture,
+ POINT *dst_pos, IDirectDrawSurface7 *src_texture, RECT *src_rect, DWORD flags)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_Load(iface, DestTex, DestPoint, SrcTex, SrcRect, Flags);
+ hr = d3d_device7_Load(iface, dst_texture, dst_pos, src_texture, src_rect, flags);
set_fpu_control_word(old_fpucw);
return hr;
@@ -6409,41 +6052,32 @@ IDirect3DDeviceImpl_7_Load_FPUPreserve(IDirect3DDevice7 *iface,
* For more details, see IWineD3DDevice::SetLightEnable
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_LightEnable(IDirect3DDevice7 *iface,
- DWORD LightIndex,
- BOOL Enable)
+static HRESULT d3d_device7_LightEnable(IDirect3DDevice7 *iface, DWORD light_idx, BOOL enabled)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
HRESULT hr;
- TRACE("iface %p, light_idx %u, enabled %#x.\n", iface, LightIndex, Enable);
+ TRACE("iface %p, light_idx %u, enabled %#x.\n", iface, light_idx, enabled);
wined3d_mutex_lock();
- hr = wined3d_device_set_light_enable(This->wined3d_device, LightIndex, Enable);
+ hr = wined3d_device_set_light_enable(device->wined3d_device, light_idx, enabled);
wined3d_mutex_unlock();
return hr_ddraw_from_wined3d(hr);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_LightEnable_FPUSetup(IDirect3DDevice7 *iface,
- DWORD LightIndex,
- BOOL Enable)
+static HRESULT WINAPI d3d_device7_LightEnable_FPUSetup(IDirect3DDevice7 *iface, DWORD light_idx, BOOL enabled)
{
- return IDirect3DDeviceImpl_7_LightEnable(iface, LightIndex, Enable);
+ return d3d_device7_LightEnable(iface, light_idx, enabled);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_LightEnable_FPUPreserve(IDirect3DDevice7 *iface,
- DWORD LightIndex,
- BOOL Enable)
+static HRESULT WINAPI d3d_device7_LightEnable_FPUPreserve(IDirect3DDevice7 *iface, DWORD light_idx, BOOL enabled)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_LightEnable(iface, LightIndex, Enable);
+ hr = d3d_device7_LightEnable(iface, light_idx, enabled);
set_fpu_control_word(old_fpucw);
return hr;
@@ -6466,44 +6100,35 @@ IDirect3DDeviceImpl_7_LightEnable_FPUPreserve(IDirect3DDevice7 *iface,
* See IWineD3DDevice::GetLightEnable for more details
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_GetLightEnable(IDirect3DDevice7 *iface,
- DWORD LightIndex,
- BOOL* Enable)
+static HRESULT d3d_device7_GetLightEnable(IDirect3DDevice7 *iface, DWORD light_idx, BOOL *enabled)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
HRESULT hr;
- TRACE("iface %p, light_idx %u, enabled %p.\n", iface, LightIndex, Enable);
+ TRACE("iface %p, light_idx %u, enabled %p.\n", iface, light_idx, enabled);
- if(!Enable)
+ if (!enabled)
return DDERR_INVALIDPARAMS;
wined3d_mutex_lock();
- hr = wined3d_device_get_light_enable(This->wined3d_device, LightIndex, Enable);
+ hr = wined3d_device_get_light_enable(device->wined3d_device, light_idx, enabled);
wined3d_mutex_unlock();
return hr_ddraw_from_wined3d(hr);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_GetLightEnable_FPUSetup(IDirect3DDevice7 *iface,
- DWORD LightIndex,
- BOOL* Enable)
+static HRESULT WINAPI d3d_device7_GetLightEnable_FPUSetup(IDirect3DDevice7 *iface, DWORD light_idx, BOOL *enabled)
{
- return IDirect3DDeviceImpl_7_GetLightEnable(iface, LightIndex, Enable);
+ return d3d_device7_GetLightEnable(iface, light_idx, enabled);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_GetLightEnable_FPUPreserve(IDirect3DDevice7 *iface,
- DWORD LightIndex,
- BOOL* Enable)
+static HRESULT WINAPI d3d_device7_GetLightEnable_FPUPreserve(IDirect3DDevice7 *iface, DWORD light_idx, BOOL *enabled)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_GetLightEnable(iface, LightIndex, Enable);
+ hr = d3d_device7_GetLightEnable(iface, light_idx, enabled);
set_fpu_control_word(old_fpucw);
return hr;
@@ -6526,44 +6151,35 @@ IDirect3DDeviceImpl_7_GetLightEnable_FPUPreserve(IDirect3DDevice7 *iface,
* See IWineD3DDevice::SetClipPlane for more details
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_SetClipPlane(IDirect3DDevice7 *iface,
- DWORD Index,
- D3DVALUE* PlaneEquation)
+static HRESULT d3d_device7_SetClipPlane(IDirect3DDevice7 *iface, DWORD idx, D3DVALUE *plane)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
HRESULT hr;
- TRACE("iface %p, idx %u, plane %p.\n", iface, Index, PlaneEquation);
+ TRACE("iface %p, idx %u, plane %p.\n", iface, idx, plane);
- if(!PlaneEquation)
+ if (!plane)
return DDERR_INVALIDPARAMS;
wined3d_mutex_lock();
- hr = wined3d_device_set_clip_plane(This->wined3d_device, Index, PlaneEquation);
+ hr = wined3d_device_set_clip_plane(device->wined3d_device, idx, plane);
wined3d_mutex_unlock();
return hr;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_SetClipPlane_FPUSetup(IDirect3DDevice7 *iface,
- DWORD Index,
- D3DVALUE* PlaneEquation)
+static HRESULT WINAPI d3d_device7_SetClipPlane_FPUSetup(IDirect3DDevice7 *iface, DWORD idx, D3DVALUE *plane)
{
- return IDirect3DDeviceImpl_7_SetClipPlane(iface, Index, PlaneEquation);
+ return d3d_device7_SetClipPlane(iface, idx, plane);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_SetClipPlane_FPUPreserve(IDirect3DDevice7 *iface,
- DWORD Index,
- D3DVALUE* PlaneEquation)
+static HRESULT WINAPI d3d_device7_SetClipPlane_FPUPreserve(IDirect3DDevice7 *iface, DWORD idx, D3DVALUE *plane)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_SetClipPlane(iface, Index, PlaneEquation);
+ hr = d3d_device7_SetClipPlane(iface, idx, plane);
set_fpu_control_word(old_fpucw);
return hr;
@@ -6584,44 +6200,35 @@ IDirect3DDeviceImpl_7_SetClipPlane_FPUPreserve(IDirect3DDevice7 *iface,
* See IWineD3DDevice::GetClipPlane for more details
*
*****************************************************************************/
-static HRESULT
-IDirect3DDeviceImpl_7_GetClipPlane(IDirect3DDevice7 *iface,
- DWORD Index,
- D3DVALUE* PlaneEquation)
+static HRESULT d3d_device7_GetClipPlane(IDirect3DDevice7 *iface, DWORD idx, D3DVALUE *plane)
{
- IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface);
+ struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
HRESULT hr;
- TRACE("iface %p, idx %u, plane %p.\n", iface, Index, PlaneEquation);
+ TRACE("iface %p, idx %u, plane %p.\n", iface, idx, plane);
- if(!PlaneEquation)
+ if (!plane)
return DDERR_INVALIDPARAMS;
wined3d_mutex_lock();
- hr = wined3d_device_get_clip_plane(This->wined3d_device, Index, PlaneEquation);
+ hr = wined3d_device_get_clip_plane(device->wined3d_device, idx, plane);
wined3d_mutex_unlock();
return hr;
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_GetClipPlane_FPUSetup(IDirect3DDevice7 *iface,
- DWORD Index,
- D3DVALUE* PlaneEquation)
+static HRESULT WINAPI d3d_device7_GetClipPlane_FPUSetup(IDirect3DDevice7 *iface, DWORD idx, D3DVALUE *plane)
{
- return IDirect3DDeviceImpl_7_GetClipPlane(iface, Index, PlaneEquation);
+ return d3d_device7_GetClipPlane(iface, idx, plane);
}
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_GetClipPlane_FPUPreserve(IDirect3DDevice7 *iface,
- DWORD Index,
- D3DVALUE* PlaneEquation)
+static HRESULT WINAPI d3d_device7_GetClipPlane_FPUPreserve(IDirect3DDevice7 *iface, DWORD idx, D3DVALUE *plane)
{
HRESULT hr;
WORD old_fpucw;
old_fpucw = d3d_fpu_setup();
- hr = IDirect3DDeviceImpl_7_GetClipPlane(iface, Index, PlaneEquation);
+ hr = d3d_device7_GetClipPlane(iface, idx, plane);
set_fpu_control_word(old_fpucw);
return hr;
@@ -6643,19 +6250,15 @@ IDirect3DDeviceImpl_7_GetClipPlane_FPUPreserve(IDirect3DDevice7 *iface,
* S_FALSE, because it's a non-debug driver
*
*****************************************************************************/
-static HRESULT WINAPI
-IDirect3DDeviceImpl_7_GetInfo(IDirect3DDevice7 *iface,
- DWORD DevInfoID,
- void *DevInfoStruct,
- DWORD Size)
+static HRESULT WINAPI d3d_device7_GetInfo(IDirect3DDevice7 *iface, DWORD info_id, void *info, DWORD info_size)
{
TRACE("iface %p, info_id %#x, info %p, info_size %u.\n",
- iface, DevInfoID, DevInfoStruct, Size);
+ iface, info_id, info, info_size);
if (TRACE_ON(ddraw))
{
TRACE(" info requested : ");
- switch (DevInfoID)
+ switch (info_id)
{
case D3DDEVINFOID_TEXTUREMANAGER: TRACE("D3DDEVINFOID_TEXTUREMANAGER\n"); break;
case D3DDEVINFOID_D3DTEXTUREMANAGER: TRACE("D3DDEVINFOID_D3DTEXTUREMANAGER\n"); break;
@@ -6680,226 +6283,226 @@ IDirect3DDeviceImpl_7_GetInfo(IDirect3DDevice7 *iface,
static const struct IDirect3DDevice7Vtbl d3d_device7_fpu_setup_vtbl =
{
/*** IUnknown Methods ***/
- IDirect3DDeviceImpl_7_QueryInterface,
- IDirect3DDeviceImpl_7_AddRef,
- IDirect3DDeviceImpl_7_Release,
+ d3d_device7_QueryInterface,
+ d3d_device7_AddRef,
+ d3d_device7_Release,
/*** IDirect3DDevice7 ***/
- IDirect3DDeviceImpl_7_GetCaps_FPUSetup,
- IDirect3DDeviceImpl_7_EnumTextureFormats_FPUSetup,
- IDirect3DDeviceImpl_7_BeginScene_FPUSetup,
- IDirect3DDeviceImpl_7_EndScene_FPUSetup,
- IDirect3DDeviceImpl_7_GetDirect3D,
- IDirect3DDeviceImpl_7_SetRenderTarget_FPUSetup,
- IDirect3DDeviceImpl_7_GetRenderTarget,
- IDirect3DDeviceImpl_7_Clear_FPUSetup,
- IDirect3DDeviceImpl_7_SetTransform_FPUSetup,
- IDirect3DDeviceImpl_7_GetTransform_FPUSetup,
- IDirect3DDeviceImpl_7_SetViewport_FPUSetup,
- IDirect3DDeviceImpl_7_MultiplyTransform_FPUSetup,
- IDirect3DDeviceImpl_7_GetViewport_FPUSetup,
- IDirect3DDeviceImpl_7_SetMaterial_FPUSetup,
- IDirect3DDeviceImpl_7_GetMaterial_FPUSetup,
- IDirect3DDeviceImpl_7_SetLight_FPUSetup,
- IDirect3DDeviceImpl_7_GetLight_FPUSetup,
- IDirect3DDeviceImpl_7_SetRenderState_FPUSetup,
- IDirect3DDeviceImpl_7_GetRenderState_FPUSetup,
- IDirect3DDeviceImpl_7_BeginStateBlock_FPUSetup,
- IDirect3DDeviceImpl_7_EndStateBlock_FPUSetup,
- IDirect3DDeviceImpl_7_PreLoad_FPUSetup,
- IDirect3DDeviceImpl_7_DrawPrimitive_FPUSetup,
- IDirect3DDeviceImpl_7_DrawIndexedPrimitive_FPUSetup,
- IDirect3DDeviceImpl_7_SetClipStatus,
- IDirect3DDeviceImpl_7_GetClipStatus,
- IDirect3DDeviceImpl_7_DrawPrimitiveStrided_FPUSetup,
- IDirect3DDeviceImpl_7_DrawIndexedPrimitiveStrided_FPUSetup,
- IDirect3DDeviceImpl_7_DrawPrimitiveVB_FPUSetup,
- IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB_FPUSetup,
- IDirect3DDeviceImpl_7_ComputeSphereVisibility,
- IDirect3DDeviceImpl_7_GetTexture_FPUSetup,
- IDirect3DDeviceImpl_7_SetTexture_FPUSetup,
- IDirect3DDeviceImpl_7_GetTextureStageState_FPUSetup,
- IDirect3DDeviceImpl_7_SetTextureStageState_FPUSetup,
- IDirect3DDeviceImpl_7_ValidateDevice_FPUSetup,
- IDirect3DDeviceImpl_7_ApplyStateBlock_FPUSetup,
- IDirect3DDeviceImpl_7_CaptureStateBlock_FPUSetup,
- IDirect3DDeviceImpl_7_DeleteStateBlock_FPUSetup,
- IDirect3DDeviceImpl_7_CreateStateBlock_FPUSetup,
- IDirect3DDeviceImpl_7_Load_FPUSetup,
- IDirect3DDeviceImpl_7_LightEnable_FPUSetup,
- IDirect3DDeviceImpl_7_GetLightEnable_FPUSetup,
- IDirect3DDeviceImpl_7_SetClipPlane_FPUSetup,
- IDirect3DDeviceImpl_7_GetClipPlane_FPUSetup,
- IDirect3DDeviceImpl_7_GetInfo
+ d3d_device7_GetCaps_FPUSetup,
+ d3d_device7_EnumTextureFormats_FPUSetup,
+ d3d_device7_BeginScene_FPUSetup,
+ d3d_device7_EndScene_FPUSetup,
+ d3d_device7_GetDirect3D,
+ d3d_device7_SetRenderTarget_FPUSetup,
+ d3d_device7_GetRenderTarget,
+ d3d_device7_Clear_FPUSetup,
+ d3d_device7_SetTransform_FPUSetup,
+ d3d_device7_GetTransform_FPUSetup,
+ d3d_device7_SetViewport_FPUSetup,
+ d3d_device7_MultiplyTransform_FPUSetup,
+ d3d_device7_GetViewport_FPUSetup,
+ d3d_device7_SetMaterial_FPUSetup,
+ d3d_device7_GetMaterial_FPUSetup,
+ d3d_device7_SetLight_FPUSetup,
+ d3d_device7_GetLight_FPUSetup,
+ d3d_device7_SetRenderState_FPUSetup,
+ d3d_device7_GetRenderState_FPUSetup,
+ d3d_device7_BeginStateBlock_FPUSetup,
+ d3d_device7_EndStateBlock_FPUSetup,
+ d3d_device7_PreLoad_FPUSetup,
+ d3d_device7_DrawPrimitive_FPUSetup,
+ d3d_device7_DrawIndexedPrimitive_FPUSetup,
+ d3d_device7_SetClipStatus,
+ d3d_device7_GetClipStatus,
+ d3d_device7_DrawPrimitiveStrided_FPUSetup,
+ d3d_device7_DrawIndexedPrimitiveStrided_FPUSetup,
+ d3d_device7_DrawPrimitiveVB_FPUSetup,
+ d3d_device7_DrawIndexedPrimitiveVB_FPUSetup,
+ d3d_device7_ComputeSphereVisibility,
+ d3d_device7_GetTexture_FPUSetup,
+ d3d_device7_SetTexture_FPUSetup,
+ d3d_device7_GetTextureStageState_FPUSetup,
+ d3d_device7_SetTextureStageState_FPUSetup,
+ d3d_device7_ValidateDevice_FPUSetup,
+ d3d_device7_ApplyStateBlock_FPUSetup,
+ d3d_device7_CaptureStateBlock_FPUSetup,
+ d3d_device7_DeleteStateBlock_FPUSetup,
+ d3d_device7_CreateStateBlock_FPUSetup,
+ d3d_device7_Load_FPUSetup,
+ d3d_device7_LightEnable_FPUSetup,
+ d3d_device7_GetLightEnable_FPUSetup,
+ d3d_device7_SetClipPlane_FPUSetup,
+ d3d_device7_GetClipPlane_FPUSetup,
+ d3d_device7_GetInfo
};
static const struct IDirect3DDevice7Vtbl d3d_device7_fpu_preserve_vtbl =
{
/*** IUnknown Methods ***/
- IDirect3DDeviceImpl_7_QueryInterface,
- IDirect3DDeviceImpl_7_AddRef,
- IDirect3DDeviceImpl_7_Release,
+ d3d_device7_QueryInterface,
+ d3d_device7_AddRef,
+ d3d_device7_Release,
/*** IDirect3DDevice7 ***/
- IDirect3DDeviceImpl_7_GetCaps_FPUPreserve,
- IDirect3DDeviceImpl_7_EnumTextureFormats_FPUPreserve,
- IDirect3DDeviceImpl_7_BeginScene_FPUPreserve,
- IDirect3DDeviceImpl_7_EndScene_FPUPreserve,
- IDirect3DDeviceImpl_7_GetDirect3D,
- IDirect3DDeviceImpl_7_SetRenderTarget_FPUPreserve,
- IDirect3DDeviceImpl_7_GetRenderTarget,
- IDirect3DDeviceImpl_7_Clear_FPUPreserve,
- IDirect3DDeviceImpl_7_SetTransform_FPUPreserve,
- IDirect3DDeviceImpl_7_GetTransform_FPUPreserve,
- IDirect3DDeviceImpl_7_SetViewport_FPUPreserve,
- IDirect3DDeviceImpl_7_MultiplyTransform_FPUPreserve,
- IDirect3DDeviceImpl_7_GetViewport_FPUPreserve,
- IDirect3DDeviceImpl_7_SetMaterial_FPUPreserve,
- IDirect3DDeviceImpl_7_GetMaterial_FPUPreserve,
- IDirect3DDeviceImpl_7_SetLight_FPUPreserve,
- IDirect3DDeviceImpl_7_GetLight_FPUPreserve,
- IDirect3DDeviceImpl_7_SetRenderState_FPUPreserve,
- IDirect3DDeviceImpl_7_GetRenderState_FPUPreserve,
- IDirect3DDeviceImpl_7_BeginStateBlock_FPUPreserve,
- IDirect3DDeviceImpl_7_EndStateBlock_FPUPreserve,
- IDirect3DDeviceImpl_7_PreLoad_FPUPreserve,
- IDirect3DDeviceImpl_7_DrawPrimitive_FPUPreserve,
- IDirect3DDeviceImpl_7_DrawIndexedPrimitive_FPUPreserve,
- IDirect3DDeviceImpl_7_SetClipStatus,
- IDirect3DDeviceImpl_7_GetClipStatus,
- IDirect3DDeviceImpl_7_DrawPrimitiveStrided_FPUPreserve,
- IDirect3DDeviceImpl_7_DrawIndexedPrimitiveStrided_FPUPreserve,
- IDirect3DDeviceImpl_7_DrawPrimitiveVB_FPUPreserve,
- IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB_FPUPreserve,
- IDirect3DDeviceImpl_7_ComputeSphereVisibility,
- IDirect3DDeviceImpl_7_GetTexture_FPUPreserve,
- IDirect3DDeviceImpl_7_SetTexture_FPUPreserve,
- IDirect3DDeviceImpl_7_GetTextureStageState_FPUPreserve,
- IDirect3DDeviceImpl_7_SetTextureStageState_FPUPreserve,
- IDirect3DDeviceImpl_7_ValidateDevice_FPUPreserve,
- IDirect3DDeviceImpl_7_ApplyStateBlock_FPUPreserve,
- IDirect3DDeviceImpl_7_CaptureStateBlock_FPUPreserve,
- IDirect3DDeviceImpl_7_DeleteStateBlock_FPUPreserve,
- IDirect3DDeviceImpl_7_CreateStateBlock_FPUPreserve,
- IDirect3DDeviceImpl_7_Load_FPUPreserve,
- IDirect3DDeviceImpl_7_LightEnable_FPUPreserve,
- IDirect3DDeviceImpl_7_GetLightEnable_FPUPreserve,
- IDirect3DDeviceImpl_7_SetClipPlane_FPUPreserve,
- IDirect3DDeviceImpl_7_GetClipPlane_FPUPreserve,
- IDirect3DDeviceImpl_7_GetInfo
+ d3d_device7_GetCaps_FPUPreserve,
+ d3d_device7_EnumTextureFormats_FPUPreserve,
+ d3d_device7_BeginScene_FPUPreserve,
+ d3d_device7_EndScene_FPUPreserve,
+ d3d_device7_GetDirect3D,
+ d3d_device7_SetRenderTarget_FPUPreserve,
+ d3d_device7_GetRenderTarget,
+ d3d_device7_Clear_FPUPreserve,
+ d3d_device7_SetTransform_FPUPreserve,
+ d3d_device7_GetTransform_FPUPreserve,
+ d3d_device7_SetViewport_FPUPreserve,
+ d3d_device7_MultiplyTransform_FPUPreserve,
+ d3d_device7_GetViewport_FPUPreserve,
+ d3d_device7_SetMaterial_FPUPreserve,
+ d3d_device7_GetMaterial_FPUPreserve,
+ d3d_device7_SetLight_FPUPreserve,
+ d3d_device7_GetLight_FPUPreserve,
+ d3d_device7_SetRenderState_FPUPreserve,
+ d3d_device7_GetRenderState_FPUPreserve,
+ d3d_device7_BeginStateBlock_FPUPreserve,
+ d3d_device7_EndStateBlock_FPUPreserve,
+ d3d_device7_PreLoad_FPUPreserve,
+ d3d_device7_DrawPrimitive_FPUPreserve,
+ d3d_device7_DrawIndexedPrimitive_FPUPreserve,
+ d3d_device7_SetClipStatus,
+ d3d_device7_GetClipStatus,
+ d3d_device7_DrawPrimitiveStrided_FPUPreserve,
+ d3d_device7_DrawIndexedPrimitiveStrided_FPUPreserve,
+ d3d_device7_DrawPrimitiveVB_FPUPreserve,
+ d3d_device7_DrawIndexedPrimitiveVB_FPUPreserve,
+ d3d_device7_ComputeSphereVisibility,
+ d3d_device7_GetTexture_FPUPreserve,
+ d3d_device7_SetTexture_FPUPreserve,
+ d3d_device7_GetTextureStageState_FPUPreserve,
+ d3d_device7_SetTextureStageState_FPUPreserve,
+ d3d_device7_ValidateDevice_FPUPreserve,
+ d3d_device7_ApplyStateBlock_FPUPreserve,
+ d3d_device7_CaptureStateBlock_FPUPreserve,
+ d3d_device7_DeleteStateBlock_FPUPreserve,
+ d3d_device7_CreateStateBlock_FPUPreserve,
+ d3d_device7_Load_FPUPreserve,
+ d3d_device7_LightEnable_FPUPreserve,
+ d3d_device7_GetLightEnable_FPUPreserve,
+ d3d_device7_SetClipPlane_FPUPreserve,
+ d3d_device7_GetClipPlane_FPUPreserve,
+ d3d_device7_GetInfo
};
static const struct IDirect3DDevice3Vtbl d3d_device3_vtbl =
{
/*** IUnknown Methods ***/
- IDirect3DDeviceImpl_3_QueryInterface,
- IDirect3DDeviceImpl_3_AddRef,
- IDirect3DDeviceImpl_3_Release,
+ d3d_device3_QueryInterface,
+ d3d_device3_AddRef,
+ d3d_device3_Release,
/*** IDirect3DDevice3 ***/
- IDirect3DDeviceImpl_3_GetCaps,
- IDirect3DDeviceImpl_3_GetStats,
- IDirect3DDeviceImpl_3_AddViewport,
- IDirect3DDeviceImpl_3_DeleteViewport,
- IDirect3DDeviceImpl_3_NextViewport,
- IDirect3DDeviceImpl_3_EnumTextureFormats,
- IDirect3DDeviceImpl_3_BeginScene,
- IDirect3DDeviceImpl_3_EndScene,
- IDirect3DDeviceImpl_3_GetDirect3D,
- IDirect3DDeviceImpl_3_SetCurrentViewport,
- IDirect3DDeviceImpl_3_GetCurrentViewport,
- IDirect3DDeviceImpl_3_SetRenderTarget,
- IDirect3DDeviceImpl_3_GetRenderTarget,
- IDirect3DDeviceImpl_3_Begin,
- IDirect3DDeviceImpl_3_BeginIndexed,
- IDirect3DDeviceImpl_3_Vertex,
- IDirect3DDeviceImpl_3_Index,
- IDirect3DDeviceImpl_3_End,
- IDirect3DDeviceImpl_3_GetRenderState,
- IDirect3DDeviceImpl_3_SetRenderState,
- IDirect3DDeviceImpl_3_GetLightState,
- IDirect3DDeviceImpl_3_SetLightState,
- IDirect3DDeviceImpl_3_SetTransform,
- IDirect3DDeviceImpl_3_GetTransform,
- IDirect3DDeviceImpl_3_MultiplyTransform,
- IDirect3DDeviceImpl_3_DrawPrimitive,
- IDirect3DDeviceImpl_3_DrawIndexedPrimitive,
- IDirect3DDeviceImpl_3_SetClipStatus,
- IDirect3DDeviceImpl_3_GetClipStatus,
- IDirect3DDeviceImpl_3_DrawPrimitiveStrided,
- IDirect3DDeviceImpl_3_DrawIndexedPrimitiveStrided,
- IDirect3DDeviceImpl_3_DrawPrimitiveVB,
- IDirect3DDeviceImpl_3_DrawIndexedPrimitiveVB,
- IDirect3DDeviceImpl_3_ComputeSphereVisibility,
- IDirect3DDeviceImpl_3_GetTexture,
- IDirect3DDeviceImpl_3_SetTexture,
- IDirect3DDeviceImpl_3_GetTextureStageState,
- IDirect3DDeviceImpl_3_SetTextureStageState,
- IDirect3DDeviceImpl_3_ValidateDevice
+ d3d_device3_GetCaps,
+ d3d_device3_GetStats,
+ d3d_device3_AddViewport,
+ d3d_device3_DeleteViewport,
+ d3d_device3_NextViewport,
+ d3d_device3_EnumTextureFormats,
+ d3d_device3_BeginScene,
+ d3d_device3_EndScene,
+ d3d_device3_GetDirect3D,
+ d3d_device3_SetCurrentViewport,
+ d3d_device3_GetCurrentViewport,
+ d3d_device3_SetRenderTarget,
+ d3d_device3_GetRenderTarget,
+ d3d_device3_Begin,
+ d3d_device3_BeginIndexed,
+ d3d_device3_Vertex,
+ d3d_device3_Index,
+ d3d_device3_End,
+ d3d_device3_GetRenderState,
+ d3d_device3_SetRenderState,
+ d3d_device3_GetLightState,
+ d3d_device3_SetLightState,
+ d3d_device3_SetTransform,
+ d3d_device3_GetTransform,
+ d3d_device3_MultiplyTransform,
+ d3d_device3_DrawPrimitive,
+ d3d_device3_DrawIndexedPrimitive,
+ d3d_device3_SetClipStatus,
+ d3d_device3_GetClipStatus,
+ d3d_device3_DrawPrimitiveStrided,
+ d3d_device3_DrawIndexedPrimitiveStrided,
+ d3d_device3_DrawPrimitiveVB,
+ d3d_device3_DrawIndexedPrimitiveVB,
+ d3d_device3_ComputeSphereVisibility,
+ d3d_device3_GetTexture,
+ d3d_device3_SetTexture,
+ d3d_device3_GetTextureStageState,
+ d3d_device3_SetTextureStageState,
+ d3d_device3_ValidateDevice
};
static const struct IDirect3DDevice2Vtbl d3d_device2_vtbl =
{
/*** IUnknown Methods ***/
- IDirect3DDeviceImpl_2_QueryInterface,
- IDirect3DDeviceImpl_2_AddRef,
- IDirect3DDeviceImpl_2_Release,
+ d3d_device2_QueryInterface,
+ d3d_device2_AddRef,
+ d3d_device2_Release,
/*** IDirect3DDevice2 ***/
- IDirect3DDeviceImpl_2_GetCaps,
- IDirect3DDeviceImpl_2_SwapTextureHandles,
- IDirect3DDeviceImpl_2_GetStats,
- IDirect3DDeviceImpl_2_AddViewport,
- IDirect3DDeviceImpl_2_DeleteViewport,
- IDirect3DDeviceImpl_2_NextViewport,
- IDirect3DDeviceImpl_2_EnumTextureFormats,
- IDirect3DDeviceImpl_2_BeginScene,
- IDirect3DDeviceImpl_2_EndScene,
- IDirect3DDeviceImpl_2_GetDirect3D,
- IDirect3DDeviceImpl_2_SetCurrentViewport,
- IDirect3DDeviceImpl_2_GetCurrentViewport,
- IDirect3DDeviceImpl_2_SetRenderTarget,
- IDirect3DDeviceImpl_2_GetRenderTarget,
- IDirect3DDeviceImpl_2_Begin,
- IDirect3DDeviceImpl_2_BeginIndexed,
- IDirect3DDeviceImpl_2_Vertex,
- IDirect3DDeviceImpl_2_Index,
- IDirect3DDeviceImpl_2_End,
- IDirect3DDeviceImpl_2_GetRenderState,
- IDirect3DDeviceImpl_2_SetRenderState,
- IDirect3DDeviceImpl_2_GetLightState,
- IDirect3DDeviceImpl_2_SetLightState,
- IDirect3DDeviceImpl_2_SetTransform,
- IDirect3DDeviceImpl_2_GetTransform,
- IDirect3DDeviceImpl_2_MultiplyTransform,
- IDirect3DDeviceImpl_2_DrawPrimitive,
- IDirect3DDeviceImpl_2_DrawIndexedPrimitive,
- IDirect3DDeviceImpl_2_SetClipStatus,
- IDirect3DDeviceImpl_2_GetClipStatus
+ d3d_device2_GetCaps,
+ d3d_device2_SwapTextureHandles,
+ d3d_device2_GetStats,
+ d3d_device2_AddViewport,
+ d3d_device2_DeleteViewport,
+ d3d_device2_NextViewport,
+ d3d_device2_EnumTextureFormats,
+ d3d_device2_BeginScene,
+ d3d_device2_EndScene,
+ d3d_device2_GetDirect3D,
+ d3d_device2_SetCurrentViewport,
+ d3d_device2_GetCurrentViewport,
+ d3d_device2_SetRenderTarget,
+ d3d_device2_GetRenderTarget,
+ d3d_device2_Begin,
+ d3d_device2_BeginIndexed,
+ d3d_device2_Vertex,
+ d3d_device2_Index,
+ d3d_device2_End,
+ d3d_device2_GetRenderState,
+ d3d_device2_SetRenderState,
+ d3d_device2_GetLightState,
+ d3d_device2_SetLightState,
+ d3d_device2_SetTransform,
+ d3d_device2_GetTransform,
+ d3d_device2_MultiplyTransform,
+ d3d_device2_DrawPrimitive,
+ d3d_device2_DrawIndexedPrimitive,
+ d3d_device2_SetClipStatus,
+ d3d_device2_GetClipStatus
};
static const struct IDirect3DDeviceVtbl d3d_device1_vtbl =
{
/*** IUnknown Methods ***/
- IDirect3DDeviceImpl_1_QueryInterface,
- IDirect3DDeviceImpl_1_AddRef,
- IDirect3DDeviceImpl_1_Release,
+ d3d_device1_QueryInterface,
+ d3d_device1_AddRef,
+ d3d_device1_Release,
/*** IDirect3DDevice1 ***/
- IDirect3DDeviceImpl_1_Initialize,
- IDirect3DDeviceImpl_1_GetCaps,
- IDirect3DDeviceImpl_1_SwapTextureHandles,
- IDirect3DDeviceImpl_1_CreateExecuteBuffer,
- IDirect3DDeviceImpl_1_GetStats,
- IDirect3DDeviceImpl_1_Execute,
- IDirect3DDeviceImpl_1_AddViewport,
- IDirect3DDeviceImpl_1_DeleteViewport,
- IDirect3DDeviceImpl_1_NextViewport,
- IDirect3DDeviceImpl_1_Pick,
- IDirect3DDeviceImpl_1_GetPickRecords,
- IDirect3DDeviceImpl_1_EnumTextureFormats,
- IDirect3DDeviceImpl_1_CreateMatrix,
- IDirect3DDeviceImpl_1_SetMatrix,
- IDirect3DDeviceImpl_1_GetMatrix,
- IDirect3DDeviceImpl_1_DeleteMatrix,
- IDirect3DDeviceImpl_1_BeginScene,
- IDirect3DDeviceImpl_1_EndScene,
- IDirect3DDeviceImpl_1_GetDirect3D
+ d3d_device1_Initialize,
+ d3d_device1_GetCaps,
+ d3d_device1_SwapTextureHandles,
+ d3d_device1_CreateExecuteBuffer,
+ d3d_device1_GetStats,
+ d3d_device1_Execute,
+ d3d_device1_AddViewport,
+ d3d_device1_DeleteViewport,
+ d3d_device1_NextViewport,
+ d3d_device1_Pick,
+ d3d_device1_GetPickRecords,
+ d3d_device1_EnumTextureFormats,
+ d3d_device1_CreateMatrix,
+ d3d_device1_SetMatrix,
+ d3d_device1_GetMatrix,
+ d3d_device1_DeleteMatrix,
+ d3d_device1_BeginScene,
+ d3d_device1_EndScene,
+ d3d_device1_GetDirect3D
};
static const struct IUnknownVtbl d3d_device_inner_vtbl =
@@ -6909,67 +6512,57 @@ static const struct IUnknownVtbl d3d_device_inner_vtbl =
d3d_device_inner_Release,
};
-IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice7(IDirect3DDevice7 *iface)
+struct d3d_device *unsafe_impl_from_IDirect3DDevice7(IDirect3DDevice7 *iface)
{
if (!iface) return NULL;
assert((iface->lpVtbl == &d3d_device7_fpu_preserve_vtbl) || (iface->lpVtbl == &d3d_device7_fpu_setup_vtbl));
- return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice7_iface);
+ return CONTAINING_RECORD(iface, struct d3d_device, IDirect3DDevice7_iface);
}
-IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice3(IDirect3DDevice3 *iface)
+struct d3d_device *unsafe_impl_from_IDirect3DDevice3(IDirect3DDevice3 *iface)
{
if (!iface) return NULL;
assert(iface->lpVtbl == &d3d_device3_vtbl);
- return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice3_iface);
+ return CONTAINING_RECORD(iface, struct d3d_device, IDirect3DDevice3_iface);
}
-IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice2(IDirect3DDevice2 *iface)
+struct d3d_device *unsafe_impl_from_IDirect3DDevice2(IDirect3DDevice2 *iface)
{
if (!iface) return NULL;
assert(iface->lpVtbl == &d3d_device2_vtbl);
- return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice2_iface);
+ return CONTAINING_RECORD(iface, struct d3d_device, IDirect3DDevice2_iface);
}
-IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface)
+struct d3d_device *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface)
{
if (!iface) return NULL;
assert(iface->lpVtbl == &d3d_device1_vtbl);
- return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice_iface);
+ return CONTAINING_RECORD(iface, struct d3d_device, IDirect3DDevice_iface);
}
-/*****************************************************************************
- * IDirect3DDeviceImpl_UpdateDepthStencil
- *
- * Checks the current render target for attached depth stencils and sets the
- * WineD3D depth stencil accordingly.
- *
- * Returns:
- * The depth stencil state to set if creating the device
- *
- *****************************************************************************/
-enum wined3d_depth_buffer_type IDirect3DDeviceImpl_UpdateDepthStencil(IDirect3DDeviceImpl *This)
+enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device *device)
{
IDirectDrawSurface7 *depthStencil = NULL;
static DDSCAPS2 depthcaps = { DDSCAPS_ZBUFFER, 0, 0, 0 };
struct ddraw_surface *dsi;
- IDirectDrawSurface7_GetAttachedSurface(&This->target->IDirectDrawSurface7_iface, &depthcaps, &depthStencil);
- if(!depthStencil)
+ IDirectDrawSurface7_GetAttachedSurface(&device->target->IDirectDrawSurface7_iface, &depthcaps, &depthStencil);
+ if (!depthStencil)
{
TRACE("Setting wined3d depth stencil to NULL\n");
- wined3d_device_set_depth_stencil(This->wined3d_device, NULL);
+ wined3d_device_set_depth_stencil(device->wined3d_device, NULL);
return WINED3D_ZB_FALSE;
}
dsi = impl_from_IDirectDrawSurface7(depthStencil);
TRACE("Setting wined3d depth stencil to %p (wined3d %p)\n", dsi, dsi->wined3d_surface);
- wined3d_device_set_depth_stencil(This->wined3d_device, dsi->wined3d_surface);
+ wined3d_device_set_depth_stencil(device->wined3d_device, dsi->wined3d_surface);
IDirectDrawSurface7_Release(depthStencil);
return WINED3D_ZB_TRUE;
}
-static HRESULT d3d_device_init(IDirect3DDeviceImpl *device, struct ddraw *ddraw,
+static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw,
struct ddraw_surface *target, UINT version, IUnknown *outer_unknown)
{
static const D3DMATRIX ident =
@@ -7052,15 +6645,15 @@ static HRESULT d3d_device_init(IDirect3DDeviceImpl *device, struct ddraw *ddraw,
ddraw->d3ddevice = device;
wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_ZENABLE,
- IDirect3DDeviceImpl_UpdateDepthStencil(device));
+ d3d_device_update_depth_stencil(device));
return D3D_OK;
}
HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target,
- UINT version, IDirect3DDeviceImpl **device, IUnknown *outer_unknown)
+ UINT version, struct d3d_device **device, IUnknown *outer_unknown)
{
- IDirect3DDeviceImpl *object;
+ struct d3d_device *object;
HRESULT hr;
TRACE("ddraw %p, target %p, version %u, device %p, outer_unknown %p.\n",
diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c
index f616128..6e37a7b 100644
--- a/dlls/ddraw/executebuffer.c
+++ b/dlls/ddraw/executebuffer.c
@@ -69,7 +69,7 @@ static void _dump_D3DEXECUTEBUFFERDESC(const D3DEXECUTEBUFFERDESC *lpDesc) {
*
*****************************************************************************/
HRESULT d3d_execute_buffer_execute(IDirect3DExecuteBufferImpl *This,
- IDirect3DDeviceImpl *lpDevice, struct d3d_viewport *viewport)
+ struct d3d_device *device, struct d3d_viewport *viewport)
{
/* DWORD bs = This->desc.dwBufferSize; */
DWORD vs = This->data.dwVertexOffset;
@@ -79,7 +79,7 @@ HRESULT d3d_execute_buffer_execute(IDirect3DExecuteBufferImpl *This,
char *instr = (char *)This->desc.lpData + is;
- if (viewport->active_device != lpDevice)
+ if (viewport->active_device != device)
{
WARN("Viewport %p active device is %p.\n",
viewport, viewport->active_device);
@@ -156,8 +156,8 @@ HRESULT d3d_execute_buffer_execute(IDirect3DExecuteBufferImpl *This,
/* IDirect3DDevices have color keying always enabled -
* enable it before drawing. This overwrites any ALPHA*
* render state. */
- wined3d_device_set_render_state(lpDevice->wined3d_device, WINED3D_RS_COLORKEYENABLE, 1);
- IDirect3DDevice7_DrawIndexedPrimitive(&lpDevice->IDirect3DDevice7_iface,
+ wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_COLORKEYENABLE, 1);
+ IDirect3DDevice7_DrawIndexedPrimitive(&device->IDirect3DDevice7_iface,
D3DPT_TRIANGLELIST, D3DFVF_TLVERTEX, tl_vx, 0, This->indices, count * 3, 0);
} break;
@@ -175,9 +175,9 @@ HRESULT d3d_execute_buffer_execute(IDirect3DExecuteBufferImpl *This,
D3DMATRIXMULTIPLY *ci = (D3DMATRIXMULTIPLY *)instr;
D3DMATRIX *a, *b, *c;
- a = ddraw_get_object(&lpDevice->handle_table, ci->hDestMatrix - 1, DDRAW_HANDLE_MATRIX);
- b = ddraw_get_object(&lpDevice->handle_table, ci->hSrcMatrix1 - 1, DDRAW_HANDLE_MATRIX);
- c = ddraw_get_object(&lpDevice->handle_table, ci->hSrcMatrix2 - 1, DDRAW_HANDLE_MATRIX);
+ a = ddraw_get_object(&device->handle_table, ci->hDestMatrix - 1, DDRAW_HANDLE_MATRIX);
+ b = ddraw_get_object(&device->handle_table, ci->hSrcMatrix1 - 1, DDRAW_HANDLE_MATRIX);
+ c = ddraw_get_object(&device->handle_table, ci->hSrcMatrix2 - 1, DDRAW_HANDLE_MATRIX);
if (!a || !b || !c)
{
@@ -203,7 +203,7 @@ HRESULT d3d_execute_buffer_execute(IDirect3DExecuteBufferImpl *This,
D3DSTATE *ci = (D3DSTATE *)instr;
D3DMATRIX *m;
- m = ddraw_get_object(&lpDevice->handle_table, ci->u2.dwArg[0] - 1, DDRAW_HANDLE_MATRIX);
+ m = ddraw_get_object(&device->handle_table, ci->u2.dwArg[0] - 1, DDRAW_HANDLE_MATRIX);
if (!m)
{
ERR("Invalid matrix handle %#x.\n", ci->u2.dwArg[0]);
@@ -211,12 +211,12 @@ HRESULT d3d_execute_buffer_execute(IDirect3DExecuteBufferImpl *This,
else
{
if (ci->u1.dtstTransformStateType == D3DTRANSFORMSTATE_WORLD)
- lpDevice->world = ci->u2.dwArg[0];
+ device->world = ci->u2.dwArg[0];
if (ci->u1.dtstTransformStateType == D3DTRANSFORMSTATE_VIEW)
- lpDevice->view = ci->u2.dwArg[0];
+ device->view = ci->u2.dwArg[0];
if (ci->u1.dtstTransformStateType == D3DTRANSFORMSTATE_PROJECTION)
- lpDevice->proj = ci->u2.dwArg[0];
- IDirect3DDevice7_SetTransform(&lpDevice->IDirect3DDevice7_iface,
+ device->proj = ci->u2.dwArg[0];
+ IDirect3DDevice7_SetTransform(&device->IDirect3DDevice7_iface,
ci->u1.dtstTransformStateType, m);
}
@@ -239,7 +239,7 @@ HRESULT d3d_execute_buffer_execute(IDirect3DExecuteBufferImpl *This,
{
struct d3d_material *m;
- m = ddraw_get_object(&lpDevice->handle_table, ci->u2.dwArg[0] - 1, DDRAW_HANDLE_MATERIAL);
+ m = ddraw_get_object(&device->handle_table, ci->u2.dwArg[0] - 1, DDRAW_HANDLE_MATERIAL);
if (!m)
ERR("Invalid material handle %#x.\n", ci->u2.dwArg[0]);
else
@@ -283,7 +283,7 @@ HRESULT d3d_execute_buffer_execute(IDirect3DExecuteBufferImpl *This,
break;
}
- IDirect3DDevice7_SetRenderState(&lpDevice->IDirect3DDevice7_iface, rs, ci->u2.dwArg[0]);
+ IDirect3DDevice7_SetRenderState(&device->IDirect3DDevice7_iface, rs, ci->u2.dwArg[0]);
}
instr += size;
@@ -292,7 +292,7 @@ HRESULT d3d_execute_buffer_execute(IDirect3DExecuteBufferImpl *This,
case D3DOP_STATERENDER: {
int i;
- IDirect3DDevice2 *d3d_device2 = &lpDevice->IDirect3DDevice2_iface;
+ IDirect3DDevice2 *d3d_device2 = &device->IDirect3DDevice2_iface;
TRACE("STATERENDER (%d)\n", count);
for (i = 0; i < count; i++) {
@@ -315,11 +315,11 @@ HRESULT d3d_execute_buffer_execute(IDirect3DExecuteBufferImpl *This,
/* Get the transform and world matrix */
/* Note: D3DMATRIX is compatible with struct wined3d_matrix. */
- wined3d_device_get_transform(lpDevice->wined3d_device,
+ wined3d_device_get_transform(device->wined3d_device,
D3DTRANSFORMSTATE_VIEW, (struct wined3d_matrix *)&view_mat);
- wined3d_device_get_transform(lpDevice->wined3d_device,
+ wined3d_device_get_transform(device->wined3d_device,
D3DTRANSFORMSTATE_PROJECTION, (struct wined3d_matrix *)&proj_mat);
- wined3d_device_get_transform(lpDevice->wined3d_device,
+ wined3d_device_get_transform(device->wined3d_device,
WINED3D_TS_WORLD_MATRIX(0), (struct wined3d_matrix *)&world_mat);
for (i = 0; i < count; i++) {
@@ -837,7 +837,7 @@ static const struct IDirect3DExecuteBufferVtbl d3d_execute_buffer_vtbl =
};
HRESULT d3d_execute_buffer_init(IDirect3DExecuteBufferImpl *execute_buffer,
- IDirect3DDeviceImpl *device, D3DEXECUTEBUFFERDESC *desc)
+ struct d3d_device *device, D3DEXECUTEBUFFERDESC *desc)
{
execute_buffer->IDirect3DExecuteBuffer_iface.lpVtbl = &d3d_execute_buffer_vtbl;
execute_buffer->ref = 1;
diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c
index c770aad..ad4ac71 100644
--- a/dlls/ddraw/light.c
+++ b/dlls/ddraw/light.c
@@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
*****************************************************************************/
static void light_update(struct d3d_light *light)
{
- IDirect3DDeviceImpl *device;
+ struct d3d_device *device;
TRACE("light %p.\n", light);
@@ -52,7 +52,7 @@ static void light_update(struct d3d_light *light)
*****************************************************************************/
void light_activate(struct d3d_light *light)
{
- IDirect3DDeviceImpl *device;
+ struct d3d_device *device;
TRACE("light %p.\n", light);
@@ -76,7 +76,7 @@ void light_activate(struct d3d_light *light)
*****************************************************************************/
void light_deactivate(struct d3d_light *light)
{
- IDirect3DDeviceImpl *device;
+ struct d3d_device *device;
TRACE("light %p.\n", light);
diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c
index 98f43c0..4b44726 100644
--- a/dlls/ddraw/material.c
+++ b/dlls/ddraw/material.c
@@ -297,7 +297,7 @@ static HRESULT WINAPI d3d_material3_GetHandle(IDirect3DMaterial3 *iface,
IDirect3DDevice3 *device, D3DMATERIALHANDLE *handle)
{
struct d3d_material *material = impl_from_IDirect3DMaterial3(iface);
- IDirect3DDeviceImpl *device_impl = unsafe_impl_from_IDirect3DDevice3(device);
+ struct d3d_device *device_impl = unsafe_impl_from_IDirect3DDevice3(device);
TRACE("iface %p, device %p, handle %p.\n", iface, device, handle);
@@ -326,7 +326,7 @@ static HRESULT WINAPI d3d_material2_GetHandle(IDirect3DMaterial2 *iface,
IDirect3DDevice2 *device, D3DMATERIALHANDLE *handle)
{
struct d3d_material *material = impl_from_IDirect3DMaterial2(iface);
- IDirect3DDeviceImpl *device_impl = unsafe_impl_from_IDirect3DDevice2(device);
+ struct d3d_device *device_impl = unsafe_impl_from_IDirect3DDevice2(device);
TRACE("iface %p, device %p, handle %p.\n", iface, device, handle);
@@ -338,7 +338,7 @@ static HRESULT WINAPI d3d_material1_GetHandle(IDirect3DMaterial *iface,
IDirect3DDevice *device, D3DMATERIALHANDLE *handle)
{
struct d3d_material *material = impl_from_IDirect3DMaterial(iface);
- IDirect3DDeviceImpl *device_impl = unsafe_impl_from_IDirect3DDevice(device);
+ struct d3d_device *device_impl = unsafe_impl_from_IDirect3DDevice(device);
TRACE("iface %p, device %p, handle %p.\n", iface, device, handle);
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 95ee9c1..db863f1 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -1619,10 +1619,8 @@ static HRESULT ddraw_surface_attach_surface(struct ddraw_surface *This, struct d
This->next_attached = Surf;
/* Check if the WineD3D depth stencil needs updating */
- if(This->ddraw->d3ddevice)
- {
- IDirect3DDeviceImpl_UpdateDepthStencil(This->ddraw->d3ddevice);
- }
+ if (This->ddraw->d3ddevice)
+ d3d_device_update_depth_stencil(This->ddraw->d3ddevice);
wined3d_mutex_unlock();
@@ -1823,7 +1821,7 @@ static HRESULT ddraw_surface_delete_attached_surface(struct ddraw_surface *surfa
/* Check if the wined3d depth stencil needs updating. */
if (surface->ddraw->d3ddevice)
- IDirect3DDeviceImpl_UpdateDepthStencil(surface->ddraw->d3ddevice);
+ d3d_device_update_depth_stencil(surface->ddraw->d3ddevice);
wined3d_mutex_unlock();
/* Set attached_iface to NULL before releasing it, the surface may go
@@ -4968,7 +4966,7 @@ static HRESULT WINAPI d3d_texture2_GetHandle(IDirect3DTexture2 *iface,
IDirect3DDevice2 *device, D3DTEXTUREHANDLE *handle)
{
struct ddraw_surface *surface = impl_from_IDirect3DTexture2(iface);
- IDirect3DDeviceImpl *device_impl = unsafe_impl_from_IDirect3DDevice2(device);
+ struct d3d_device *device_impl = unsafe_impl_from_IDirect3DDevice2(device);
TRACE("iface %p, device %p, handle %p.\n", iface, device, handle);
@@ -4999,7 +4997,7 @@ static HRESULT WINAPI d3d_texture1_GetHandle(IDirect3DTexture *iface,
IDirect3DDevice *device, D3DTEXTUREHANDLE *handle)
{
struct ddraw_surface *surface = impl_from_IDirect3DTexture(iface);
- IDirect3DDeviceImpl *device_impl = unsafe_impl_from_IDirect3DDevice(device);
+ struct d3d_device *device_impl = unsafe_impl_from_IDirect3DDevice(device);
TRACE("iface %p, device %p, handle %p.\n", iface, device, handle);
diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c
index d03d249..d17c91a 100644
--- a/dlls/ddraw/vertexbuffer.c
+++ b/dlls/ddraw/vertexbuffer.c
@@ -309,7 +309,7 @@ static HRESULT WINAPI IDirect3DVertexBufferImpl_ProcessVertices(IDirect3DVertexB
{
IDirect3DVertexBufferImpl *This = impl_from_IDirect3DVertexBuffer7(iface);
IDirect3DVertexBufferImpl *Src = unsafe_impl_from_IDirect3DVertexBuffer7(SrcBuffer);
- IDirect3DDeviceImpl *device_impl = unsafe_impl_from_IDirect3DDevice7(device);
+ struct d3d_device *device_impl = unsafe_impl_from_IDirect3DDevice7(device);
BOOL oldClip, doClip;
HRESULT hr;
@@ -360,7 +360,7 @@ static HRESULT WINAPI IDirect3DVertexBufferImpl_1_ProcessVertices(IDirect3DVerte
{
IDirect3DVertexBufferImpl *This = impl_from_IDirect3DVertexBuffer(iface);
IDirect3DVertexBufferImpl *Src = unsafe_impl_from_IDirect3DVertexBuffer(SrcBuffer);
- IDirect3DDeviceImpl *device_impl = unsafe_impl_from_IDirect3DDevice3(device);
+ struct d3d_device *device_impl = unsafe_impl_from_IDirect3DDevice3(device);
TRACE("iface %p, vertex_op %#x, dst_idx %u, count %u, src_buffer %p, src_idx %u, device %p, flags %#x.\n",
iface, VertexOp, DestIndex, Count, SrcBuffer, SrcIndex, device, Flags);
@@ -459,7 +459,7 @@ static HRESULT WINAPI IDirect3DVertexBufferImpl_1_Optimize(IDirect3DVertexBuffer
IDirect3DDevice3 *device, DWORD Flags)
{
IDirect3DVertexBufferImpl *This = impl_from_IDirect3DVertexBuffer(iface);
- IDirect3DDeviceImpl *device_impl = unsafe_impl_from_IDirect3DDevice3(device);
+ struct d3d_device *device_impl = unsafe_impl_from_IDirect3DDevice3(device);
TRACE("iface %p, device %p, flags %#x.\n", iface, device, Flags);
diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c
index 0b384db..43091c6 100644
--- a/dlls/ddraw/viewport.c
+++ b/dlls/ddraw/viewport.c
@@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
* Helper functions
*****************************************************************************/
-static void update_clip_space(IDirect3DDeviceImpl *device,
+static void update_clip_space(struct d3d_device *device,
struct wined3d_vec3 *scale, struct wined3d_vec3 *offset)
{
D3DMATRIX clip_space =
--
1.7.3.4
More information about the wine-patches
mailing list