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

wined3d: Pass an IWineD3DDeviceImpl pointer to free_private().

This commit is contained in:
Henri Verbeet 2010-12-08 18:28:11 +01:00 committed by Alexandre Julliard
parent 4ba3b64c57
commit 7f09eb6a7a
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/wined3d/arb_program_shader.c
View File

@ -6514,8 +6514,8 @@ static HRESULT arbfp_blit_alloc(IWineD3DDeviceImpl *device)
}
/* Context activation is done by the caller. */
static void arbfp_blit_free(IWineD3DDevice *iface) {
IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface;
static void arbfp_blit_free(IWineD3DDeviceImpl *device)
{
const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;
struct arbfp_blit_priv *priv = device->blit_priv;

6
dlls/wined3d/device.c
View File

@ -2050,7 +2050,7 @@ err_out:
This->stateBlock = NULL;
}
if (This->blit_priv) {
This->blitter->free_private(iface);
This->blitter->free_private(This);
}
if (This->fragment_priv) {
This->frag_pipe->free_private(This);
@ -2185,7 +2185,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface,
}
/* Destroy the shader backend. Note that this has to happen after all shaders are destroyed. */
This->blitter->free_private(iface);
This->blitter->free_private(This);
This->frag_pipe->free_private(This);
This->shader_backend->shader_free_private(This);
@ -6199,7 +6199,7 @@ static void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChainImpl
}
LEAVE_GL();
This->blitter->free_private(iface);
This->blitter->free_private(This);
This->frag_pipe->free_private(This);
This->shader_backend->shader_free_private(This);
destroy_dummy_textures(This, gl_info);

4
dlls/wined3d/surface.c
View File

@ -4734,7 +4734,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl =
static HRESULT ffp_blit_alloc(IWineD3DDeviceImpl *device) { return WINED3D_OK; }
/* Context activation is done by the caller. */
static void ffp_blit_free(IWineD3DDevice *iface) { }
static void ffp_blit_free(IWineD3DDeviceImpl *device) { }
/* This function is used in case of 8bit paletted textures using GL_EXT_paletted_texture */
/* Context activation is done by the caller. */
@ -4871,7 +4871,7 @@ static HRESULT cpu_blit_alloc(IWineD3DDeviceImpl *device)
}
/* Context activation is done by the caller. */
static void cpu_blit_free(IWineD3DDevice *iface)
static void cpu_blit_free(IWineD3DDeviceImpl *device)
{
}

2
dlls/wined3d/wined3d_private.h
View File

@ -1176,7 +1176,7 @@ enum blit_operation
struct blit_shader
{
HRESULT (*alloc_private)(IWineD3DDeviceImpl *device);
void (*free_private)(IWineD3DDevice *iface);
void (*free_private)(IWineD3DDeviceImpl *device);
HRESULT (*set_shader)(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surface);
void (*unset_shader)(IWineD3DDevice *iface);
BOOL (*blit_supported)(const struct wined3d_gl_info *gl_info, enum blit_operation blit_op,