Changeset 38230 in vbox for trunk/src/VBox/Additions

Timestamp:

Jul 28, 2011 5:42:00 PM (14 years ago)

Author:

vboxsync

Message:

wddm/wine: workaround chromium inability for nondefault unpack raw length settings for PBO

File:

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

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

@@ -4102 +4102 @@
     }
 
+    if ((Src->Flags & SFLAG_PBO) && src_rect.right - src_rect.left != Src->currentDesc.Width)
+    {
+        WARN("Chromium does not support nondefault unpack row length for PBO\n");
+        return WINED3DERR_INVALIDCALL;
+    }
+
+    if((convert != NO_CONVERSION) && (Src->Flags & SFLAG_PBO)) {
+        WARN("conversion not supported here with PBO for src %p\n", Src);
+        return WINED3DERR_INVALIDCALL;
+    }
+
     d3dfmt_get_conv(Src, TRUE /* We need color keying */, TRUE /* We will use textures */,
             &desc, &convert);
@@ -4124 +4135 @@
     srcWidth = Src->currentDesc.Width;
     srcPitch = IWineD3DSurface_GetPitch(SrcSurface);
-
-    /* Don't use PBOs for converted surfaces. During PBO conversion we look at SFLAG_CONVERTED
-     * but it isn't set (yet) in all cases it is getting called. */
-    if((convert != NO_CONVERSION) && (Src->Flags & SFLAG_PBO)) {
-        TRACE("Removing the pbo attached to surface %p\n", Src);
-        surface_remove_pbo(Src, gl_info);
-    }
 
     if(desc.convert) {