wined3d: Try harder to keep the current context.

Signed-off-by: Józef Kucia <jkucia@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Try harder to keep the current context.
1eb642aa · Józef Kucia · Alexandre Julliard · dfa3be5c · 1eb642aa
Commit 1eb642aa authored May 24, 2017 by Józef Kucia Committed by Alexandre Julliard May 25, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

context.c dlls/wined3d/context.c +5 -2

No files found.
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -3956,6 +3956,7 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device,
 {
    struct wined3d_context *current_context = context_get_current();
    struct wined3d_context *context;
+    BOOL swapchain_texture;

    TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx);

@@ -3964,6 +3965,7 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device,
    if (current_context && current_context->destroyed)
        current_context = NULL;

+    swapchain_texture = texture && texture->swapchain;
    if (!texture)
    {
        if (current_context
@@ -3989,7 +3991,7 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device,
    {
        context = current_context;
    }
-    else if (texture->swapchain)
+    else if (swapchain_texture)
    {
        TRACE("Rendering onscreen.\n");

@@ -4010,7 +4012,8 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device,
    context_enter(context);
    context_update_window(context);
    context_setup_target(context, texture, sub_resource_idx);
-    if (!context->valid) return context;
+    if (!context->valid)
+        return context;

    if (context != current_context)
    {