Changeset 32545 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/device.c

Timestamp:

Sep 16, 2010 10:00:43 AM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: wine multi-swapchain fixes, umd driver fixes

File:

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

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

@@ -6296 +6296 @@
 }
 
-static void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChainImpl *swapchain)
+static void delete_opengl_contexts(IWineD3DDevice *iface
+#ifndef VBOXWDDM
+        , IWineD3DSwapChainImpl *swapchain
+#endif
+        )
 {
     IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface;
@@ -6335 +6339 @@
         context_destroy(This, This->contexts[0]);
     }
+#ifndef VBOXWDDM
     HeapFree(GetProcessHeap(), 0, swapchain->context);
     swapchain->context = NULL;
     swapchain->num_contexts = 0;
+#endif
 }
 
@@ -6347 +6353 @@
     IWineD3DSurfaceImpl *target;
 
+#ifndef VBOXWDDM
     /* Recreate the primary swapchain's context */
     swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(*swapchain->context));
@@ -6354 +6361 @@
         return E_OUTOFMEMORY;
     }
+#endif
 
     target = (IWineD3DSurfaceImpl *)(swapchain->backBuffer ? swapchain->backBuffer[0] : swapchain->frontBuffer);
@@ -6359 +6367 @@
     {
         WARN("Failed to create context.\n");
+#ifndef VBOXWDDM
         HeapFree(GetProcessHeap(), 0, swapchain->context);
+#endif
         return E_FAIL;
     }
 
+#ifndef VBOXWDDM
     swapchain->context[0] = context;
     swapchain->num_contexts = 1;
+#endif
     create_dummy_textures(This);
     context_release(context);
@@ -6399 +6411 @@
     context_release(context);
     context_destroy(This, context);
+#ifndef VBOXWDDM
     HeapFree(GetProcessHeap(), 0, swapchain->context);
     swapchain->num_contexts = 0;
+#endif
     return hr;
 }
@@ -6411 +6425 @@
     WINED3DDISPLAYMODE mode;
     TRACE("(%p)\n", This);
+
+#ifdef VBOXWDDM
+    /* todo: implement multi-swapchain handlling!!! */
+    Assert(0);
+#endif
 
     hr = IWineD3DDevice_GetSwapChain(iface, 0, (IWineD3DSwapChain **) &swapchain);
@@ -6499 +6518 @@
     IWineD3DStateBlock_Release((IWineD3DStateBlock *)This->stateBlock);
 
-    delete_opengl_contexts(iface, swapchain);
+    delete_opengl_contexts(iface
+#ifndef VBOXWDDM
+            , swapchain
+#endif
+            );
 
     if(pPresentationParameters->Windowed) {
@@ -6865 +6888 @@
         return E_OUTOFMEMORY;
     }
-    IUnknown_AddRef(swapchain);
     This->swapchains = (IWineD3DSwapChain *)pvNewBuf;
     This->swapchains[This->NumberOfSwapChains] = swapchain;
     ++This->NumberOfSwapChains;
+    return WINED3D_OK;
+}
+
+static HRESULT WINAPI IWineD3DDeviceImpl_RemoveSwapChain(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain)
+{
+    IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface;
+    int i;
+    for (i = 0; i < This->NumberOfSwapChains; ++i)
+    {
+        if (This->swapchains[i] == swapchain)
+        {
+            break;
+        }
+    }
+
+    if (i == This->NumberOfSwapChains)
+    {
+        WARN("swapchain 0x%p is not part of device 0x%p\n", swapchain, iface);
+        return E_INVALIDARG;
+    }
+
+    --This->NumberOfSwapChains;
+    if (This->NumberOfSwapChains)
+    {
+        IWineD3DSwapChain **pvNewBuf = (IWineD3DSwapChain **)HeapAlloc(GetProcessHeap(), 0, (This->NumberOfSwapChains) * sizeof(IWineD3DSwapChain *));
+        if(!pvNewBuf) {
+            ERR("Out of memory!\n");
+            return E_OUTOFMEMORY;
+        }
+        if (i) {
+            memcpy (pvNewBuf, This->swapchains, i*sizeof(IWineD3DSwapChain *));
+        }
+        if (i < This->NumberOfSwapChains) {
+            memcpy (pvNewBuf + i, This->swapchains +i+1, (This->NumberOfSwapChains - i)*sizeof(IWineD3DSwapChain *));
+        }
+
+        This->swapchains = (IWineD3DSwapChain *)pvNewBuf;
+    }
+    else
+    {
+        while (This->numContexts)
+        {
+            context_destroy(This, This->contexts[0]);
+        }
+    }
     return WINED3D_OK;
 }
@@ -7029 +7096 @@
     IWineD3DDeviceImpl_Flush,
     IWineD3DDeviceImpl_AddSwapChain,
+    IWineD3DDeviceImpl_RemoveSwapChain,
 #endif
 };