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

Timestamp:

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

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/device.c (modified) (7 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/device.c

@@ -935 +935 @@
 }
 
-#ifdef VBOXWDDM
-HRESULT VBoxWineExD3DDev9CreateSurface(LPDIRECT3DDEVICE9EX iface, UINT Width, UINT Height,
+static HRESULT IDirect3DDevice9Impl_CreateSurface(LPDIRECT3DDEVICE9EX iface, UINT Width, UINT Height,
         D3DFORMAT Format, BOOL Lockable, BOOL Discard, UINT Level, IDirect3DSurface9 **ppSurface,
         UINT Usage, D3DPOOL Pool, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality
+#ifdef VBOXWDDM
         , HANDLE *shared_handle
         , void *pvClientMem
+#endif
         )
 {
@@ -960 +961 @@
 
     hr = surface_init(object, This, Width, Height, Format, Lockable, Discard,
-            Level, Usage, Pool, MultiSample, MultisampleQuality,
-            shared_handle, pvClientMem);
+            Level, Usage, Pool, MultiSample, MultisampleQuality
+#ifdef VBOXWDDM
+            , shared_handle
+            , pvClientMem
+#endif
+            );
     if (FAILED(hr))
     {
@@ -973 +978 @@
 
     return D3D_OK;
-}
-#endif
-static HRESULT IDirect3DDevice9Impl_CreateSurface(LPDIRECT3DDEVICE9EX iface, UINT Width, UINT Height,
-        D3DFORMAT Format, BOOL Lockable, BOOL Discard, UINT Level, IDirect3DSurface9 **ppSurface,
-        UINT Usage, D3DPOOL Pool, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality)
-{
-#ifdef VBOXWDDM
-    return VBoxWineExD3DDev9CreateSurface(iface, Width, Height, Format, Lockable, Discard, Level, ppSurface,
-            Usage, Pool, MultiSample, MultisampleQuality, NULL, NULL);
-#else
-    IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;
-    IDirect3DSurface9Impl *object;
-    HRESULT hr;
-
-    TRACE("iface %p, width %u, height %u, format %#x, lockable %#x, discard %#x, level %u, surface %p.\n"
-            "usage %#x, pool %#x, multisample_type %#x, multisample_quality %u.\n",
-            iface, Width, Height, Format, Lockable, Discard, Level, ppSurface,
-            Usage, Pool, MultiSample, MultisampleQuality);
-
-    object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DSurface9Impl));
-    if (!object)
-    {
-        FIXME("Failed to allocate surface memory.\n");
-        return D3DERR_OUTOFVIDEOMEMORY;
-    }
-
-    hr = surface_init(object, This, Width, Height, Format, Lockable, Discard,
-            Level, Usage, Pool, MultiSample, MultisampleQuality);
-    if (FAILED(hr))
-    {
-        WARN("Failed to initialize surface, hr %#x.\n", hr);
-        HeapFree(GetProcessHeap(), 0, object);
-        return hr;
-    }
-
-    TRACE("Created surface %p.\n", object);
-    *ppSurface = (IDirect3DSurface9 *)object;
-
-    return D3D_OK;
-#endif
 }
 
@@ -1027 +992 @@
 
     hr = IDirect3DDevice9Impl_CreateSurface(iface, Width, Height, Format, Lockable, FALSE /* Discard */,
-            0 /* Level */, ppSurface, D3DUSAGE_RENDERTARGET, D3DPOOL_DEFAULT, MultiSample, MultisampleQuality);
+            0 /* Level */, ppSurface, D3DUSAGE_RENDERTARGET, D3DPOOL_DEFAULT, MultiSample, MultisampleQuality
+#ifdef VBOXWDDM
+            , pSharedHandle
+            , NULL
+#endif
+            );
 
     return hr;
@@ -1044 +1014 @@
 
     hr = IDirect3DDevice9Impl_CreateSurface(iface, Width, Height, Format, TRUE /* Lockable */, Discard,
-            0 /* Level */, ppSurface, D3DUSAGE_DEPTHSTENCIL, D3DPOOL_DEFAULT, MultiSample, MultisampleQuality);
+            0 /* Level */, ppSurface, D3DUSAGE_DEPTHSTENCIL, D3DPOOL_DEFAULT, MultiSample, MultisampleQuality
+#ifdef VBOXWDDM
+            , pSharedHandle
+            , NULL
+#endif
+            );
 
     return hr;
@@ -1179 +1154 @@
     hr = IDirect3DDevice9Impl_CreateSurface(iface, Width, Height, Format, TRUE /* Lockable */, FALSE /* Discard */,
             0 /* Level */, ppSurface, 0 /* Usage (undefined/none) */, (WINED3DPOOL)Pool, D3DMULTISAMPLE_NONE,
-            0 /* MultisampleQuality */);
+            0 /* MultisampleQuality */
+#ifdef VBOXWDDM
+            , pSharedHandle
+            , NULL
+#endif
+            );
 
     return hr;
@@ -2756 +2736 @@
         lockable = FALSE;
 
-#ifdef VBOXWDDM
-    hr = VBoxWineExD3DDev9CreateSurface((IDirect3DDevice9Ex *)This, width, height,
-            d3dformat_from_wined3dformat(format), lockable, FALSE /* Discard */, level,
-            (IDirect3DSurface9 **)&d3d_surface, usage, pool, D3DMULTISAMPLE_NONE, 0 /* MultisampleQuality */
-            , shared_handle
-            , pvClientMem
-            );
-
-#else
     hr = IDirect3DDevice9Impl_CreateSurface((IDirect3DDevice9Ex *)This, width, height,
             d3dformat_from_wined3dformat(format), lockable, FALSE /* Discard */, level,
             (IDirect3DSurface9 **)&d3d_surface, usage, pool, D3DMULTISAMPLE_NONE, 0 /* MultisampleQuality */
+#ifdef VBOXWDDM
+            , shared_handle
+            , pvClientMem
+#endif
             );
-#endif
     if (FAILED(hr))
     {