Changeset 80487 in vbox for trunk/src/VBox/Additions

Timestamp:

Aug 28, 2019 8:34:19 PM (6 years ago)

Author:

vboxsync

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

132980

Message:

WDDM: removed obsolete VBOX_WITH_CROGL define. bugref:9529

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video

Files:

• disp/Makefile.kmk (modified) (2 diffs)
• disp/xpdm/VBoxDispDriver.cpp (modified) (2 diffs)
• mp/Makefile.kmk (modified) (1 diff)
• mp/wddm/VBoxMPTypes.h (modified) (1 diff)
• mp/wddm/VBoxMPVdma.h (modified) (1 diff)
• mp/wddm/VBoxMPWddm.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk

@@ -39 +39 @@
 ifdef VBOX_WITH_VIDEOHWACCEL
  VBoxDisp_DEFS        += VBOX_WITH_VIDEOHWACCEL
-endif
-ifdef VBOX_WITH_CROGL
- VBoxDisp_DEFS        += VBOX_WITH_CROGL
 endif
 #VBoxDisp_DEFS         += VBOX_VBVA_ADJUST_RECT
@@ -110 +107 @@
         ../../../include \
         .. \
-        $(VBOX_PATH_CROGL_INCLUDE) \
         $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared \
         $(VBOX_GRAPHICS_INCS)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispDriver.cpp

@@ -110 +110 @@
 };
 
-#ifdef VBOX_WITH_CROGL
-typedef struct
-{
-    DWORD dwVersion;
-    DWORD dwDriverVersion;
-    WCHAR szDriverName[256];
-} OPENGL_INFO, *POPENGL_INFO;
-#endif
-
 RT_C_DECLS_BEGIN
 ULONG __cdecl DbgPrint(PCH pszFormat, ...)
@@ -883 +874 @@
     switch (iEsc)
     {
-#ifdef VBOX_WITH_CROGL
-        case OPENGL_GETINFO:
-        {
-            if (pvOut && cjOut >= sizeof(OPENGL_INFO))
-            {
-                POPENGL_INFO pInfo = (POPENGL_INFO)pvOut;
-
-                pInfo->dwVersion        = 2;
-                pInfo->dwDriverVersion  = 1;
-                pInfo->szDriverName[0]  = 'V';
-                pInfo->szDriverName[1]  = 'B';
-                pInfo->szDriverName[2]  = 'o';
-                pInfo->szDriverName[3]  = 'x';
-                pInfo->szDriverName[4]  = 'O';
-                pInfo->szDriverName[5]  = 'G';
-                pInfo->szDriverName[6]  = 'L';
-                pInfo->szDriverName[7]  = 0;
-
-                LOG(("OPENGL_GETINFO ok"));
-                return cjOut;
-            }
-            else
-            {
-                WARN(("OPENGL_GETINFO invalid parms"));
-                return 0;
-            }
-        }
-        case QUERYESCSUPPORT:
-        {
-            if (pvIn && cjIn == sizeof(DWORD))
-            {
-                DWORD nEscapeQuery = *(DWORD *)pvIn;
-
-                if (nEscapeQuery==OPENGL_GETINFO)
-                {
-                    LOG(("QUERYESCSUPPORT OPENGL_GETINFO"));
-                    return 1;
-                }
-                else
-                {
-                    LOG(("QUERYESCSUPPORT unsupported query %d", nEscapeQuery));
-                    return 0;
-                }
-            }
-            else
-            {
-                WARN(("QUERYESCSUPPORT invalid parms"));
-                return 0;
-            }
-        }
-#endif
         case VBOXESC_ISVRDPACTIVE:
         {

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk

@@ -123 +123 @@
         $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp
 
- if defined(VBOX_WITH_CROGL)
-   VBoxWddm_DEFS          += VBOX_WITH_CROGL
- endif
  ifdef VBOXWDDM_WITH_VBVA
   VBoxWddm_SOURCES        += \

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPTypes.h

@@ -23 +23 @@
 
 typedef struct _VBOXMP_DEVEXT *PVBOXMP_DEVEXT;
-#ifdef VBOX_WITH_CROGL
-typedef struct VBOXWDDM_SWAPCHAIN *PVBOXWDDM_SWAPCHAIN;
-#endif
 typedef struct VBOXWDDM_CONTEXT *PVBOXWDDM_CONTEXT;
 typedef struct VBOXWDDM_ALLOCATION *PVBOXWDDM_ALLOCATION;

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVdma.h

@@ -157 +157 @@
 
 #endif
-#ifdef VBOX_WITH_CROGL
-NTSTATUS vboxVdmaPostHideSwapchain(PVBOXWDDM_SWAPCHAIN pSwapchain);
-#endif
 
 NTSTATUS vboxVdmaGgDmaBltPerform(PVBOXMP_DEVEXT pDevExt, struct VBOXWDDM_ALLOC_DATA * pSrcAlloc, RECT* pSrcRect,

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

@@ -896 +896 @@
     }
 }
-#ifdef VBOX_WITH_CROGL
+
 static NTSTATUS vboxWddmSetupDisplaysNew(PVBOXMP_DEVEXT pDevExt)
 {
@@ -919 +919 @@
     return STATUS_SUCCESS;
 }
-#endif
+
 static NTSTATUS vboxWddmSetupDisplays(PVBOXMP_DEVEXT pDevExt)
 {
-#ifdef VBOX_WITH_CROGL
     if (pDevExt->fCmdVbvaEnabled)
     {
@@ -930 +929 @@
         return Status;
     }
-#endif
 
     vboxWddmSetupDisplaysLegacy(pDevExt);
@@ -1643 +1641 @@
     vboxVtListDetach2List(&pDevExt->VhwaCmdList, &pdc->data.VhwaCmdList);
 #endif
-#ifdef VBOX_WITH_CROGL
     if (!pDevExt->fCmdVbvaEnabled)
-#endif
     {
         vboxVdmaDdiCmdGetCompletedListIsr(pDevExt, &pdc->data.CompletedDdiCmdQueue);
@@ -2810 +2806 @@
     PVBOXWDDM_CALL_ISR pdc = (PVBOXWDDM_CALL_ISR)Context;
     PVBOXMP_DEVEXT pDevExt = pdc->pDevExt;
-#ifdef VBOX_WITH_CROGL
     if (pDevExt->fCmdVbvaEnabled)
     {
@@ -2816 +2811 @@
         return FALSE;
     }
-#endif
     return DxgkDdiInterruptRoutineLegacy(pDevExt, pdc->MessageNumber);
 }