Henri Verbeet : wined3d: Get resource info from the texture in wined3d_device_set_cursor_properties ().
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Mar 7 08:50:37 CST 2016
Module: wine
Branch: master
Commit: 1e78dd31979937862a66ac35ebcc79ee824603c2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e78dd31979937862a66ac35ebcc79ee824603c2
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Sun Mar 6 20:59:46 2016 +0100
wined3d: Get resource info from the texture in wined3d_device_set_cursor_properties().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/device.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index ded1229..a724659 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -4296,10 +4296,10 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device
device->cursor_texture = NULL;
}
- if (cursor_image->resource.format->id != WINED3DFMT_B8G8R8A8_UNORM)
+ if (texture->resource.format->id != WINED3DFMT_B8G8R8A8_UNORM)
{
- WARN("Surface %p has an invalid format %s.\n",
- cursor_image, debug_d3dformat(cursor_image->resource.format->id));
+ WARN("Texture %p has invalid format %s.\n",
+ texture, debug_d3dformat(texture->resource.format->id));
return WINED3DERR_INVALIDCALL;
}
More information about the wine-cvs
mailing list