diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2962d6db888..27de1b3a059 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5746,7 +5746,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, WINED3DPOOL srcPool, destPool; int offset = 0; int rowoffset = 0; /* how many bytes to add onto the end of a row to wraparound to the beginning of the next */ - glDescriptor *glDescription = NULL; + glDescriptor *glDescription; const struct GlPixelFormatDesc *src_format_desc, *dst_format_desc; GLenum dummy; int sampler; @@ -5807,7 +5807,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, surface_internal_preload(pDestinationSurface, SRGB_RGB); IWineD3DSurface_BindTexture(pDestinationSurface, FALSE); - IWineD3DSurface_GetGlDesc(pDestinationSurface, &glDescription); + glDescription = &((IWineD3DSurfaceImpl *)pDestinationSurface)->glDescription; src_format_desc = ((IWineD3DSurfaceImpl *)pSrcSurface)->resource.format_desc; dst_format_desc = ((IWineD3DSurfaceImpl *)pDestinationSurface)->resource.format_desc; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6909627c390..9328e82b527 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -914,13 +914,6 @@ static void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) { IWineD3DSurface IWineD3DSurface parts follow ****************************************************** */ -static void WINAPI IWineD3DSurfaceImpl_GetGlDesc(IWineD3DSurface *iface, glDescriptor **glDescription) -{ - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - TRACE("(%p) : returning %p\n", This, &This->glDescription); - *glDescription = &This->glDescription; -} - /* Read the framebuffer back into the surface */ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, void *dest, UINT pitch) { IWineD3DSwapChainImpl *swapchain; @@ -5082,7 +5075,6 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DSurfaceImpl_BindTexture, IWineD3DSurfaceImpl_SaveSnapshot, IWineD3DSurfaceImpl_SetContainer, - IWineD3DSurfaceImpl_GetGlDesc, IWineD3DBaseSurfaceImpl_GetData, IWineD3DSurfaceImpl_SetFormat, IWineD3DSurfaceImpl_PrivateSetup, diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 9e1a5dec2ce..39f00ccc579 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -547,12 +547,6 @@ IWineGDISurfaceImpl_PrivateSetup(IWineD3DSurface *iface) return WINED3D_OK; } -static void WINAPI IWineGDISurfaceImpl_GetGlDesc(IWineD3DSurface *iface, glDescriptor **glDescription) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - FIXME("(%p) : Should not be called on a GDI surface\n", This); - *glDescription = NULL; -} - static HRESULT WINAPI IWineGDISurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; @@ -682,7 +676,6 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = IWineD3DBaseSurfaceImpl_BindTexture, IWineGDISurfaceImpl_SaveSnapshot, IWineD3DBaseSurfaceImpl_SetContainer, - IWineGDISurfaceImpl_GetGlDesc, IWineD3DBaseSurfaceImpl_GetData, IWineD3DBaseSurfaceImpl_SetFormat, IWineGDISurfaceImpl_PrivateSetup, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 0f51b8e030f..3cc9d2cd8c0 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2532,9 +2532,6 @@ interface IWineD3DSurface : IWineD3DResource HRESULT SetContainer( [in] IWineD3DBase *container ); - void GetGlDesc( - [out] glDescriptor **desc - ); const void *GetData( ); HRESULT SetFormat(