[PATCH 3/5] wined3d: Don't acquire a context in wined3d_texture_load_drawable().
Henri Verbeet
hverbeet at codeweavers.com
Mon Jul 29 05:44:48 CDT 2019
The one we already have should be fine.
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
dlls/wined3d/texture.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 6ae822ddf28..19c2f3b6146 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;
}
--
2.11.0
More information about the wine-devel
mailing list