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

Timestamp:

Dec 16, 2011 6:51:37 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

75450

Message:

wine/wddm: faster blits

File:

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

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

@@ -3682 +3682 @@
     IWineD3DSurfaceImpl *Src = (IWineD3DSurfaceImpl *) SrcSurface;
     RECT dst_rect, src_rect;
+#ifdef VBOX_WITH_WDDM
+    BOOL fNoRtInvolved = FALSE;
+#endif
 
     TRACE("(%p)->(%p,%p,%p,%08x,%p)\n", This, DestRect, SrcSurface, SrcRect, Flags, DDBltFx);
@@ -3705 +3708 @@
         SrcSurface != myDevice->render_targets[0] && This != (IWineD3DSurfaceImpl *) myDevice->render_targets[0]) {
         TRACE("No surface is render target, not using hardware blit. Src = %p, dst = %p\n", Src, This);
+#ifdef VBOX_WITH_WDDM
+        fNoRtInvolved = TRUE;
+#else
         return WINED3DERR_INVALIDCALL;
+#endif
     }
 
@@ -3832 +3839 @@
     }
 
-    if((srcSwapchain || SrcSurface == myDevice->render_targets[0]) && !dstSwapchain) {
+    if(
+#ifdef VBOX_WITH_WDDM
+            fNoRtInvolved ||
+#endif
+            ((srcSwapchain || SrcSurface == myDevice->render_targets[0]) && !dstSwapchain)) {
         /* Blit from render target to texture */
         BOOL stretchx;
@@ -4338 +4349 @@
     }
 
+#ifndef VBOX_WITH_WDDM
     /* Special cases for RenderTargets */
     if( (This->resource.usage & WINED3DUSAGE_RENDERTARGET) ||
-        ( Src && (Src->resource.usage & WINED3DUSAGE_RENDERTARGET) )) {
+        ( Src && (Src->resource.usage & WINED3DUSAGE_RENDERTARGET) ))
+#endif
+    {
         if(IWineD3DSurfaceImpl_BltOverride(This, DestRect, SrcSurface, SrcRect, Flags, DDBltFx, Filter) == WINED3D_OK)
         {