Changeset 32461 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/context.c

Timestamp:

Sep 13, 2010 5:59:01 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: wine multi-swapchain fixes

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/context.c (modified) (19 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/context.c

@@ -331 +331 @@
 {
     const struct wined3d_gl_info *gl_info = context->gl_info;
+#ifdef VBOXWDDM
+    IWineD3DDeviceImpl *device = context->device;
+#else
     IWineD3DDeviceImpl *device = context->swapchain->device;
+#endif
     struct fbo_entry *entry;
 
@@ -348 +352 @@
 {
     const struct wined3d_gl_info *gl_info = context->gl_info;
+#ifdef VBOXWDDM
+    IWineD3DDeviceImpl *device = context->device;
+#else
     IWineD3DDeviceImpl *device = context->swapchain->device;
+#endif
 
     context_bind_fbo(context, GL_FRAMEBUFFER, &entry->id);
@@ -377 +385 @@
 {
     const struct wined3d_gl_info *gl_info = context->gl_info;
+#ifdef VBOXWDDM
+    IWineD3DDeviceImpl *device = context->device;
+#else
     IWineD3DDeviceImpl *device = context->swapchain->device;
+#endif
     struct fbo_entry *entry;
 
@@ -413 +425 @@
 {
     const struct wined3d_gl_info *gl_info = context->gl_info;
+#ifdef VBOXWDDM
+    IWineD3DDeviceImpl *device = context->device;
+#else
     IWineD3DDeviceImpl *device = context->swapchain->device;
+#endif
     unsigned int i;
 
@@ -734 +750 @@
 }
 
-static void context_update_window(struct wined3d_context *context)
-{
+static void context_update_window(struct wined3d_context *context
+#ifdef VBOXWDDM
+        , IWineD3DSwapChainImpl *swapchain
+#endif
+        )
+{
+#ifdef VBOXWDDM
+    TRACE("Updating context %p window from %p to %p.\n",
+            context, context->win_handle, swapchain->win_handle);
+#else
     TRACE("Updating context %p window from %p to %p.\n",
             context, context->win_handle, context->swapchain->win_handle);
+#endif
 
     if (context->valid)
@@ -749 +774 @@
     else context->valid = 1;
 
+#ifdef VBOXWDDM
+    context->win_handle = swapchain->win_handle;
+    context->hdc = GetDC(context->win_handle);
+    context->currentSwapchain = swapchain;
+#else
     context->win_handle = context->swapchain->win_handle;
 
@@ -756 +786 @@
         goto err;
     }
+#endif
 
     if (!context_set_pixel_format(context->gl_info, context->hdc, context->pixel_format))
@@ -777 +808 @@
 }
 
-static void context_validate(struct wined3d_context *context)
+static void context_validate(struct wined3d_context *context
+#ifdef VBOXWDDM
+        , IWineD3DSwapChainImpl *swapchain
+#endif
+        )
 {
     HWND wnd = WindowFromDC(context->hdc);
@@ -788 +823 @@
     }
 
-    if (context->win_handle != context->swapchain->win_handle)
-        context_update_window(context);
+    if (
+#ifdef VBOXWDDM
+            swapchain && context->win_handle != swapchain->win_handle
+#else
+            context->win_handle != context->swapchain->win_handle
+#endif
+            )
+    {
+        context_update_window(context
+#ifdef VBOXWDDM
+                , swapchain
+#endif
+                );
+    }
 }
 
@@ -805 +852 @@
     restore_dc = pwglGetCurrentDC();
 
-    context_validate(context);
+    context_validate(context
+#ifdef VBOXWDDM
+            , NULL//context->device->swapchains[0]
+#endif
+            );
     if (context->valid && restore_ctx != context->glCtx) pwglMakeCurrent(context->hdc, context->glCtx);
     else restore_ctx = NULL;
@@ -1210 +1261 @@
 }
 
+
+
+
 /*****************************************************************************
  * context_create
@@ -1361 +1415 @@
     }
 
+#ifdef VBOXWDDM
+    ret->device = device;
+    ret->currentSwapchain = swapchain;
+#else
     ret->swapchain = swapchain;
+#endif
     ret->current_rt = (IWineD3DSurface *)target;
     ret->tid = GetCurrentThreadId();
@@ -1529 +1588 @@
     return NULL;
 }
+
+#ifdef VBOXWDDM
+static void context_setup_target(IWineD3DDeviceImpl *device, struct wined3d_context *context, IWineD3DSurface *target);
+
+struct wined3d_context *context_find_create(IWineD3DDeviceImpl *device, IWineD3DSwapChainImpl *swapchain, IWineD3DSurfaceImpl *target,
+        const struct wined3d_format_desc *ds_format_desc)
+{
+    IWineD3DSwapChainImpl *swapChain = NULL;
+    int i, j;
+    int swapchains = IWineD3DDevice_GetNumberOfSwapChains(device);
+    DWORD tid = GetCurrentThreadId();
+    struct wined3d_context *context = NULL;
+
+    Assert(0);
+
+    for(i = 0 ; i < swapchains ; i ++)
+    {
+        IWineD3DDevice_GetSwapChain(device, i, &swapChain);
+        if (swapChain->ds_format == ds_format_desc)
+        {
+            for(j = 0; j < swapChain->num_contexts; j++) {
+                if(swapChain->context[j]->tid == tid
+                        && swapChain->context[j]->tid == tid) {
+                    context = swapChain->context[j];
+                    break;
+                }
+            }
+        }
+        else
+        {
+            Assert(0);
+        }
+
+        if (context)
+            break;
+        IWineD3DSwapChain_Release(swapChain);
+    }
+
+    if (!context)
+    {
+        Assert(!swapchains);
+        context = context_create(swapchain, target, ds_format_desc);
+    }
+    else
+    {
+        Assert(swapChain);
+        context_validate(context, swapChain);
+        context_setup_target(device, context, target);
+        context_enter(context);
+        Assert(context->valid);
+        IWineD3DSwapChain_Release(swapChain);
+    }
+
+    return context;
+}
+#endif
 
 /*****************************************************************************
@@ -1807 +1922 @@
             return ((IWineD3DSwapChainImpl *) swapchain)->context[i];
         }
-
-    }
+    }
+
+#ifdef VBOXWDDM
+    Assert(0);
+#endif
 
     /* Create a new context for the thread */
@@ -1839 +1957 @@
         if (current_context
                 && current_context->current_rt
-                && current_context->swapchain->device == This)
+#ifdef VBOXWDDM
+                && current_context->device == This
+#else
+                && current_context->swapchain->device == This
+#endif
+                )
         {
             target = current_context->current_rt;
@@ -1853 +1976 @@
     if (current_context && current_context->current_rt == target)
     {
-        context_validate(current_context);
+        context_validate(current_context
+#ifdef VBOXWDDM
+                , NULL// current_context->device->swapchains[0]
+#endif
+                                                    );
         return current_context;
     }
@@ -1862 +1989 @@
         context = findThreadContextForSwapChain(swapchain, tid);
         IWineD3DSwapChain_Release(swapchain);
+#ifdef VBOXWDDM
+        context_validate(context, swapchain);
+#endif
     }
     else
@@ -1868 +1998 @@
 
         /* Stay with the currently active context. */
-        if (current_context && current_context->swapchain->device == This)
+        if (current_context
+#ifdef VBOXWDDM
+                && current_context->device == This
+#else
+                && current_context->swapchain->device == This
+#endif
+                )
         {
             context = current_context;
@@ -1882 +2018 @@
             context = findThreadContextForSwapChain(This->swapchains[0], tid);
         }
-    }
-
+#ifdef VBOXWDDM
+        context_validate(context,
+                NULL//This->swapchains[0]
+                                 );
+#endif
+    }
+
+#ifndef VBOXWDDM
     context_validate(context);
+#endif
 
     return context;