Henri Verbeet : wined3d: Don' t acquire a context in wined3d_texture_load_drawable().

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Mon Jul 29 15:32:48 2019 +0430

wined3d: Don't acquire a context in wined3d_texture_load_drawable().

The one we already have should be fine.

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

---

 dlls/wined3d/texture.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 6ae822d..19c2f3b 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -2547,9 +2547,7 @@ static BOOL wined3d_texture_gl_load_sysmem(struct wined3d_texture_gl *texture_gl
 static BOOL wined3d_texture_load_drawable(struct wined3d_texture *texture,
         unsigned int sub_resource_idx, struct wined3d_context *context)
 {
-    struct wined3d_texture *restore_texture;
     struct wined3d_device *device;
-    unsigned int restore_idx;
     unsigned int level;
     RECT r;
 
@@ -2569,13 +2567,6 @@ static BOOL wined3d_texture_load_drawable(struct wined3d_texture *texture,
     }
 
     device = texture->resource.device;
-    restore_texture = context->current_rt.texture;
-    restore_idx = context->current_rt.sub_resource_idx;
-    if (restore_texture != texture || restore_idx != sub_resource_idx)
-        context = context_acquire(device, texture, sub_resource_idx);
-    else
-        restore_texture = NULL;
-
     level = sub_resource_idx % texture->level_count;
     SetRect(&r, 0, 0, wined3d_texture_get_level_width(texture, level),
             wined3d_texture_get_level_height(texture, level));
@@ -2585,9 +2576,6 @@ static BOOL wined3d_texture_load_drawable(struct wined3d_texture *texture,
             texture, sub_resource_idx, WINED3D_LOCATION_DRAWABLE, &r,
             NULL, WINED3D_TEXF_POINT);
 
-    if (restore_texture)
-        context_restore(context, restore_texture, restore_idx);
-
     return TRUE;
 }