[PATCH 1/4] wined3d: Get rid of IWineD3DSurface::GetDesc().
Henri Verbeet
hverbeet at codeweavers.com
Thu Mar 10 12:07:08 CST 2011
---
dlls/d3d8/device.c | 7 +++++--
dlls/d3d8/surface.c | 4 +++-
dlls/d3d9/device.c | 4 +++-
dlls/d3d9/surface.c | 4 +++-
dlls/ddraw/ddraw.c | 4 +++-
dlls/ddraw/surface.c | 4 +++-
dlls/wined3d/stateblock.c | 2 +-
dlls/wined3d/surface.c | 1 -
dlls/wined3d/surface_base.c | 9 ---------
dlls/wined3d/surface_gdi.c | 1 -
dlls/wined3d/wined3d_private.h | 1 -
include/wine/wined3d.idl | 3 ---
12 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 67daa5a..0a3c9c8 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -931,6 +931,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(IDirect3DDevice8 *iface,
IDirect3DSurface8Impl *Dest = (IDirect3DSurface8Impl *) pDestinationSurface;
enum wined3d_format_id srcFormat, destFormat;
struct wined3d_resource_desc wined3d_desc;
+ struct wined3d_resource *wined3d_resource;
TRACE("iface %p, src_surface %p, src_rects %p, rect_count %u, dst_surface %p, dst_points %p.\n",
iface, pSourceSurface, pSourceRects, cRects, pDestinationSurface, pDestPoints);
@@ -939,10 +940,12 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(IDirect3DDevice8 *iface,
* destination texture is in WINED3DPOOL_DEFAULT. */
wined3d_mutex_lock();
- IWineD3DSurface_GetDesc(Source->wineD3DSurface, &wined3d_desc);
+ wined3d_resource = IWineD3DSurface_GetResource(Source->wineD3DSurface);
+ wined3d_resource_get_desc(wined3d_resource, &wined3d_desc);
srcFormat = wined3d_desc.format;
- IWineD3DSurface_GetDesc(Dest->wineD3DSurface, &wined3d_desc);
+ wined3d_resource = IWineD3DSurface_GetResource(Dest->wineD3DSurface);
+ wined3d_resource_get_desc(wined3d_resource, &wined3d_desc);
destFormat = wined3d_desc.format;
/* Check that the source and destination formats match */
diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c
index 873fd56..0584276 100644
--- a/dlls/d3d8/surface.c
+++ b/dlls/d3d8/surface.c
@@ -191,11 +191,13 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetDesc(IDirect3DSurface8 *iface, D3
{
IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface;
struct wined3d_resource_desc wined3d_desc;
+ struct wined3d_resource *wined3d_resource;
TRACE("iface %p, desc %p.\n", iface, desc);
wined3d_mutex_lock();
- IWineD3DSurface_GetDesc(This->wineD3DSurface, &wined3d_desc);
+ wined3d_resource = IWineD3DSurface_GetResource(This->wineD3DSurface);
+ wined3d_resource_get_desc(wined3d_resource, &wined3d_desc);
wined3d_mutex_unlock();
desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format);
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index e008b31..3f79b17 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -1070,6 +1070,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ColorFill(IDirect3DDevice9Ex *iface,
};
IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;
IDirect3DSurface9Impl *surface = (IDirect3DSurface9Impl *)pSurface;
+ struct wined3d_resource *wined3d_resource;
struct wined3d_resource_desc desc;
HRESULT hr;
@@ -1077,7 +1078,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ColorFill(IDirect3DDevice9Ex *iface,
wined3d_mutex_lock();
- IWineD3DSurface_GetDesc(surface->wineD3DSurface, &desc);
+ wined3d_resource = IWineD3DSurface_GetResource(surface->wineD3DSurface);
+ wined3d_resource_get_desc(wined3d_resource, &desc);
/* This method is only allowed with surfaces that are render targets, or
* offscreen plain surfaces in D3DPOOL_DEFAULT. */
diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c
index 7e1294c..cedd30f 100644
--- a/dlls/d3d9/surface.c
+++ b/dlls/d3d9/surface.c
@@ -243,11 +243,13 @@ static HRESULT WINAPI IDirect3DSurface9Impl_GetDesc(IDirect3DSurface9 *iface, D3
{
IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface;
struct wined3d_resource_desc wined3d_desc;
+ struct wined3d_resource *wined3d_resource;
TRACE("iface %p, desc %p.\n", iface, desc);
wined3d_mutex_lock();
- IWineD3DSurface_GetDesc(This->wineD3DSurface, &wined3d_desc);
+ wined3d_resource = IWineD3DSurface_GetResource(This->wineD3DSurface);
+ wined3d_resource_get_desc(wined3d_resource, &wined3d_desc);
wined3d_mutex_unlock();
desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format);
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index cc011c1..fe6cbc1 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -2516,6 +2516,7 @@ HRESULT WINAPI ddraw_recreate_surfaces_cb(IDirectDrawSurface7 *surf, DDSURFACEDE
{
IDirectDrawSurfaceImpl *surfImpl = (IDirectDrawSurfaceImpl *)surf;
struct wined3d_resource_desc wined3d_desc;
+ struct wined3d_resource *wined3d_resource;
IDirectDrawImpl *This = surfImpl->ddraw;
struct wined3d_clipper *clipper = NULL;
IWineD3DSurface *wineD3DSurface;
@@ -2540,7 +2541,8 @@ HRESULT WINAPI ddraw_recreate_surfaces_cb(IDirectDrawSurface7 *surf, DDSURFACEDE
IWineD3DSurface_GetClipper(wineD3DSurface, &clipper);
/* Get the surface properties */
- IWineD3DSurface_GetDesc(wineD3DSurface, &wined3d_desc);
+ wined3d_resource = IWineD3DSurface_GetResource(wineD3DSurface);
+ wined3d_resource_get_desc(wined3d_resource, &wined3d_desc);
parent = IWineD3DSurface_GetParent(wineD3DSurface);
hr = IWineD3DDevice_CreateSurface(This->wineD3DDevice, wined3d_desc.width, wined3d_desc.height,
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 61a0215..d152a02 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -3500,6 +3500,7 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr
DDSURFACEDESC2 *desc, UINT mip_level, WINED3DSURFTYPE surface_type)
{
struct wined3d_resource_desc wined3d_desc;
+ struct wined3d_resource *wined3d_resource;
WINED3DPOOL pool = WINED3DPOOL_DEFAULT;
enum wined3d_format_id format;
DWORD usage = 0;
@@ -3588,7 +3589,8 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr
}
surface->surface_desc.dwFlags |= DDSD_PIXELFORMAT;
- IWineD3DSurface_GetDesc(surface->WineD3DSurface, &wined3d_desc);
+ wined3d_resource = IWineD3DSurface_GetResource(surface->WineD3DSurface);
+ wined3d_resource_get_desc(wined3d_resource, &wined3d_desc);
format = wined3d_desc.format;
if (format == WINED3DFMT_UNKNOWN)
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index 3617009..30f5d37 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -1292,7 +1292,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock)
{
struct wined3d_resource_desc desc;
- IWineD3DSurface_GetDesc(backbuffer, &desc);
+ wined3d_resource_get_desc(&((IWineD3DSurfaceImpl *)backbuffer)->resource, &desc);
IWineD3DSurface_Release(backbuffer);
/* Set the default scissor rect values */
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 6589f05..ace0c65 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -4720,7 +4720,6 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl =
IWineD3DBaseSurfaceImpl_GetType,
/* IWineD3DSurface */
IWineD3DBaseSurfaceImpl_GetResource,
- IWineD3DBaseSurfaceImpl_GetDesc,
IWineD3DSurfaceImpl_Map,
IWineD3DSurfaceImpl_Unmap,
IWineD3DSurfaceImpl_GetDC,
diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c
index f8b6a63..74fa196 100644
--- a/dlls/wined3d/surface_base.c
+++ b/dlls/wined3d/surface_base.c
@@ -157,15 +157,6 @@ struct wined3d_resource * WINAPI IWineD3DBaseSurfaceImpl_GetResource(IWineD3DSur
return &((IWineD3DSurfaceImpl *)iface)->resource;
}
-void WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, struct wined3d_resource_desc *desc)
-{
- IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)iface;
-
- TRACE("iface %p, desc %p.\n", iface, desc);
-
- wined3d_resource_get_desc(&surface->resource, desc);
-}
-
HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWORD flags)
{
TRACE("iface %p, flags %#x.\n", iface, flags);
diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c
index f0ec491..a2160c4 100644
--- a/dlls/wined3d/surface_gdi.c
+++ b/dlls/wined3d/surface_gdi.c
@@ -452,7 +452,6 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl =
IWineD3DBaseSurfaceImpl_GetType,
/* IWineD3DSurface */
IWineD3DBaseSurfaceImpl_GetResource,
- IWineD3DBaseSurfaceImpl_GetDesc,
IWineGDISurfaceImpl_Map,
IWineGDISurfaceImpl_Unmap,
IWineGDISurfaceImpl_GetDC,
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 201e19b..8fc6df5 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2200,7 +2200,6 @@ DWORD WINAPI IWineD3DBaseSurfaceImpl_SetPriority(IWineD3DSurface *iface, DWORD P
DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPriority(IWineD3DSurface *iface) DECLSPEC_HIDDEN;
WINED3DRESOURCETYPE WINAPI IWineD3DBaseSurfaceImpl_GetType(IWineD3DSurface *iface) DECLSPEC_HIDDEN;
struct wined3d_resource * WINAPI IWineD3DBaseSurfaceImpl_GetResource(IWineD3DSurface *iface) DECLSPEC_HIDDEN;
-void WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, struct wined3d_resource_desc *desc) DECLSPEC_HIDDEN;
HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWORD flags) DECLSPEC_HIDDEN;
HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetFlipStatus(IWineD3DSurface *iface, DWORD flags) DECLSPEC_HIDDEN;
HRESULT WINAPI IWineD3DBaseSurfaceImpl_IsLost(IWineD3DSurface *iface) DECLSPEC_HIDDEN;
diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl
index d70ae2c..f6cad6a 100644
--- a/include/wine/wined3d.idl
+++ b/include/wine/wined3d.idl
@@ -2226,9 +2226,6 @@ interface IWineD3DSurface : IWineD3DResource
{
struct wined3d_resource *GetResource(
);
- void GetDesc(
- [out] struct wined3d_resource_desc *desc
- );
HRESULT Map(
[out] WINED3DLOCKED_RECT *locked_rect,
[in] const RECT *rect,
--
1.7.3.4
More information about the wine-patches
mailing list