Henri Verbeet : wined3d: Explicitly calculate the sub-resource level in surface_load_fb_texture().

Alexandre Julliard julliard at winehq.org
Wed Feb 28 15:39:33 CST 2018


Module: wine
Branch: master
Commit: 8e7540b602beb658cb10aa576811cc404beac1a2
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=8e7540b602beb658cb10aa576811cc404beac1a2

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed Feb 28 10:14:57 2018 +0330

wined3d: Explicitly calculate the sub-resource level in surface_load_fb_texture().

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

---

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

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 751424d..36ecfaf 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1563,6 +1563,7 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct
     const struct wined3d_gl_info *gl_info;
     struct wined3d_context *context = old_ctx;
     struct wined3d_surface *restore_rt = NULL;
+    unsigned int level;
     GLenum target;
 
     restore_rt = context_get_rt_surface(old_ctx);
@@ -1585,10 +1586,11 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct
         gl_info->gl_ops.gl.p_glReadBuffer(wined3d_texture_get_gl_buffer(texture));
     checkGLcall("glReadBuffer");
 
+    level = sub_resource_idx % texture->level_count;
     target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx);
-    gl_info->gl_ops.gl.p_glCopyTexSubImage2D(target, surface->texture_level,
-            0, 0, 0, 0, wined3d_texture_get_level_width(texture, surface->texture_level),
-            wined3d_texture_get_level_height(texture, surface->texture_level));
+    gl_info->gl_ops.gl.p_glCopyTexSubImage2D(target, level, 0, 0, 0, 0,
+            wined3d_texture_get_level_width(texture, level),
+            wined3d_texture_get_level_height(texture, level));
     checkGLcall("glCopyTexSubImage2D");
 
     if (restore_rt)




More information about the wine-cvs mailing list