Changeset 38589 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Aug 31, 2011 5:07:59 PM (14 years ago)

Author:

vboxsync

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

73782

Message:

wine/d3d: speedup fb_copy_to_texture_direct context acquisition

File:

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

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

@@ -3196 +3196 @@
 }
 
+#ifdef VBOX_WITH_WDDM
+# define VBOX_WINE_TEXDIRECT_USE_RESOURCELOAD
+#endif
 /* Does a direct frame buffer -> texture copy. Stretching is done
  * with single pixel copy calls
@@ -3208 +3211 @@
     struct wined3d_context *context;
     BOOL upsidedown = FALSE;
-    BOOL isOffscreen = surface_is_offscreen(SrcSurface);
+    BOOL isSrcOffscreen = surface_is_offscreen(SrcSurface);
     BOOL fNoStretching = TRUE;
     RECT dst_rect = *dst_rect_in;
@@ -3225 +3228 @@
     }
 
-    if (isOffscreen)
+    if (isSrcOffscreen)
     {
         upsidedown = !upsidedown;
@@ -3255 +3258 @@
     }
 
+#ifdef VBOX_WINE_TEXDIRECT_USE_RESOURCELOAD
+    if (isSrcOffscreen) context = context_acquire(myDevice, SrcSurface, CTXUSAGE_RESOURCELOAD);
+    else if (!surface_is_offscreen((IWineD3DSurface*)This)) context = context_acquire(myDevice, (IWineD3DSurface *) This, CTXUSAGE_RESOURCELOAD);
+    else context = context_acquire(myDevice, NULL, CTXUSAGE_RESOURCELOAD);
+
+    surface_internal_preload(SrcSurface, SRGB_RGB);
+#else
     context = context_acquire(myDevice, SrcSurface, CTXUSAGE_BLIT);
+#endif
+
     surface_internal_preload((IWineD3DSurface *) This, SRGB_RGB);
     ENTER_GL();
@@ -3262 +3274 @@
     glBindTexture(This->texture_target, This->texture_name);
     checkGLcall("glBindTexture");
-    if(isOffscreen) {
+    if(isSrcOffscreen) {
         TRACE("Reading from an offscreen target\n");
+#ifdef VBOX_WINE_TEXDIRECT_USE_RESOURCELOAD
+        context_bind_fbo(context, GL_READ_FRAMEBUFFER, &context->src_fbo);
+        context_attach_surface_fbo(context, GL_READ_FRAMEBUFFER, 0, (IWineD3DSurfaceImpl *)SrcSurface);
+#endif
         glReadBuffer(myDevice->offscreenBuffer);
+        checkGLcall("glReadBuffer()");
+#ifdef VBOX_WINE_TEXDIRECT_USE_RESOURCELOAD
+        context_attach_depth_stencil_fbo(context, GL_READ_FRAMEBUFFER, NULL, FALSE);
+#endif
     }
     else
     {
+#ifdef VBOX_WINE_TEXDIRECT_USE_RESOURCELOAD
+        context_bind_fbo(context, GL_READ_FRAMEBUFFER, NULL);
+#endif
         glReadBuffer(surface_get_gl_buffer(SrcSurface));
+        checkGLcall("glReadBuffer()");
     }
     checkGLcall("glReadBuffer");