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

Timestamp:

Sep 17, 2010 8:18:39 PM (14 years ago)

Author:

vboxsync

Message:

wddm: VBOXWDDM->VBOX_WITH_WDDM

Location:

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

Files:

• d3d9_private.h (modified) (3 diffs)
• device.c (modified) (12 diffs)
• surface.c (modified) (2 diffs)
• texture.c (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/d3d9_private.h

@@ -48 +48 @@
 #include "wine/wined3d.h"
 
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
 #include "../vbox/VBoxWineEx.h"
 #endif
@@ -321 +321 @@
         UINT width, UINT height, D3DFORMAT format, BOOL lockable, BOOL discard, UINT level,
         DWORD usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
         , HANDLE *shared_handle
         , void *pvClientMem
@@ -438 +438 @@
 HRESULT texture_init(IDirect3DTexture9Impl *texture, IDirect3DDevice9Impl *device,
         UINT width, UINT height, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
         , HANDLE *shared_handle
         , void *pvClientMem

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

@@ -462 +462 @@
     return ret;
 }
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
 static HRESULT IDirect3DDevice9Impl_DoCreateAdditionalSwapChain(IDirect3DDevice9Ex *iface,
         D3DPRESENT_PARAMETERS *present_parameters, IDirect3DSwapChain9 **swapchain)
@@ -498 +498 @@
 }
 
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
 static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_CreateAdditionalSwapChain(IDirect3DDevice9Ex *iface,
         D3DPRESENT_PARAMETERS *present_parameters, IDirect3DSwapChain9 **swapchain)
@@ -746 +746 @@
 }
 
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
 //#pragma comment(linker, "/export:VBoxWineExD3DDev9Flush=_VBoxWineExD3DDev9Flush@4")
 
@@ -815 +815 @@
         D3DPOOL pool, IDirect3DTexture9 **texture, HANDLE *shared_handle)
 {
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
     return VBoxWineExD3DDev9CreateTexture(iface, width, height, levels, usage, format,
             pool, texture, shared_handle, NULL);
@@ -979 +979 @@
         D3DFORMAT Format, BOOL Lockable, BOOL Discard, UINT Level, IDirect3DSurface9 **ppSurface,
         UINT Usage, D3DPOOL Pool, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
         , HANDLE *shared_handle
         , void *pvClientMem
@@ -1003 +1003 @@
     hr = surface_init(object, This, Width, Height, Format, Lockable, Discard,
             Level, Usage, Pool, MultiSample, MultisampleQuality
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
             , shared_handle
             , pvClientMem
@@ -1034 +1034 @@
     hr = IDirect3DDevice9Impl_CreateSurface(iface, Width, Height, Format, Lockable, FALSE /* Discard */,
             0 /* Level */, ppSurface, D3DUSAGE_RENDERTARGET, D3DPOOL_DEFAULT, MultiSample, MultisampleQuality
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
             , pSharedHandle
             , NULL
@@ -1056 +1056 @@
     hr = IDirect3DDevice9Impl_CreateSurface(iface, Width, Height, Format, TRUE /* Lockable */, Discard,
             0 /* Level */, ppSurface, D3DUSAGE_DEPTHSTENCIL, D3DPOOL_DEFAULT, MultiSample, MultisampleQuality
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
             , pSharedHandle
             , NULL
@@ -1196 +1196 @@
             0 /* Level */, ppSurface, 0 /* Usage (undefined/none) */, (WINED3DPOOL)Pool, D3DMULTISAMPLE_NONE,
             0 /* MultisampleQuality */
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
             , pSharedHandle
             , NULL
@@ -2759 +2759 @@
         IUnknown *superior, UINT width, UINT height, WINED3DFORMAT format, DWORD usage,
         WINED3DPOOL pool, UINT level, WINED3DCUBEMAP_FACES face, IWineD3DSurface **surface
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
         , HANDLE *shared_handle
         , void *pvClientMem
@@ -2780 +2780 @@
             d3dformat_from_wined3dformat(format), lockable, FALSE /* Discard */, level,
             (IDirect3DSurface9 **)&d3d_surface, usage, pool, D3DMULTISAMPLE_NONE, 0 /* MultisampleQuality */
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
             , shared_handle
             , pvClientMem
@@ -2931 +2931 @@
     local_parameters.PresentationInterval = present_parameters->PresentationInterval;
 
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
     hr = IDirect3DDevice9Impl_DoCreateAdditionalSwapChain((IDirect3DDevice9Ex *)This,
             &local_parameters, (IDirect3DSwapChain9 **)&d3d_swapchain);

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

@@ -382 +382 @@
         UINT width, UINT height, D3DFORMAT format, BOOL lockable, BOOL discard, UINT level,
         DWORD usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
         , HANDLE *shared_handle
         , void *pvClientMem
@@ -417 +417 @@
 
     wined3d_mutex_lock();
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
     hr = IWineD3DDevice_CreateSurface(device->WineD3DDevice, width, height, wined3dformat_from_d3dformat(format),
             lockable, discard, level, &surface->wineD3DSurface, usage & WINED3DUSAGE_MASK, (WINED3DPOOL)pool,

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

@@ -399 +399 @@
 HRESULT texture_init(IDirect3DTexture9Impl *texture, IDirect3DDevice9Impl *device,
         UINT width, UINT height, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
         , HANDLE *shared_handle
         , void *pvClientMem
@@ -411 +411 @@
 
     wined3d_mutex_lock();
-#ifdef VBOXWDDM
+#ifdef VBOX_WITH_WDDM
     hr = IWineD3DDevice_CreateTexture(device->WineD3DDevice, width, height, levels,
             usage & WINED3DUSAGE_MASK, wined3dformat_from_d3dformat(format), pool,