Changeset 32577 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine

Timestamp:

Sep 16, 2010 6:11:27 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: aero working on win7 (window contents still corrupted)

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d

Files:

• context.c (modified) (7 diffs)
• device.c (modified) (1 diff)
• swapchain.c (modified) (2 diffs)
• swapchain_gdi.c (modified) (2 diffs)
• wined3d_private.h (modified) (1 diff)

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

@@ -855 +855 @@
     context_validate(context
 #ifdef VBOXWDDM/* tmp work-around */
-            , context->device->swapchains[context->device->NumberOfSwapChains-1]
+            , (IWineD3DSwapChainImpl*)context->device->swapchains[context->device->NumberOfSwapChains-1]
 #endif
             );
@@ -1293 +1293 @@
     HDC hdc;
 
+#if defined(VBOXWDDM) && defined(DEBUG_misha)
+    Assert(0);
+#endif
+
     TRACE("swapchain %p, target %p, window %p.\n", swapchain, target, swapchain->win_handle);
 
@@ -1592 +1596 @@
 #ifdef VBOXWDDM
 static void context_setup_target(IWineD3DDeviceImpl *device, struct wined3d_context *context, IWineD3DSurface *target);
+static void context_apply_state(struct wined3d_context *context, IWineD3DDeviceImpl *device, enum ContextUsage usage);
+
+BOOL context_acquire_context(struct wined3d_context * context, IWineD3DSurface *target, enum ContextUsage usage, BOOL bReValidate)
+{
+    IWineD3DDeviceImpl *device = context->device;
+    struct wined3d_context *current_context = context_get_current();
+    if (bReValidate)
+    {
+        IWineD3DSwapChain *swapchain = NULL;
+        if (target && SUCCEEDED(IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain))) {
+            context_validate(current_context, (IWineD3DSwapChainImpl*)swapchain);
+            IWineD3DSwapChain_Release(swapchain);
+        }
+        else {
+                                                                                                    /* tmp work-around */
+            context_validate(current_context, (IWineD3DSwapChainImpl*)current_context->device->swapchains[current_context->device->NumberOfSwapChains-1]);
+        }
+    }
+    context_setup_target(device, context, target);
+    context_enter(context);
+    Assert(context->valid);
+    if (!context->valid) return FALSE;
+
+    if (context != current_context)
+    {
+        if (!context_set_current(context)) ERR("Failed to activate the new context.\n");
+        else device->frag_pipe->enable_extension((IWineD3DDevice *)device, !context->last_was_blit);
+
+        if (context->vshader_const_dirty)
+        {
+            memset(context->vshader_const_dirty, 1,
+                    sizeof(*context->vshader_const_dirty) * device->d3d_vshader_constantF);
+            device->highest_dirty_vs_const = device->d3d_vshader_constantF;
+        }
+        if (context->pshader_const_dirty)
+        {
+            memset(context->pshader_const_dirty, 1,
+                   sizeof(*context->pshader_const_dirty) * device->d3d_pshader_constantF);
+            device->highest_dirty_ps_const = device->d3d_pshader_constantF;
+        }
+    }
+    else if (context->restore_ctx)
+    {
+        if (!pwglMakeCurrent(context->hdc, context->glCtx))
+        {
+            DWORD err = GetLastError();
+            ERR("Failed to make GL context %p current on device context %p, last error %#x.\n",
+                    context->hdc, context->glCtx, err);
+        }
+    }
+
+    context_apply_state(context, device, usage);
+
+    return TRUE;
+}
 
 struct wined3d_context *context_find_create(IWineD3DDeviceImpl *device, IWineD3DSwapChainImpl *swapchain, IWineD3DSurfaceImpl *target,
         const struct wined3d_format_desc *ds_format_desc)
 {
-    int i;
+    UINT i;
     DWORD tid = GetCurrentThreadId();
     struct wined3d_context *context = NULL;
@@ -1619 +1678 @@
     else
     {
-        context_validate(context, swapchain);
-        context_setup_target(device, context, target);
-        context_enter(context);
-        Assert(context->valid);
+        if(!context_acquire_context(context, (IWineD3DSurface*)target, CTXUSAGE_RESOURCELOAD, TRUE))
+        {
+            ERR("Failed to acquire the context.\n");
+            Assert(0);
+            Assert(!context->valid);
+            context = NULL;
+        }
+        else
+        {
+            Assert(context->valid);
+        }
     }
 
@@ -1970 +2036 @@
     {
 #ifdef VBOXWDDM
-        IWineD3DSwapChainImpl *swapchain = NULL;
+        IWineD3DSwapChain *swapchain = NULL;
         if (SUCCEEDED(IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain))) {
-            context_validate(current_context, swapchain);
+            context_validate(current_context, (IWineD3DSwapChainImpl*)swapchain);
             IWineD3DSwapChain_Release(swapchain);
         }
         else {
                                                                                                     /* tmp work-around */
-            context_validate(current_context, current_context->device->swapchains[current_context->device->NumberOfSwapChains-1]);
+            context_validate(current_context, (IWineD3DSwapChainImpl*)current_context->device->swapchains[current_context->device->NumberOfSwapChains-1]);
         }
 #else
@@ -1990 +2056 @@
         context = findThreadContextForSwapChain(swapchain, tid);
 #ifdef VBOXWDDM
-        context_validate(context, swapchain);
+        context_validate(context, (IWineD3DSwapChainImpl*)swapchain);
 #endif
         IWineD3DSwapChain_Release(swapchain);
@@ -2025 +2091 @@
 #ifdef VBOXWDDM
         context_validate(context,
-                This->swapchains[This->NumberOfSwapChains-1] /* tmp work-around */
+                (IWineD3DSwapChainImpl*)This->swapchains[This->NumberOfSwapChains-1] /* tmp work-around */
                                  );
 #endif

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

@@ -6863 +6863 @@
 static HRESULT WINAPI IWineD3DDeviceImpl_Flush(IWineD3DDevice *iface)
 {
-    IWineD3DSwapChain *swapChain = NULL;
+    IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface;
+    struct wined3d_context *context;
     int i;
-    int swapchains = IWineD3DDeviceImpl_GetNumberOfSwapChains(iface);
-
-    TRACE("iface %p.\n", iface);
-
-    for(i = 0 ; i < swapchains ; i ++) {
-
-        IWineD3DDeviceImpl_GetSwapChain(iface, i, &swapChain);
-        TRACE("presentinng chain %d, %p\n", i, swapChain);
-        IWineD3DSwapChain_Flush(swapChain);
-        IWineD3DSwapChain_Release(swapChain);
-    }
-
+    for (i = 0; i < This->numContexts; ++i)
+    {
+        context = This->contexts[i];
+        if (context_acquire_context(context, NULL, CTXUSAGE_RESOURCELOAD, TRUE))
+        {
+            Assert(context->valid);
+            wglFlush();
+            context_release(context);
+        }
+        else
+        {
+            WARN("Invalid context, skipping flush.\n");
+        }
+    }
     return WINED3D_OK;
 }

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

@@ -555 +555 @@
 }
 
