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

Timestamp:

Sep 1, 2010 4:37:20 PM (15 years ago)

Author:

vboxsync

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

65468

Message:

wine: shared render target support; wddm/d3d: aero multi-monitor fixes (still buggy)

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d

Files:

• surface.c (modified) (1 diff)
• texture.c (modified) (2 diffs)
• vboxsharedrc.h (modified) (1 diff)

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

@@ -482 +482 @@
         return hr;
     }
+
+#ifdef VBOXWDDM
+    if (VBOXSHRC_IS_SHARED(surface))
+    {
+        Assert(shared_handle);
+        VBOXSHRC_SET_INITIALIZED(surface);
+        IWineD3DSurface_LoadLocation(surface, SFLAG_INTEXTURE, NULL);
+        if (!VBOXSHRC_IS_SHARED_OPENED(surface))
+        {
+            Assert(!(*shared_handle));
+            *shared_handle = VBOXSHRC_GET_SHAREHANDLE(surface);
+        }
+        else
+        {
+            Assert(*shared_handle);
+            Assert(*shared_handle == VBOXSHRC_GET_SHAREHANDLE(surface));
+        }
+    }
+    else
+    {
+        Assert(!shared_handle);
+    }
+#endif
 
     return hr;

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

@@ -590 +590 @@
         hr = IWineD3DDeviceParent_CreateSurface(device->device_parent, parent, tmp_w, tmp_h, format_desc->format,
                 usage, pool, i, WINED3DCUBEMAP_FACE_POSITIVE_X, &texture->surfaces[i]
-                , shared_handle
+                , NULL /* <- we first create a surface in an everage "non-shared" fashion and initialize its share properties later (see below)
+                        * this is done this way because the surface does not have its parent (texture) setup properly
+                        * thus we can not initialize texture at this stage */
                 , pvClientMem);
 
@@ -621 +623 @@
         Assert(shared_handle);
         VBOXSHRC_SET_INITIALIZED(texture);
+        for (i = 0; i < texture->baseTexture.levels; ++i)
+        {
+            VBOXSHRC_COPY_SHAREDATA((IWineD3DSurfaceImpl*)texture->surfaces[i], texture);
+        }
+#ifdef DEBUG
+        for (i = 0; i < texture->baseTexture.levels; ++i)
+        {
+            Assert(!((IWineD3DSurfaceImpl*)texture->surfaces[i])->texture_name);
+        }
+#endif
         IWineD3DSurface_LoadLocation(texture->surfaces[0], SFLAG_INTEXTURE, NULL);
         if (!VBOXSHRC_IS_SHARED_OPENED(texture))

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/vboxsharedrc.h

@@ -25 +25 @@
 #define VBOXSHRC_SET_SHAREHANDLE(_o, _h) ((_o)->resource.sharerc_handle = (_h))
 #define VBOXSHRC_SET_INITIALIZED(_o) (VBOXSHRC_GET_SHAREFLAFS(_o) |= VBOXSHRC_F_INITIALIZED)
+#define VBOXSHRC_COPY_SHAREDATA(_oDst, _oSrc) do { \
+        VBOXSHRC_GET_SHAREFLAFS(_oDst) = VBOXSHRC_GET_SHAREFLAFS(_oSrc); \
+        VBOXSHRC_SET_SHAREHANDLE(_oDst, VBOXSHRC_GET_SHAREFLAFS(_oSrc)); \
+    } while (0)
+#define VBOXSHRC_SET_SHARED(_o) (VBOXSHRC_GET_SHAREFLAFS(_o) |= VBOXSHRC_F_SHARED)
+#define VBOXSHRC_SET_SHARED_OPENED(_o) (VBOXSHRC_GET_SHAREFLAFS(_o) |= VBOXSHRC_F_SHARED_OPENED)
 #define VBOXSHRC_IS_SHARED(_o) (!!(VBOXSHRC_GET_SHAREFLAFS(_o) & VBOXSHRC_F_SHARED))
 #define VBOXSHRC_IS_SHARED_OPENED(_o) (!!(VBOXSHRC_GET_SHAREFLAFS(_o) & VBOXSHRC_F_SHARED_OPENED))