Henri Verbeet : wined3d: Use the texture dimension helpers in wined3d_device_create_cursor_texture ().

Alexandre Julliard julliard at wine.codeweavers.com
Mon Apr 4 10:37:01 CDT 2016


Module: wine
Branch: master
Commit: 3f5e1d1707c922e1ff24f2a452faf171f8fd5a01
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3f5e1d1707c922e1ff24f2a452faf171f8fd5a01

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Sun Apr  3 15:30:53 2016 +0200

wined3d: Use the texture dimension helpers in wined3d_device_create_cursor_texture().

Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/device.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 35bf521..4001e6c 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -4282,6 +4282,7 @@ void CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *device,
 static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined3d_device *device,
         struct wined3d_texture *cursor_image, unsigned int sub_resource_idx)
 {
+    unsigned int texture_level = sub_resource_idx % cursor_image->level_count;
     struct wined3d_sub_resource_data data;
     struct wined3d_resource_desc desc;
     struct wined3d_map_desc map_desc;
@@ -4304,8 +4305,8 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined
     desc.multisample_quality = 0;
     desc.usage = WINED3DUSAGE_DYNAMIC;
     desc.pool = WINED3D_POOL_DEFAULT;
-    desc.width = cursor_image->sub_resources[sub_resource_idx].resource->width;
-    desc.height = cursor_image->sub_resources[sub_resource_idx].resource->height;
+    desc.width = wined3d_texture_get_level_width(cursor_image, texture_level);
+    desc.height = wined3d_texture_get_level_height(cursor_image, texture_level);
     desc.depth = 1;
     desc.size = 0;
 




More information about the wine-cvs mailing list