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

Timestamp:

Aug 20, 2010 5:12:14 PM (14 years ago)

Author:

vboxsync

Message:

wine: basics for shared resource handling

File:

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

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

@@ -482 +482 @@
         return hr;
     }
+#ifdef VBOXWDDM
+    if (shared_handle && !*shared_handle)
+    {
+        *shared_handle = VBOXSHRC_GET_SHAREHANDLE(surface);
+    }
+#endif
 
     return hr;
@@ -521 +527 @@
     }
 
+#ifdef VBOXWDDM
+    if (VBOXSHRC_IS_SHARED(This))
+    {
+        VBOXSHRC_SET_SHAREHANDLE(This, new_name);
+    }
+#endif
     *name = new_name;
     surface_force_reload(iface);
@@ -979 +991 @@
 }
 
+#ifdef VBOXWDDM
+static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, DWORD flag, const RECT *rect);
+#endif
+
 /* Slightly inefficient way to handle multiple dirty rects but it works :) */
 void surface_add_dirty_rect(IWineD3DSurface *iface, const RECT *dirty_rect)
@@ -985 +1001 @@
     IWineD3DBaseTexture *baseTexture = NULL;
 
-    if (!(This->Flags & SFLAG_INSYSMEM) && (This->Flags & SFLAG_INTEXTURE))
-        IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL /* no partial locking for textures yet */);
-
-    IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, TRUE);
+#ifdef VBOXWDDM
+    if (VBOXSHRC_IS_SHARED(This))
+    {
+        if (!VBOXSHRC_IS_SHARED_OPENED(This))
+            IWineD3DSurfaceImpl_LoadLocation(iface, SFLAG_INTEXTURE, NULL);
+        else
+            This->Flags |= SFLAG_INTEXTURE;
+    }
+    else
+#endif
+    {
+        if (!(This->Flags & SFLAG_INSYSMEM) && (This->Flags & SFLAG_INTEXTURE))
+            IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL /* no partial locking for textures yet */);
+
+        IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, TRUE);
+    }
+
     if (dirty_rect)
     {
@@ -2601 +2630 @@
         {
             if (!*name) {
-                glGenTextures(1, name);
+#ifdef VBOXWDDM
+                if (VBOXSHRC_IS_SHARED_OPENED(This))
+                {
+                    *name = VBOXSHRC_GET_SHAREHANDLE(This);
+                }
+                else
+#endif
+                {
+                    glGenTextures(1, name);
+#ifdef VBOXWDDM
+                    if (VBOXSHRC_IS_SHARED(This))
+                    {
+                        VBOXSHRC_SET_SHAREHANDLE(This, *name);
+                    }
+#endif
+                }
                 checkGLcall("glGenTextures");
                 TRACE("Surface %p given name %d\n", This, *name);
@@ -4022 +4066 @@
     }
 
-    This->Flags |= SFLAG_INSYSMEM;
+#ifdef VBOXWDDM
+    if (!VBOXSHRC_IS_SHARED(This))
+#endif
+    {
+        This->Flags |= SFLAG_INSYSMEM;
+    }
 
     return WINED3D_OK;