[PATCH 4/5] wined3d: Try harder to keep the current context.
Józef Kucia
jkucia at codeweavers.com
Wed May 24 10:10:00 CDT 2017
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
Needed for the next patch. Otherwise, test failures are expected with
some drivers because GL query objects are going to be created and issued
on a different GL context than one used for drawing.
---
dlls/wined3d/context.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index e214e84..555bc49 100644
--- 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)
{
--
2.10.2
More information about the wine-patches
mailing list