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

Timestamp:

Aug 27, 2010 5:00:41 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: wine: shared resource handling fixes

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/surface.c (modified) (8 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;
@@ -497 +491 @@
 
 #if defined(DEBUG_misha) && defined (VBOXWDDM)
-    if (VBOXSHRC_IS_SHARED(This))
+    if (VBOXSHRC_IS_INITIALIZED(This))
     {
         Assert(0);
@@ -2025 +2019 @@
     ENTER_GL();
     glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE);
-    if(This->texture_name)
-    {
-        surface_bind_and_dirtify(This, FALSE);
-        glTexImage2D(This->texture_target, This->texture_level,
-                     GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
-    }
-    if(This->texture_name_srgb)
-    {
-        surface_bind_and_dirtify(This, TRUE);
-        glTexImage2D(This->texture_target, This->texture_level,
-                     GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
+#ifdef VBOXWDDM
+    if (!VBOXSHRC_IS_SHARED_OPENED(This))
+#endif
+    {
+        if(This->texture_name)
+        {
+            surface_bind_and_dirtify(This, FALSE);
+            glTexImage2D(This->texture_target, This->texture_level,
+                         GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
+        }
+        if(This->texture_name_srgb)
+        {
+            surface_bind_and_dirtify(This, TRUE);
+            glTexImage2D(This->texture_target, This->texture_level,
+                         GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
+        }
     }
     glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE);
@@ -4280 +4279 @@
         if(((This->Flags & SFLAG_INTEXTURE) && !(flag & SFLAG_INTEXTURE)) ||
            ((This->Flags & SFLAG_INSRGBTEX) && !(flag & SFLAG_INSRGBTEX))) {
-#ifdef VBOXWDDM
-            if (VBOXSHRC_IS_SHARED(This))
-            {
-                IWineD3DSurfaceImpl_LoadLocation(iface, SFLAG_INTEXTURE, NULL);
-            }
-            else
-#endif
             if (IWineD3DSurface_GetContainer(iface, &IID_IWineD3DBaseTexture, (void **)&texture) == WINED3D_OK) {
                 TRACE("Passing to container\n");
@@ -4293 +4285 @@
             }
         }
+
         This->Flags &= ~SFLAG_LOCATIONS;
         This->Flags |= flag;
@@ -4304 +4297 @@
     } else {
         if((This->Flags & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX)) && (flag & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX))) {
-#ifdef VBOXWDDM
-            if (VBOXSHRC_IS_SHARED(This))
-            {
-                IWineD3DSurfaceImpl_LoadLocation(iface, SFLAG_INTEXTURE, NULL);
-            }
-            else
-#endif
             if (IWineD3DSurface_GetContainer(iface, &IID_IWineD3DBaseTexture, (void **)&texture) == WINED3D_OK) {
                 TRACE("Passing to container\n");
@@ -4317 +4303 @@
             }
         }
+
         This->Flags &= ~flag;
     }
+
+#ifdef VBOXWDDM
+    if(VBOXSHRC_IS_INITIALIZED(This)) {
+        /* with the shared resource only texture can be considered valid
+         * to make sure changes done to the resource in the other device context are visible
+         * because the resource contents is shared via texture.
+         * This is why we ensure texture location is the one and only which is always valid */
+        if(!(This->Flags & SFLAG_INTEXTURE)) {
+            IWineD3DSurfaceImpl_LoadLocation(iface, SFLAG_INTEXTURE, NULL);
+        } else {
+            This->Flags &= ~SFLAG_LOCATIONS;
+            This->Flags |= SFLAG_INTEXTURE;
+        }
+    }
+#endif
 
     if(!(This->Flags & SFLAG_LOCATIONS)) {
@@ -4619 +4621 @@
     }
 
-    if(rect == NULL) {
-        This->Flags |= flag;
-    }
-
-    if (in_fbo && (This->Flags & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE))) {
-        /* With ORM_FBO, SFLAG_INTEXTURE and SFLAG_INDRAWABLE are the same for offscreen targets. */
-        This->Flags |= (SFLAG_INTEXTURE | SFLAG_INDRAWABLE);
+#ifdef VBOXWDDM
+    if (VBOXSHRC_IS_INITIALIZED(This))
+    {
+        /* with the shared resource only texture can be considered valid
+         * to make sure changes done to the resource in the other device context are visible
+         * because the resource contents is shared via texture.
+         * One can load and use other locations as needed,
+         * but they should be reloaded each time on each usage */
+        Assert(!!(This->Flags & SFLAG_INTEXTURE) || !!(flag & SFLAG_INTEXTURE));
+        This->Flags &= ~SFLAG_LOCATIONS;
+        This->Flags |= SFLAG_INTEXTURE;
+        /* @todo: SFLAG_INSRGBTEX ?? */
+//        if (in_fbo)
+//        {
+//            This->Flags |= SFLAG_INDRAWABLE;
+//        }
+    }
+    else
+#endif
+    {
+        if(rect == NULL) {
+            This->Flags |= flag;
+        }
+
+        if (in_fbo && (This->Flags & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE))) {
+            /* With ORM_FBO, SFLAG_INTEXTURE and SFLAG_INDRAWABLE are the same for offscreen targets. */
+            This->Flags |= (SFLAG_INTEXTURE | SFLAG_INDRAWABLE);
+        }
     }