Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxD3DIf.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxD3DIf.h	(revision 79738)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxD3DIf.h	(revision 79739)
@@ -141,9 +141,5 @@
 
 #define VBOXDISPMODE_IS_3D(_p) ((_p)->f3D)
-#ifdef VBOXDISP_EARLYCREATEDEVICE
-#define VBOXDISP_D3DEV(_p) (_p)->pDevice9If
-#else
 #define VBOXDISP_D3DEV(_p) VBoxD3DIfDeviceGet(_p)
-#endif
 
 #endif /* !GA_INCLUDED_SRC_WINNT_Graphics_Video_disp_wddm_VBoxD3DIf_h */
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.cpp
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.cpp	(revision 79738)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.cpp	(revision 79739)
@@ -6377,44 +6377,4 @@
                     if (hr == S_OK)
                     {
-#ifdef VBOXDISP_EARLYCREATEDEVICE
-                        PVBOXWDDMDISP_RESOURCE pRc = vboxResourceAlloc(2);
-                        Assert(pRc);
-                        if (pRc)
-                        {
-                            D3DPRESENT_PARAMETERS params;
-                            memset(&params, 0, sizeof (params));
-    //                        params.BackBufferWidth = 640;
-    //                        params.BackBufferHeight = 480;
-                            params.BackBufferWidth = 0x400;
-                            params.BackBufferHeight = 0x300;
-                            params.BackBufferFormat = D3DFMT_A8R8G8B8;
-    //                        params.BackBufferCount = 0;
-                            params.BackBufferCount = 1;
-                            params.MultiSampleType = D3DMULTISAMPLE_NONE;
-                            params.SwapEffect = D3DSWAPEFFECT_DISCARD;
-        //                    params.hDeviceWindow = hWnd;
-                                        /** @todo it seems there should be a way to detect this correctly since
-                                         * our vboxWddmDDevSetDisplayMode will be called in case we are using full-screen */
-                            params.Windowed = TRUE;
-                            //            params.EnableAutoDepthStencil = FALSE;
-                            //            params.AutoDepthStencilFormat = D3DFMT_UNKNOWN;
-                            //            params.Flags;
-                            //            params.FullScreen_RefreshRateInHz;
-                            //            params.FullScreen_PresentationInterval;
-
-                            hr = vboxWddmD3DDeviceCreate(pDevice, 0, pRc, &params, TRUE /*BOOL bLockable*/);
-                            Assert(hr == S_OK);
-                            if (hr == S_OK)
-                                break;
-                            vboxResourceFree(pRc);
-                        }
-                        else
-                        {
-                            hr = E_OUTOFMEMORY;
-                        }
-
-                        HRESULT hr2 = vboxDispCmCtxDestroy(pDevice, &pDevice->DefaultContext);
-                        Assert(hr2 == S_OK); NOREF(hr2);
-#else
 //# define VBOXDISP_TEST_SWAPCHAIN
 # ifdef VBOXDISP_TEST_SWAPCHAIN
@@ -6422,5 +6382,4 @@
 # endif
                         break;
-#endif
                     }
                 }