Changeset 34304 in vbox for trunk/src

Timestamp:

Nov 23, 2010 6:05:09 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: aero multiscreen working

Location:

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

Files:

• device.c (modified) (6 diffs)
• swapchain_base.c (modified) (1 diff)

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

@@ -5759 +5759 @@
     struct wined3d_context *context;
     GLenum gl_filter;
+#ifndef VBOX_WITH_WDDM
     POINT offset = {0, 0};
+#endif
     RECT src_rect, dst_rect;
 
@@ -5808 +5810 @@
         TRACE("Source surface %p is onscreen\n", src_surface);
 
+#ifndef VBOX_WITH_WDDM
         if(buffer == GL_FRONT) {
             RECT windowsize;
             UINT h;
-            
+
             ClientToScreen(context->win_handle, &offset);
             GetClientRect(context->win_handle, &windowsize);
@@ -5824 +5827 @@
             src_rect.top =  offset.y + h - src_rect.top;
             src_rect.bottom =  offset.y + h - src_rect.bottom;
-        } else {
+        }
+        else
+#endif
+        {
             src_rect.top = ((IWineD3DSurfaceImpl *)src_surface)->currentDesc.Height - src_rect.top;
             src_rect.bottom = ((IWineD3DSurfaceImpl *)src_surface)->currentDesc.Height - src_rect.bottom;
@@ -5851 +5857 @@
         TRACE("Destination surface %p is onscreen\n", dst_surface);
 
+#ifndef VBOX_WITH_WDDM
         if(buffer == GL_FRONT) {
             RECT windowsize;
@@ -5866 +5873 @@
             dst_rect.top =  offset.y + h - dst_rect.top;
             dst_rect.bottom =  offset.y + h - dst_rect.bottom;
-        } else {
+        }
+        else
+#endif
+        {
             /* Screen coords = window coords, surface height = window height */
             dst_rect.top = ((IWineD3DSurfaceImpl *)dst_surface)->currentDesc.Height - dst_rect.top;
@@ -6915 +6925 @@
         return E_OUTOFMEMORY;
     }
-    This->swapchains = (IWineD3DSwapChain *)pvNewBuf;
+    This->swapchains = (IWineD3DSwapChain **)pvNewBuf;
     This->swapchains[This->NumberOfSwapChains] = swapchain;
     ++This->NumberOfSwapChains;

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

@@ -91 +91 @@
     start.y = 0;
 
+#ifndef VBOX_WITH_WDDM
     if (This->presentParms.Windowed) {
         MapWindowPoints(This->win_handle, NULL, &start, 1);
     }
+#endif
 
     IWineD3DSurface_BltFast(pDestSurface, start.x, start.y, This->frontBuffer, NULL, 0);