Changeset 74521 in vbox

Timestamp:

Sep 28, 2018 12:24:15 PM (6 years ago)

Author:

vboxsync

Message:

WDDM: fixed misplaced ifdef, cleanup. bugref:8893

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

@@ -1150 +1150 @@
             if (Status == STATUS_SUCCESS)
             {
+                /* Figure out the host capabilities. Start with nothing. */
+                pDevExt->fTexPresentEnabled = FALSE;
+                pDevExt->fCmdVbvaEnabled = FALSE;
+                pDevExt->fComplexTopologiesEnabled = FALSE;
+
+                if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VBOX)
+                {
 #ifdef VBOX_WITH_CROGL
-                if (pDevExt->enmHwType == VBOXVIDEO_HWTYPE_VBOX)
-                {
                     if (pDevExt->f3DEnabled)
                     {
                         pDevExt->fTexPresentEnabled = !!(VBoxMpCrGetHostCaps() & CR_VBOX_CAP_TEX_PRESENT);
                         pDevExt->fCmdVbvaEnabled = !!(VBoxMpCrGetHostCaps() & CR_VBOX_CAP_CMDVBVA);
-# if 0
-                        pDevExt->fComplexTopologiesEnabled = pDevExt->fCmdVbvaEnabled;
-# else
-                        pDevExt->fComplexTopologiesEnabled = FALSE;
-# endif
+                        // Disabled, see xTracker #8244 pDevExt->fComplexTopologiesEnabled = pDevExt->fCmdVbvaEnabled;
                     }
-                    else
-                    {
-                        pDevExt->fTexPresentEnabled = FALSE;
-                        pDevExt->fCmdVbvaEnabled = FALSE;
-                        pDevExt->fComplexTopologiesEnabled = FALSE;
-                    }
+#else
+                    pDevExt->f3DEnabled = FALSE;
 #endif
                 }
@@ -1174 +1171 @@
                 {
                     pDevExt->f3DEnabled = FALSE;
-                    pDevExt->fTexPresentEnabled = FALSE;
-                    pDevExt->fCmdVbvaEnabled = FALSE;
-                    pDevExt->fComplexTopologiesEnabled = FALSE;
                 }