diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 46849aaa914..3302b7118c2 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -111,6 +111,10 @@ void WINAPI IWineD3DBaseTextureImpl_PreLoad(IWineD3DBaseTexture *ifac IWineD3DResourceImpl_PreLoad((IWineD3DResource *)iface); } +void WINAPI IWineD3DBaseTextureImpl_UnLoad(IWineD3DBaseTexture *iface) { + IWineD3DResourceImpl_UnLoad((IWineD3DResource *)iface); +} + WINED3DRESOURCETYPE WINAPI IWineD3DBaseTextureImpl_GetType(IWineD3DBaseTexture *iface) { return IWineD3DResourceImpl_GetType((IWineD3DResource *)iface); } @@ -488,6 +492,7 @@ static const IWineD3DBaseTextureVtbl IWineD3DBaseTexture_Vtbl = IWineD3DBaseTextureImpl_SetPriority, IWineD3DBaseTextureImpl_GetPriority, IWineD3DBaseTextureImpl_PreLoad, + IWineD3DBaseTextureImpl_UnLoad, IWineD3DBaseTextureImpl_GetType, /*IWineD3DBaseTexture*/ IWineD3DBaseTextureImpl_SetLOD, diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 5d167339ba6..8560ab0d58b 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -158,6 +158,10 @@ static void WINAPI IWineD3DCubeTextureImpl_PreLoad(IWineD3DCubeTexture *iface) { return ; } +static void WINAPI IWineD3DCubeTextureImpl_UnLoad(IWineD3DCubeTexture *iface) { + IWineD3DResourceImpl_UnLoad((IWineD3DResource *)iface); +} + static WINED3DRESOURCETYPE WINAPI IWineD3DCubeTextureImpl_GetType(IWineD3DCubeTexture *iface) { return IWineD3DResourceImpl_GetType((IWineD3DResource *)iface); } @@ -359,6 +363,7 @@ const IWineD3DCubeTextureVtbl IWineD3DCubeTexture_Vtbl = IWineD3DCubeTextureImpl_SetPriority, IWineD3DCubeTextureImpl_GetPriority, IWineD3DCubeTextureImpl_PreLoad, + IWineD3DCubeTextureImpl_UnLoad, IWineD3DCubeTextureImpl_GetType, /* IWineD3DBaseTexture */ IWineD3DCubeTextureImpl_SetLOD, diff --git a/dlls/wined3d/indexbuffer.c b/dlls/wined3d/indexbuffer.c index bcfb0e6410e..b5d15973cc7 100644 --- a/dlls/wined3d/indexbuffer.c +++ b/dlls/wined3d/indexbuffer.c @@ -110,6 +110,10 @@ static void WINAPI IWineD3DIndexBufferImpl_PreLoad(IWineD3DIndexBuffer *iface) { IWineD3DResourceImpl_PreLoad((IWineD3DResource *)iface); } +static void WINAPI IWineD3DIndexBufferImpl_UnLoad(IWineD3DIndexBuffer *iface) { + IWineD3DResourceImpl_UnLoad((IWineD3DResource *)iface); +} + static WINED3DRESOURCETYPE WINAPI IWineD3DIndexBufferImpl_GetType(IWineD3DIndexBuffer *iface) { return IWineD3DResourceImpl_GetType((IWineD3DResource *)iface); } @@ -201,6 +205,7 @@ const IWineD3DIndexBufferVtbl IWineD3DIndexBuffer_Vtbl = IWineD3DIndexBufferImpl_SetPriority, IWineD3DIndexBufferImpl_GetPriority, IWineD3DIndexBufferImpl_PreLoad, + IWineD3DIndexBufferImpl_UnLoad, IWineD3DIndexBufferImpl_GetType, /* IWineD3DIndexBuffer */ IWineD3DIndexBufferImpl_Lock, diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 151af2c2838..9ebaadbbf87 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -235,6 +235,11 @@ void WINAPI IWineD3DResourceImpl_PreLoad(IWineD3DResource *iface) { FIXME("(%p) : stub\n", This); } +void WINAPI IWineD3DResourceImpl_UnLoad(IWineD3DResource *iface) { + IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; + FIXME("(%p) : stub\n", This); +} + WINED3DRESOURCETYPE WINAPI IWineD3DResourceImpl_GetType(IWineD3DResource *iface) { IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; TRACE("(%p) : returning %d\n", This, This->resource.resourceType); @@ -271,5 +276,6 @@ static const IWineD3DResourceVtbl IWineD3DResource_Vtbl = IWineD3DResourceImpl_SetPriority, IWineD3DResourceImpl_GetPriority, IWineD3DResourceImpl_PreLoad, + IWineD3DResourceImpl_UnLoad, IWineD3DResourceImpl_GetType }; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0a7a4dfc949..27e32aa55c6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -489,6 +489,11 @@ void WINAPI IWineD3DSurfaceImpl_PreLoad(IWineD3DSurface *iface) { return; } +void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) { + FIXME("(%p): Stub!\n", iface); + return; +} + /* ****************************************************** IWineD3DSurface IWineD3DSurface parts follow ****************************************************** */ @@ -3936,6 +3941,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DBaseSurfaceImpl_SetPriority, IWineD3DBaseSurfaceImpl_GetPriority, IWineD3DSurfaceImpl_PreLoad, + IWineD3DSurfaceImpl_UnLoad, IWineD3DBaseSurfaceImpl_GetType, /* IWineD3DSurface */ IWineD3DBaseSurfaceImpl_GetContainer, diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 5f569a1c11b..92adcc6743c 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -182,6 +182,20 @@ IWineGDISurfaceImpl_PreLoad(IWineD3DSurface *iface) ERR("(%p): Please report to wine-devel\n", iface); } +/***************************************************************************** + * IWineD3DSurface::Unoad, GDI version + * + * This call is unsupported on GDI surfaces, if it's called something went + * wrong in the parent library. Write an informative warning + * + *****************************************************************************/ +static void WINAPI IWineGDISurfaceImpl_UnLoad(IWineD3DSurface *iface) +{ + ERR("(%p): UnLoad is not supported on X11 surfaces!\n", iface); + ERR("(%p): Most likely the parent library did something wrong.\n", iface); + ERR("(%p): Please report to wine-devel\n", iface); +} + /***************************************************************************** * IWineD3DSurface::LockRect, GDI version * @@ -490,13 +504,14 @@ const char* filename) fwrite(output, 3 * This->pow2Width, 1, f); } } else { - int red_shift, green_shift, blue_shift, pix_width; + int red_shift, green_shift, blue_shift, pix_width, alpha_shift; pix_width = This->bytesPerPixel; red_shift = get_shift(formatEntry->redMask); green_shift = get_shift(formatEntry->greenMask); blue_shift = get_shift(formatEntry->blueMask); + alpha_shift = get_shift(formatEntry->alphaMask); for (y = 0; y < This->pow2Height; y++) { unsigned char *src = (unsigned char *) This->resource.allocatedMemory + (y * 1 * IWineD3DSurface_GetPitch(iface)); @@ -515,8 +530,8 @@ const char* filename) output[3 * x + 0] = red_shift > 0 ? comp >> red_shift : comp << -red_shift; comp = color & formatEntry->greenMask; output[3 * x + 1] = green_shift > 0 ? comp >> green_shift : comp << -green_shift; - comp = color & formatEntry->blueMask; - output[3 * x + 2] = blue_shift > 0 ? comp >> blue_shift : comp << -blue_shift; + comp = color & formatEntry->alphaMask; + output[3 * x + 2] = alpha_shift > 0 ? comp >> alpha_shift : comp << -alpha_shift; } fwrite(output, 3 * This->pow2Width, 1, f); } @@ -775,6 +790,7 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = IWineD3DBaseSurfaceImpl_SetPriority, IWineD3DBaseSurfaceImpl_GetPriority, IWineGDISurfaceImpl_PreLoad, + IWineGDISurfaceImpl_UnLoad, IWineD3DBaseSurfaceImpl_GetType, /* IWineD3DSurface */ IWineD3DBaseSurfaceImpl_GetContainer, diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3c3fc8976e3..5cac35ca811 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -142,6 +142,10 @@ static void WINAPI IWineD3DTextureImpl_PreLoad(IWineD3DTexture *iface) { return ; } +static void WINAPI IWineD3DTextureImpl_UnLoad(IWineD3DTexture *iface) { + IWineD3DResourceImpl_UnLoad((IWineD3DResource *)iface); +} + static WINED3DRESOURCETYPE WINAPI IWineD3DTextureImpl_GetType(IWineD3DTexture *iface) { return IWineD3DResourceImpl_GetType((IWineD3DResource *)iface); } @@ -328,6 +332,7 @@ const IWineD3DTextureVtbl IWineD3DTexture_Vtbl = IWineD3DTextureImpl_SetPriority, IWineD3DTextureImpl_GetPriority, IWineD3DTextureImpl_PreLoad, + IWineD3DTextureImpl_UnLoad, IWineD3DTextureImpl_GetType, /* IWineD3DBaseTexture */ IWineD3DTextureImpl_SetLOD, diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 7a67544f486..b8687e023c9 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -596,6 +596,10 @@ static void WINAPI IWineD3DVertexBufferImpl_PreLoad(IWineD3DVertexBuffer *if HeapFree(GetProcessHeap(), 0, data); } +static void WINAPI IWineD3DVertexBufferImpl_UnLoad(IWineD3DVertexBuffer *iface) { + IWineD3DResourceImpl_UnLoad((IWineD3DResource *)iface); +} + static WINED3DRESOURCETYPE WINAPI IWineD3DVertexBufferImpl_GetType(IWineD3DVertexBuffer *iface) { return IWineD3DResourceImpl_GetType((IWineD3DResource *)iface); } @@ -682,6 +686,7 @@ const IWineD3DVertexBufferVtbl IWineD3DVertexBuffer_Vtbl = IWineD3DVertexBufferImpl_SetPriority, IWineD3DVertexBufferImpl_GetPriority, IWineD3DVertexBufferImpl_PreLoad, + IWineD3DVertexBufferImpl_UnLoad, IWineD3DVertexBufferImpl_GetType, /* IWineD3DVertexBuffer */ IWineD3DVertexBufferImpl_Lock, diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index a70a3519eef..7d739d1ff27 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -97,6 +97,10 @@ static void WINAPI IWineD3DVolumeImpl_PreLoad(IWineD3DVolume *iface) { IWineD3DResourceImpl_PreLoad((IWineD3DResource *)iface); } +static void WINAPI IWineD3DVolumeImpl_UnLoad(IWineD3DVolume *iface) { + IWineD3DResourceImpl_UnLoad((IWineD3DResource *)iface); +} + static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeImpl_GetType(IWineD3DVolume *iface) { return IWineD3DResourceImpl_GetType((IWineD3DResource *)iface); } @@ -316,6 +320,7 @@ const IWineD3DVolumeVtbl IWineD3DVolume_Vtbl = IWineD3DVolumeImpl_SetPriority, IWineD3DVolumeImpl_GetPriority, IWineD3DVolumeImpl_PreLoad, + IWineD3DVolumeImpl_UnLoad, IWineD3DVolumeImpl_GetType, /* IWineD3DVolume */ IWineD3DVolumeImpl_GetContainer, diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index cf3f33934a0..b2b3d2da7db 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -135,6 +135,10 @@ static void WINAPI IWineD3DVolumeTextureImpl_PreLoad(IWineD3DVolumeTexture *ifac return ; } +static void WINAPI IWineD3DVolumeTextureImpl_UnLoad(IWineD3DVolumeTexture *iface) { + IWineD3DResourceImpl_UnLoad((IWineD3DResource *)iface); +} + static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeTextureImpl_GetType(IWineD3DVolumeTexture *iface) { return IWineD3DResourceImpl_GetType((IWineD3DResource *)iface); } @@ -299,6 +303,7 @@ const IWineD3DVolumeTextureVtbl IWineD3DVolumeTexture_Vtbl = IWineD3DVolumeTextureImpl_SetPriority, IWineD3DVolumeTextureImpl_GetPriority, IWineD3DVolumeTextureImpl_PreLoad, + IWineD3DVolumeTextureImpl_UnLoad, IWineD3DVolumeTextureImpl_GetType, /* BaseTexture */ IWineD3DVolumeTextureImpl_SetLOD, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a8539039e08..41c036d8462 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1603,6 +1603,7 @@ unsigned int count_bits(unsigned int mask); extern DWORD WINAPI IWineD3DResourceImpl_SetPriority(IWineD3DResource *iface, DWORD PriorityNew); extern DWORD WINAPI IWineD3DResourceImpl_GetPriority(IWineD3DResource *iface); extern void WINAPI IWineD3DResourceImpl_PreLoad(IWineD3DResource *iface); + extern void WINAPI IWineD3DResourceImpl_UnLoad(IWineD3DResource *iface); extern WINED3DRESOURCETYPE WINAPI IWineD3DResourceImpl_GetType(IWineD3DResource *iface); /*** class static members ***/ void IWineD3DResourceImpl_CleanUp(IWineD3DResource *iface); diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index ce239079b02..3b3e68d25dc 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -643,6 +643,7 @@ DECLARE_INTERFACE_(IWineD3DResource,IWineD3DBase) STDMETHOD_(DWORD,SetPriority)(THIS_ DWORD PriorityNew) PURE; STDMETHOD_(DWORD,GetPriority)(THIS) PURE; STDMETHOD_(void,PreLoad)(THIS) PURE; + STDMETHOD_(void,UnLoad)(THIS) PURE; STDMETHOD_(WINED3DRESOURCETYPE,GetType)(THIS) PURE; }; #undef INTERFACE @@ -662,6 +663,7 @@ DECLARE_INTERFACE_(IWineD3DResource,IWineD3DBase) #define IWineD3DResource_SetPriority(p,a) (p)->lpVtbl->SetPriority(p,a) #define IWineD3DResource_GetPriority(p) (p)->lpVtbl->GetPriority(p) #define IWineD3DResource_PreLoad(p) (p)->lpVtbl->PreLoad(p) +#define IWineD3DResource_UnLoad(p) (p)->lpVtbl->UnLoad(p) #define IWineD3DResource_GetType(p) (p)->lpVtbl->GetType(p) #endif @@ -685,6 +687,7 @@ DECLARE_INTERFACE_(IWineD3DVertexBuffer,IWineD3DResource) STDMETHOD_(DWORD,SetPriority)(THIS_ DWORD PriorityNew) PURE; STDMETHOD_(DWORD,GetPriority)(THIS) PURE; STDMETHOD_(void,PreLoad)(THIS) PURE; + STDMETHOD_(void,UnLoad)(THIS) PURE; STDMETHOD_(WINED3DRESOURCETYPE,GetType)(THIS) PURE; /*** IWineD3DVertexBuffer methods ***/ STDMETHOD(Lock)(THIS_ UINT OffsetToLock, UINT SizeToLock, BYTE ** ppbData, DWORD Flags) PURE; @@ -708,6 +711,7 @@ DECLARE_INTERFACE_(IWineD3DVertexBuffer,IWineD3DResource) #define IWineD3DVertexBuffer_SetPriority(p,a) (p)->lpVtbl->SetPriority(p,a) #define IWineD3DVertexBuffer_GetPriority(p) (p)->lpVtbl->GetPriority(p) #define IWineD3DVertexBuffer_PreLoad(p) (p)->lpVtbl->PreLoad(p) +#define IWineD3DVertexBuffer_UnLoad(p) (p)->lpVtbl->UnLoad(p) #define IWineD3DVertexBuffer_GetType(p) (p)->lpVtbl->GetType(p) /*** IWineD3DVertexBuffer methods ***/ #define IWineD3DVertexBuffer_Lock(p,a,b,c,d) (p)->lpVtbl->Lock(p,a,b,c,d) @@ -735,6 +739,7 @@ DECLARE_INTERFACE_(IWineD3DIndexBuffer,IWineD3DResource) STDMETHOD_(DWORD,SetPriority)(THIS_ DWORD PriorityNew) PURE; STDMETHOD_(DWORD,GetPriority)(THIS) PURE; STDMETHOD_(void,PreLoad)(THIS) PURE; + STDMETHOD_(void,UnLoad)(THIS) PURE; STDMETHOD_(WINED3DRESOURCETYPE,GetType)(THIS) PURE; /*** IWineD3DIndexBuffer methods ***/ STDMETHOD(Lock)(THIS_ UINT OffsetToLock, UINT SizeToLock, BYTE ** ppbData, DWORD Flags) PURE; @@ -758,6 +763,7 @@ DECLARE_INTERFACE_(IWineD3DIndexBuffer,IWineD3DResource) #define IWineD3DIndexBuffer_SetPriority(p,a) (p)->lpVtbl->SetPriority(p,a) #define IWineD3DIndexBuffer_GetPriority(p) (p)->lpVtbl->GetPriority(p) #define IWineD3DIndexBuffer_PreLoad(p) (p)->lpVtbl->PreLoad(p) +#define IWineD3DIndexBuffer_UnLoad(p) (p)->lpVtbl->UnLoad(p) #define IWineD3DIndexBuffer_GetType(p) (p)->lpVtbl->GetType(p) /*** IWineD3DIndexBuffer methods ***/ #define IWineD3DIndexBuffer_Lock(p,a,b,c,d) (p)->lpVtbl->Lock(p,a,b,c,d) @@ -787,6 +793,7 @@ DECLARE_INTERFACE_(IWineD3DBaseTexture,IWineD3DResource) STDMETHOD_(DWORD,SetPriority)(THIS_ DWORD PriorityNew) PURE; STDMETHOD_(DWORD,GetPriority)(THIS) PURE; STDMETHOD_(void,PreLoad)(THIS) PURE; + STDMETHOD_(void,UnLoad)(THIS) PURE; STDMETHOD_(WINED3DRESOURCETYPE,GetType)(THIS) PURE; /*** IWineD3DBaseTexture methods ***/ STDMETHOD_(DWORD, SetLOD)(THIS_ DWORD LODNew) PURE; @@ -820,6 +827,7 @@ DECLARE_INTERFACE_(IWineD3DBaseTexture,IWineD3DResource) #define IWineD3DBaseTexture_SetPriority(p,a) (p)->lpVtbl->SetPriority(p,a) #define IWineD3DBaseTexture_GetPriority(p) (p)->lpVtbl->GetPriority(p) #define IWineD3DBaseTexture_PreLoad(p) (p)->lpVtbl->PreLoad(p) +#define IWineD3DBaseTexture_UnLoad(p) (p)->lpVtbl->UnLoad(p) #define IWineD3DBaseTexture_GetType(p) (p)->lpVtbl->GetType(p) /*** IWineD3DBaseTexture methods ***/ #define IWineD3DBaseTexture_SetLOD(p,a) (p)->lpVtbl->SetLOD(p,a) @@ -857,6 +865,7 @@ DECLARE_INTERFACE_(IWineD3DTexture,IWineD3DBaseTexture) STDMETHOD_(DWORD,SetPriority)(THIS_ DWORD PriorityNew) PURE; STDMETHOD_(DWORD,GetPriority)(THIS) PURE; STDMETHOD_(void,PreLoad)(THIS) PURE; + STDMETHOD_(void,UnLoad)(THIS) PURE; STDMETHOD_(WINED3DRESOURCETYPE,GetType)(THIS) PURE; /*** IWineD3DBaseTexture methods ***/ STDMETHOD_(DWORD, SetLOD)(THIS_ DWORD LODNew) PURE; @@ -896,6 +905,7 @@ DECLARE_INTERFACE_(IWineD3DTexture,IWineD3DBaseTexture) #define IWineD3DTexture_SetPriority(p,a) (p)->lpVtbl->SetPriority(p,a) #define IWineD3DTexture_GetPriority(p) (p)->lpVtbl->GetPriority(p) #define IWineD3DTexture_PreLoad(p) (p)->lpVtbl->PreLoad(p) +#define IWineD3DTexture_UnLoad(p) (p)->lpVtbl->UnLoad(p) #define IWineD3DTexture_GetType(p) (p)->lpVtbl->GetType(p) /*** IWineD3DTexture methods: IWineD3DBaseTexture ***/ #define IWineD3DTexture_SetLOD(p,a) (p)->lpVtbl->SetLOD(p,a) @@ -939,6 +949,7 @@ DECLARE_INTERFACE_(IWineD3DCubeTexture,IWineD3DBaseTexture) STDMETHOD_(DWORD,SetPriority)(THIS_ DWORD PriorityNew) PURE; STDMETHOD_(DWORD,GetPriority)(THIS) PURE; STDMETHOD_(void,PreLoad)(THIS) PURE; + STDMETHOD_(void,UnLoad)(THIS) PURE; STDMETHOD_(WINED3DRESOURCETYPE,GetType)(THIS) PURE; /*** IWineD3DBaseTexture methods ***/ STDMETHOD_(DWORD, SetLOD)(THIS_ DWORD LODNew) PURE; @@ -978,6 +989,7 @@ DECLARE_INTERFACE_(IWineD3DCubeTexture,IWineD3DBaseTexture) #define IWineD3DCubeTexture_SetPriority(p,a) (p)->lpVtbl->SetPriority(p,a) #define IWineD3DCubeTexture_GetPriority(p) (p)->lpVtbl->GetPriority(p) #define IWineD3DCubeTexture_PreLoad(p) (p)->lpVtbl->PreLoad(p) +#define IWineD3DCubeTexture_UnLoad(p) (p)->lpVtbl->UnLoad(p) #define IWineD3DCubeTexture_GetType(p) (p)->lpVtbl->GetType(p) /*** IWineD3DCubeTexture methods: IWineD3DBaseTexture ***/ #define IWineD3DCubeTexture_SetLOD(p,a) (p)->lpVtbl->SetLOD(p,a) @@ -1022,6 +1034,7 @@ DECLARE_INTERFACE_(IWineD3DVolumeTexture,IWineD3DBaseTexture) STDMETHOD_(DWORD,SetPriority)(THIS_ DWORD PriorityNew) PURE; STDMETHOD_(DWORD,GetPriority)(THIS) PURE; STDMETHOD_(void,PreLoad)(THIS) PURE; + STDMETHOD_(void,UnLoad)(THIS) PURE; STDMETHOD_(WINED3DRESOURCETYPE,GetType)(THIS) PURE; /*** IWineD3DBaseTexture methods ***/ STDMETHOD_(DWORD, SetLOD)(THIS_ DWORD LODNew) PURE; @@ -1061,6 +1074,7 @@ DECLARE_INTERFACE_(IWineD3DVolumeTexture,IWineD3DBaseTexture) #define IWineD3DVolumeTexture_SetPriority(p,a) (p)->lpVtbl->SetPriority(p,a) #define IWineD3DVolumeTexture_GetPriority(p) (p)->lpVtbl->GetPriority(p) #define IWineD3DVolumeTexture_PreLoad(p) (p)->lpVtbl->PreLoad(p) +#define IWineD3DVolumeTexture_UnLoad(p) (p)->lpVtbl->UnLoad(p) #define IWineD3DVolumeTexture_GetType(p) (p)->lpVtbl->GetType(p) /*** IWineD3DVolumeTexture methods: IWineD3DBaseTexture ***/ #define IWineD3DVolumeTexture_SetLOD(p,a) (p)->lpVtbl->SetLOD(p,a) @@ -1104,6 +1118,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWineD3DResource) STDMETHOD_(DWORD,SetPriority)(THIS_ DWORD PriorityNew) PURE; STDMETHOD_(DWORD,GetPriority)(THIS) PURE; STDMETHOD_(void,PreLoad)(THIS) PURE; + STDMETHOD_(void,UnLoad)(THIS) PURE; STDMETHOD_(WINED3DRESOURCETYPE,GetType)(THIS) PURE; /*** IWineD3DSurface methods ***/ STDMETHOD(GetContainer)(THIS_ REFIID riid, void ** ppContainer) PURE; @@ -1162,6 +1177,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWineD3DResource) #define IWineD3DSurface_SetPriority(p,a) (p)->lpVtbl->SetPriority(p,a) #define IWineD3DSurface_GetPriority(p) (p)->lpVtbl->GetPriority(p) #define IWineD3DSurface_PreLoad(p) (p)->lpVtbl->PreLoad(p) +#define IWineD3DSurface_UnLoad(p) (p)->lpVtbl->UnLoad(p) #define IWineD3DSurface_GetType(p) (p)->lpVtbl->GetType(p) /*** IWineD3DSurface methods ***/ #define IWineD3DSurface_GetContainer(p,a,b) (p)->lpVtbl->GetContainer(p,a,b) @@ -1224,7 +1240,8 @@ DECLARE_INTERFACE_(IWineD3DVolume,IWineD3DResource) STDMETHOD_(DWORD,SetPriority)(THIS_ DWORD PriorityNew) PURE; STDMETHOD_(DWORD,GetPriority)(THIS) PURE; STDMETHOD_(void,PreLoad)(THIS) PURE; - STDMETHOD_(WINED3DRESOURCETYPE, GetType)(THIS) PURE; + STDMETHOD_(void,UnLoad)(THIS) PURE; + STDMETHOD_(WINED3DRESOURCETYPE, GetType)(THIS) PURE; /*** IWineD3DVolume methods ***/ STDMETHOD(GetContainer)(THIS_ REFIID riid, void ** ppContainer) PURE; STDMETHOD(GetDesc)(THIS_ WINED3DVOLUME_DESC * pDesc) PURE; @@ -1252,6 +1269,7 @@ DECLARE_INTERFACE_(IWineD3DVolume,IWineD3DResource) #define IWineD3DVolume_SetPriority(p,a) (p)->lpVtbl->SetPriority(p,a) #define IWineD3DVolume_GetPriority(p) (p)->lpVtbl->GetPriority(p) #define IWineD3DVolume_PreLoad(p) (p)->lpVtbl->PreLoad(p) +#define IWineD3DVolume_UnLoad(p) (p)->lpVtbl->UnLoad(p) #define IWineD3DVolume_GetType(p) (p)->lpVtbl->GetType(p) /*** IWineD3DVolume methods ***/ #define IWineD3DVolume_GetContainer(p,a,b) (p)->lpVtbl->GetContainer(p,a,b)