Changeset 38217 in vbox for trunk/src/VBox

Timestamp:

Jul 28, 2011 12:44:58 PM (13 years ago)

Author:

vboxsync

Message:

wddm/wine: fix fast sys2vram blits for the PBO case

File:

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

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

@@ -889 +889 @@
 
 #ifdef VBOX_WITH_WDDM
-static void surface_upload_data_rect(IWineD3DSurfaceImpl *This, const struct wined3d_gl_info *gl_info,
+static void surface_upload_data_rect(IWineD3DSurfaceImpl *This, IWineD3DSurfaceImpl *Src, const struct wined3d_gl_info *gl_info,
         const struct wined3d_format_desc *format_desc, BOOL srgb, const GLvoid *data, RECT *pRect)
 {
@@ -919 +919 @@
     ENTER_GL();
 
-    if (This->Flags & SFLAG_PBO)
-    {
-        GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, This->pbo));
+    if (Src->Flags & SFLAG_PBO)
+    {
+        GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, Src->pbo));
         checkGLcall("glBindBufferARB");
 
-        TRACE("(%p) pbo: %#x, data: %p.\n", This, This->pbo, data);
-        data = NULL;
+        TRACE("(%p) pbo: %#x, data: %p.\n", Src, Src->pbo, data);
+        /* the data should contain a zero-based offset */
     }
 
@@ -945 +945 @@
     }
 
-    if (This->Flags & SFLAG_PBO)
+    if (Src->Flags & SFLAG_PBO)
     {
         GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0));
@@ -4179 +4179 @@
     LEAVE_GL();
 
-    if (mem || (This->Flags & SFLAG_PBO))
-        surface_upload_data_rect(This, gl_info, &desc, srgb, updateMem, &dst_rect);
+    Assert(!!mem == !(Src->Flags & SFLAG_PBO));
+    surface_upload_data_rect(This, Src, gl_info, &desc, srgb, updateMem, &dst_rect);
 
     /* Restore the default pitch */