Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_device_create_surface().
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Feb 22 08:57:37 CST 2016
Module: wine
Branch: master
Commit: 55f2d655caab99ff33452a682f1df9d7d3f32716
URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f2d655caab99ff33452a682f1df9d7d3f32716
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Fri Feb 19 17:28:45 2016 +0100
d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_device_create_surface().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d9/device.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 382b971..7b351c3 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -1108,7 +1108,6 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width
D3DFORMAT format, DWORD flags, IDirect3DSurface9 **surface, UINT usage, D3DPOOL pool,
D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, void *user_mem)
{
- struct wined3d_resource *sub_resource;
struct wined3d_resource_desc desc;
struct d3d9_surface *surface_impl;
struct wined3d_texture *texture;
@@ -1142,8 +1141,7 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width
return hr;
}
- sub_resource = wined3d_texture_get_sub_resource(texture, 0);
- surface_impl = wined3d_resource_get_parent(sub_resource);
+ surface_impl = wined3d_texture_get_sub_resource_parent(texture, 0);
surface_impl->parent_device = &device->IDirect3DDevice9Ex_iface;
*surface = &surface_impl->IDirect3DSurface9_iface;
IDirect3DSurface9_AddRef(*surface);
More information about the wine-cvs
mailing list