-#ifdef VBOXWDDM
-static HRESULT WINAPI IWineD3DSwapChainImpl_Flush(IWineD3DSwapChain *iface)
-{
-    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface;
-    struct wined3d_context *context;
-    RECT src_rect, dst_rect;
-    BOOL render_to_fbo;
-    unsigned int sync;
-    int retval;
-
-    context = context_acquire(This->device, This->backBuffer[0], CTXUSAGE_RESOURCELOAD);
-
-    if (context->valid) wglFlush();
-    else  WARN("Invalid context, skipping flush.\n");
-
-    context_release(context);
-
-    return WINED3D_OK;
-}
-#endif
-
 static const IWineD3DSwapChainVtbl IWineD3DSwapChain_Vtbl =
 {
@@ -595 +574 @@
     IWineD3DBaseSwapChainImpl_SetGammaRamp,
     IWineD3DBaseSwapChainImpl_GetGammaRamp,
-#ifdef VBOXWDDM
-    IWineD3DSwapChainImpl_Flush,
-#endif
 };
 

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

@@ -254 +254 @@
     return WINED3D_OK;
 }
-
-#ifdef VBOXWDDM
-static HRESULT WINAPI IWineGDISwapChainImpl_Flush(IWineD3DSwapChain *iface) {
-    IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *) iface;
-
-    WARN("GDI Swapchain doesn't implement flush, returning WINED3DERR_INVALIDCALL\n");
-    return WINED3DERR_INVALIDCALL;
-}
-#endif
 
 const IWineD3DSwapChainVtbl IWineGDISwapChain_Vtbl =
@@ -283 +274 @@
     IWineD3DBaseSwapChainImpl_SetGammaRamp,
     IWineD3DBaseSwapChainImpl_GetGammaRamp,
-#ifdef VBOXWDM
-    IWineGDISwapChainImpl_Flush,
-#endif
 };

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_private.h

@@ -1249 +1249 @@
 struct wined3d_context *context_find_create(IWineD3DDeviceImpl *device, IWineD3DSwapChainImpl *swapchain, IWineD3DSurfaceImpl *target,
         const struct wined3d_format_desc *ds_format_desc) DECLSPEC_HIDDEN;
+BOOL context_acquire_context(struct wined3d_context * context, IWineD3DSurface *target, enum ContextUsage usage, BOOL bReValidate) DECLSPEC_HIDDEN;
 #endif
 void context_destroy(IWineD3DDeviceImpl *This, struct wined3d_context *context) DECLSPEC_HIDDEN;