Changeset 39602 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine

Timestamp:

Dec 14, 2011 11:12:17 AM (13 years ago)

Author:

vboxsync

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

75376

Message:

wine/XPDM: 1. Additional swapchain creation fixes 2. De-libwine'ize wined3d 3. Single context per swapchain 4. wine & crOgl current context sync fixes 5. Proper Get/ReleaseDC handling

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wined3d.h (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wined3d.h

@@ -7395 +7395 @@
         ) = 0;
 
+    virtual HRESULT STDMETHODCALLTYPE AddSwapChain(
+        IWineD3DSwapChain *swapchain) = 0;
+
+    virtual HRESULT STDMETHODCALLTYPE RemoveSwapChain(
+        IWineD3DSwapChain *swapchain) = 0;
+
 #ifdef VBOX_WITH_WDDM
     virtual HRESULT STDMETHODCALLTYPE Flush(
         ) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE AddSwapChain(
-        IWineD3DSwapChain *swapchain) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE RemoveSwapChain(
-        IWineD3DSwapChain *swapchain) = 0;
 #endif
 };
@@ -8170 +8170 @@
         IWineD3DDevice* This);
 
+    HRESULT (STDMETHODCALLTYPE *AddSwapChain)(
+        IWineD3DDevice* This,
+        IWineD3DSwapChain *swapchain);
+
+    HRESULT (STDMETHODCALLTYPE *RemoveSwapChain)(
+        IWineD3DDevice* This,
+        IWineD3DSwapChain *swapchain);
+
 #ifdef VBOX_WITH_WDDM
     HRESULT (STDMETHODCALLTYPE *Flush)(
         IWineD3DDevice* This);
-
-    HRESULT (STDMETHODCALLTYPE *AddSwapChain)(
-        IWineD3DDevice* This,
-        IWineD3DSwapChain *swapchain);
-
-    HRESULT (STDMETHODCALLTYPE *RemoveSwapChain)(
-        IWineD3DDevice* This,
-        IWineD3DSwapChain *swapchain);
 #endif
 
@@ -8342 +8342 @@
 #define IWineD3DDevice_AcquireFocusWindow(This,window) (This)->lpVtbl->AcquireFocusWindow(This,window)
 #define IWineD3DDevice_ReleaseFocusWindow(This) (This)->lpVtbl->ReleaseFocusWindow(This)
+#define IWineD3DDevice_AddSwapChain(This,swapchain) (This)->lpVtbl->AddSwapChain(This,swapchain)
+#define IWineD3DDevice_RemoveSwapChain(This,swapchain) (This)->lpVtbl->RemoveSwapChain(This,swapchain)
 #ifdef VBOX_WITH_WDDM
 #define IWineD3DDevice_Flush(This) (This)->lpVtbl->Flush(This)
-#define IWineD3DDevice_AddSwapChain(This,swapchain) (This)->lpVtbl->AddSwapChain(This,swapchain)
-#define IWineD3DDevice_RemoveSwapChain(This,swapchain) (This)->lpVtbl->RemoveSwapChain(This,swapchain)
 #endif
 #endif