Changeset 38588 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/surface.c

Timestamp:

Aug 31, 2011 4:01:24 PM (13 years ago)

Author:

vboxsync

Message:

wddm/wine: fix image viewer rendering under Aero (workaround NVIDIA bugs with BlitFramebuffer)

File:

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

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

@@ -3199 +3199 @@
  * with single pixel copy calls
  */
-static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3DSurface *SrcSurface,
-        const RECT *src_rect, const RECT *dst_rect_in, WINED3DTEXTUREFILTERTYPE Filter, BOOL doit)
+static inline BOOL fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3DSurface *SrcSurface,
+        const RECT *src_rect, const RECT *dst_rect_in, WINED3DTEXTUREFILTERTYPE Filter, BOOL fFastOnly)
 {
     IWineD3DDeviceImpl *myDevice = This->resource.device;
@@ -3208 +3208 @@
     struct wined3d_context *context;
     BOOL upsidedown = FALSE;
+    BOOL isOffscreen = surface_is_offscreen(SrcSurface);
+    BOOL fNoStretching = TRUE;
     RECT dst_rect = *dst_rect_in;
 
@@ -3215 +3217 @@
     if(dst_rect.top > dst_rect.bottom) {
         UINT tmp = dst_rect.bottom;
+#ifdef DEBUG_misha
+        ERR("validate this path!");
+#endif
         dst_rect.bottom = dst_rect.top;
         dst_rect.top = tmp;
@@ -3220 +3225 @@
     }
 
+    if (isOffscreen)
+    {
+        upsidedown = !upsidedown;
+    }
+
+    xrel = (float) (src_rect->right - src_rect->left) / (float) (dst_rect.right - dst_rect.left);
+    yrel = (float) (src_rect->bottom - src_rect->top) / (float) (dst_rect.bottom - dst_rect.top);
+
+    if ((xrel - 1.0f < -eps) || (xrel - 1.0f > eps))
+    {
+        FIXME("Doing a pixel by pixel copy from the framebuffer to a texture, expect major performance issues\n");
+
+        if(Filter != WINED3DTEXF_NONE && Filter != WINED3DTEXF_POINT) {
+            ERR("Texture filtering not supported in direct blit\n");
+        }
+    }
+    else if ((Filter != WINED3DTEXF_NONE && Filter != WINED3DTEXF_POINT)
+            && ((yrel - 1.0f < -eps) || (yrel - 1.0f > eps)))
+    {
+        ERR("Texture filtering not supported in direct blit\n");
+    }
+
+    fNoStretching = !((xrel - 1.0f < -eps) || (xrel - 1.0f > eps))
+            && !((yrel - 1.0f < -eps) || (yrel - 1.0f > eps));
+
+    if (fFastOnly && (!upsidedown || !fNoStretching))
+    {
+        return FALSE;
+    }
+
     context = context_acquire(myDevice, SrcSurface, CTXUSAGE_BLIT);
     surface_internal_preload((IWineD3DSurface *) This, SRGB_RGB);
@@ -3227 +3262 @@
     glBindTexture(This->texture_target, This->texture_name);
     checkGLcall("glBindTexture");
-    if(surface_is_offscreen(SrcSurface)) {
+    if(isOffscreen) {
         TRACE("Reading from an offscreen target\n");
-        upsidedown = !upsidedown;
         glReadBuffer(myDevice->offscreenBuffer);
     }
@@ -3238 +3272 @@
     checkGLcall("glReadBuffer");
 
-    xrel = (float) (src_rect->right - src_rect->left) / (float) (dst_rect.right - dst_rect.left);
-    yrel = (float) (src_rect->bottom - src_rect->top) / (float) (dst_rect.bottom - dst_rect.top);
-
-    if ((xrel - 1.0f < -eps) || (xrel - 1.0f > eps))
-    {
-        FIXME("Doing a pixel by pixel copy from the framebuffer to a texture, expect major performance issues\n");
-
-        if(Filter != WINED3DTEXF_NONE && Filter != WINED3DTEXF_POINT) {
-            ERR("Texture filtering not supported in direct blit\n");
-        }
-    }
-    else if ((Filter != WINED3DTEXF_NONE && Filter != WINED3DTEXF_POINT)
-            && ((yrel - 1.0f < -eps) || (yrel - 1.0f > eps)))
-    {
-        ERR("Texture filtering not supported in direct blit\n");
-    }
-
-    if (upsidedown
-            && !((xrel - 1.0f < -eps) || (xrel - 1.0f > eps))
-            && !((yrel - 1.0f < -eps) || (yrel - 1.0f > eps)))
+    if (upsidedown && fNoStretching)
     {
         /* Upside down copy without stretching is nice, one glCopyTexSubImage call will do */
@@ -3274 +3289 @@
          */
 
-        if (!((xrel - 1.0f < -eps) || (xrel - 1.0f > eps))
-            && !((yrel - 1.0f < -eps) || (yrel - 1.0f > eps)))
+        if (fNoStretching)
         {
             /* No stretching involved, so just pass negative height and let host side take care of inverting */
 
-            if (doit)
-            {
-                glCopyTexSubImage2D(This->texture_target, This->texture_level,
+            glCopyTexSubImage2D(This->texture_target, This->texture_level,
                     dst_rect.left /*xoffset */, dst_rect.top /* y offset */,
                     src_rect->left, Src->currentDesc.Height - src_rect->bottom,
                     dst_rect.right - dst_rect.left, -(dst_rect.bottom-dst_rect.top));
-            }
         }
         else
@@ -3319 +3330 @@
      */
     IWineD3DSurface_ModifyLocation((IWineD3DSurface *) This, SFLAG_INTEXTURE, TRUE);
+
+    return TRUE;
 }
 
@@ -3807 +3820 @@
            )
         {
-            stretch_rect_fbo((IWineD3DDevice *)myDevice, SrcSurface, &src_rect,
-                    (IWineD3DSurface *)This, &dst_rect, Filter);
+            /* blit framebuffer might be buggy for some GPUs, try if fb_copy_to_texture_direct can do it quickly */
+            if (!fb_copy_to_texture_direct(This, SrcSurface, &src_rect, &dst_rect, Filter, TRUE /* fals only */))
+            {
+                TRACE("fb_copy_to_texture_direct can not do it fast, use stretch_rect_fbo\n");
+                stretch_rect_fbo((IWineD3DDevice *)myDevice, SrcSurface, &src_rect,
+                        (IWineD3DSurface *)This, &dst_rect, Filter);
+            }
         } else if((!stretchx) || dst_rect.right - dst_rect.left > Src->currentDesc.Width ||
                                     dst_rect.bottom - dst_rect.top > Src->currentDesc.Height) {
             TRACE("No stretching in x direction, using direct framebuffer -> texture copy\n");
-            fb_copy_to_texture_direct(This, SrcSurface, &src_rect, &dst_rect, Filter, TRUE);
+            fb_copy_to_texture_direct(This, SrcSurface, &src_rect, &dst_rect, Filter, FALSE /* do it alwais */);
         } else {
             TRACE("Using hardware stretching to flip / stretch the texture\n");