wined3d: Remove GetGlDesc() from the public IWineD3DSurface interface.
This commit is contained in:
parent
60e0997c79
commit
038d939941
|
@ -5746,7 +5746,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface,
|
||||||
WINED3DPOOL srcPool, destPool;
|
WINED3DPOOL srcPool, destPool;
|
||||||
int offset = 0;
|
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 */
|
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;
|
const struct GlPixelFormatDesc *src_format_desc, *dst_format_desc;
|
||||||
GLenum dummy;
|
GLenum dummy;
|
||||||
int sampler;
|
int sampler;
|
||||||
|
@ -5807,7 +5807,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface,
|
||||||
surface_internal_preload(pDestinationSurface, SRGB_RGB);
|
surface_internal_preload(pDestinationSurface, SRGB_RGB);
|
||||||
IWineD3DSurface_BindTexture(pDestinationSurface, FALSE);
|
IWineD3DSurface_BindTexture(pDestinationSurface, FALSE);
|
||||||
|
|
||||||
IWineD3DSurface_GetGlDesc(pDestinationSurface, &glDescription);
|
glDescription = &((IWineD3DSurfaceImpl *)pDestinationSurface)->glDescription;
|
||||||
|
|
||||||
src_format_desc = ((IWineD3DSurfaceImpl *)pSrcSurface)->resource.format_desc;
|
src_format_desc = ((IWineD3DSurfaceImpl *)pSrcSurface)->resource.format_desc;
|
||||||
dst_format_desc = ((IWineD3DSurfaceImpl *)pDestinationSurface)->resource.format_desc;
|
dst_format_desc = ((IWineD3DSurfaceImpl *)pDestinationSurface)->resource.format_desc;
|
||||||
|
|
|
@ -914,13 +914,6 @@ static void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) {
|
||||||
IWineD3DSurface IWineD3DSurface parts follow
|
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 */
|
/* Read the framebuffer back into the surface */
|
||||||
static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, void *dest, UINT pitch) {
|
static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, void *dest, UINT pitch) {
|
||||||
IWineD3DSwapChainImpl *swapchain;
|
IWineD3DSwapChainImpl *swapchain;
|
||||||
|
@ -5082,7 +5075,6 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl =
|
||||||
IWineD3DSurfaceImpl_BindTexture,
|
IWineD3DSurfaceImpl_BindTexture,
|
||||||
IWineD3DSurfaceImpl_SaveSnapshot,
|
IWineD3DSurfaceImpl_SaveSnapshot,
|
||||||
IWineD3DSurfaceImpl_SetContainer,
|
IWineD3DSurfaceImpl_SetContainer,
|
||||||
IWineD3DSurfaceImpl_GetGlDesc,
|
|
||||||
IWineD3DBaseSurfaceImpl_GetData,
|
IWineD3DBaseSurfaceImpl_GetData,
|
||||||
IWineD3DSurfaceImpl_SetFormat,
|
IWineD3DSurfaceImpl_SetFormat,
|
||||||
IWineD3DSurfaceImpl_PrivateSetup,
|
IWineD3DSurfaceImpl_PrivateSetup,
|
||||||
|
|
|
@ -547,12 +547,6 @@ IWineGDISurfaceImpl_PrivateSetup(IWineD3DSurface *iface)
|
||||||
return WINED3D_OK;
|
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) {
|
static HRESULT WINAPI IWineGDISurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem) {
|
||||||
IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface;
|
IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface;
|
||||||
|
|
||||||
|
@ -682,7 +676,6 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl =
|
||||||
IWineD3DBaseSurfaceImpl_BindTexture,
|
IWineD3DBaseSurfaceImpl_BindTexture,
|
||||||
IWineGDISurfaceImpl_SaveSnapshot,
|
IWineGDISurfaceImpl_SaveSnapshot,
|
||||||
IWineD3DBaseSurfaceImpl_SetContainer,
|
IWineD3DBaseSurfaceImpl_SetContainer,
|
||||||
IWineGDISurfaceImpl_GetGlDesc,
|
|
||||||
IWineD3DBaseSurfaceImpl_GetData,
|
IWineD3DBaseSurfaceImpl_GetData,
|
||||||
IWineD3DBaseSurfaceImpl_SetFormat,
|
IWineD3DBaseSurfaceImpl_SetFormat,
|
||||||
IWineGDISurfaceImpl_PrivateSetup,
|
IWineGDISurfaceImpl_PrivateSetup,
|
||||||
|
|
|
@ -2532,9 +2532,6 @@ interface IWineD3DSurface : IWineD3DResource
|
||||||
HRESULT SetContainer(
|
HRESULT SetContainer(
|
||||||
[in] IWineD3DBase *container
|
[in] IWineD3DBase *container
|
||||||
);
|
);
|
||||||
void GetGlDesc(
|
|
||||||
[out] glDescriptor **desc
|
|
||||||
);
|
|
||||||
const void *GetData(
|
const void *GetData(
|
||||||
);
|
);
|
||||||
HRESULT SetFormat(
|
HRESULT SetFormat(
|
||||||
|
|
Loading…
Reference in New Issue