Changeset 55708 in vbox

Timestamp:

May 7, 2015 8:20:34 AM (10 years ago)

Author:

vboxsync

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

100115

Message:

Additions/Windows: remove old (unused for ages) Wine code

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)
• src/VBox/Additions/WINNT/Graphics/Makefile.kmk (modified) (1 diff)
• src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk (modified) (1 diff)
• src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxD3DIf.cpp (modified) (1 diff)
• src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3DIf.h (modified) (1 diff)
• src/VBox/Additions/WINNT/Graphics/Wine (deleted)

trunk/Config.kmk

@@ -635 +635 @@
  VBOX_WITH_CROGL = 1
 endif
-# enable new wined3d code
-VBOX_WITH_NEW_WINE = 1
 # Enable S3 support (requires libcurl)
 VBOX_WITH_S3 = 1

trunk/Makefile.kmk

@@ -571 +571 @@
         src/VBox/Additions/WINNT/Graphics/Video/mp/wddm \
         src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm \
-        src/VBox/Additions/WINNT/Graphics/Wine \
-        src/VBox/Additions/WINNT/Graphics/Wine/d3d8 \
-        src/VBox/Additions/WINNT/Graphics/Wine/d3d9 \
-        src/VBox/Additions/WINNT/Graphics/Wine/libWine \
-        src/VBox/Additions/WINNT/Graphics/Wine/switcher \
-        src/VBox/Additions/WINNT/Graphics/Wine/vbox \
-        src/VBox/Additions/WINNT/Graphics/Wine/vbox/libWineStub \
-        src/VBox/Additions/WINNT/Graphics/Wine/vbox/libWineStub/include \
-        src/VBox/Additions/WINNT/Graphics/Wine/vbox/libWineStub/include/backup \
-        src/VBox/Additions/WINNT/Graphics/Wine/vbox/libWineStub/include/wine \
-        src/VBox/Additions/WINNT/Graphics/Wine/wined3d \
+        src/VBox/Additions/WINNT/Graphics/Wine_new \
+        src/VBox/Additions/WINNT/Graphics/Wine_new/d3d8 \
+        src/VBox/Additions/WINNT/Graphics/Wine_new/d3d9 \
+        src/VBox/Additions/WINNT/Graphics/Wine_new/libWine \
+        src/VBox/Additions/WINNT/Graphics/Wine_new/switcher \
+        src/VBox/Additions/WINNT/Graphics/Wine_new/vbox \
+        src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/libWineStub \
+        src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/libWineStub/include \
+        src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/libWineStub/include/backup \
+        src/VBox/Additions/WINNT/Graphics/Wine_new/vbox/libWineStub/include/wine \
+        src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d \
         src/VBox/Additions/WINNT/Installer \
         src/VBox/Additions/WINNT/Installer/ISO \

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

@@ -22 +22 @@
 include $(PATH_SUB_CURRENT)/Video/Makefile.kmk
 ifdef VBOX_WITH_CROGL
- if !defined(VBOX_WITH_NEW_WINE)
-  include $(PATH_SUB_CURRENT)/Wine/Makefile.kmk
- else
-  include $(PATH_SUB_CURRENT)/Wine_new/Makefile.kmk
- endif
+ include $(PATH_SUB_CURRENT)/Wine_new/Makefile.kmk
 endif
 

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

@@ -105 +105 @@
  VBoxDispD3D_DEFS   += VBOX_WITH_CROGL
 endif
-ifdef VBOX_WITH_NEW_WINE
- VBoxDispD3D_DEFS   += VBOX_WITH_NEW_WINE
-endif
 VBoxDispD3D_INCS     = \
         ../../../include \

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxD3DIf.cpp

@@ -712 +712 @@
             hr = pDevice9If->CreateVertexBuffer(pAllocation->SurfDesc.width,
                     vboxDDI2D3DUsage(pRc->RcDesc.fFlags)
-#ifdef VBOX_WITH_NEW_WINE
                     & (~D3DUSAGE_DYNAMIC) /* <- avoid using dynamic to ensure wine does not switch do user buffer */
-#endif
                     ,
                     pRc->RcDesc.Fvf,

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3DIf.h

@@ -44 +44 @@
 #       undef  _interlockedbittestandreset64
 
-#ifdef VBOX_WITH_NEW_WINE
 #include "../../../Wine_new/vbox/VBoxWineEx.h"
-#else
-#include "../../../Wine/vbox/VBoxWineEx.h"
-#endif
 
 /* D3D functionality the VBOXDISPD3D provides */