Module: wine Branch: master Commit: f3c69e40dce9dc764d370d18bc6d957308dba00a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c69e40dce9dc764d370d18bc...
Author: Riccardo Bortolato rikyz619@gmail.com Date: Mon Oct 19 19:07:33 2015 +0200
d3d9: Replace wined3d_surface_get_resource with wined3d_texture_get_sub_resource in d3d9_device_ColorFill.
Signed-off-by: Riccardo Bortolato rikyz619@gmail.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3d9/device.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7d9f735..821aa4f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1378,7 +1378,11 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface,
wined3d_mutex_lock();
- wined3d_resource = wined3d_surface_get_resource(surface_impl->wined3d_surface); + if (!(wined3d_resource = wined3d_texture_get_sub_resource(surface_impl->wined3d_texture, surface_impl->sub_resource_idx))) + { + wined3d_mutex_unlock(); + return D3DERR_INVALIDCALL; + } wined3d_resource_get_desc(wined3d_resource, &desc);
if (desc.pool != WINED3D_POOL_DEFAULT)