Changeset 42120 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video

Timestamp:

Jul 11, 2012 8:17:59 PM (13 years ago)

Author:

vboxsync

Message:

wddm: win8 driver .inf file fixes, better device description, etc.

Location:

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

Files:

• Makefile.kmk (modified) (1 diff)
• mp/wddm/VBoxMPWddm.cpp (modified) (3 diffs)
• mp/wddm/VBoxVideoW8.inf (modified) (3 diffs)
• mp/wddm/VBoxVideoWddm.inf (modified) (1 diff)

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

@@ -309 +309 @@
 VBOXWDDMW8_EDIT_INF_DISPD3D_FN_ARG = $(if $(VBOXWDDMW8_WITH_DISPD3D),-e 's/^;dispd3d  *//', -e '/^;dispd3d /d')
 VBOXWDDMW8_EDIT_INF_GL_FN_ARG      = $(if $(VBOXWDDMW8_WITH_GL),-e 's/^;gl  *//', -e '/^;gl /d')
+VBOXWDDMW8_EDIT_INF_ICD_FN_ARG      = $(if $(VBOXWDDMW8_WITH_ICD),-e 's/^;icd  *//', -e '/^;icd /d')
 
 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.inf: $(PATH_SUB_CURRENT)/mp/wddm/VBoxVideoW8.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
         $(call MSG_GENERATE,VBoxVideoW8-inf,$@,$<)
-        $(call VBOX_EDIT_INF_FN,$<,$@ $(VBOXWDDMW8_EDIT_INF_DISPD3D_FN_ARG) $(VBOXWDDMW8_EDIT_INF_GL_FN_ARG))
+        $(call VBOX_EDIT_INF_FN,$<,$@ $(VBOXWDDMW8_EDIT_INF_DISPD3D_FN_ARG) $(VBOXWDDMW8_EDIT_INF_GL_FN_ARG) $(VBOXWDDMW8_EDIT_INF_ICD_FN_ARG))
 
 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.sys: $$(VBoxVideoW8_1_TARGET) | $$(dir $$@)

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

@@ -6533 +6533 @@
 #endif
 
-    LOGREL(("Built %s %s", __DATE__, __TIME__));
+#ifdef VBOX_WDDM_WIN8
+    LOGREL(("VBox WDDM Driver for Windows 8; Built %s %s", __DATE__, __TIME__));
+#else
+    LOGREL(("VBox WDDM Driver for Windows Vista and 7; Built %s %s", __DATE__, __TIME__));
+#endif
 
     if (! ARGUMENT_PRESENT(DriverObject) ||
@@ -6587 +6591 @@
         if (f3DCheckRequired)
         {
-            LOG(("3D is required, doing the 3D check.."));
+            LOG(("3D check is required, doing the 3D check.."));
             if (!VBoxMpCrCtlConIs3DSupported())
             {
@@ -6600 +6604 @@
         }
 
-#if defined(DEBUG_misha) && defined(VBOX_WDDM_WIN8)
+#if 0 //defined(DEBUG_misha) && defined(VBOX_WDDM_WIN8)
         /* force g_VBoxDisplayOnly for debugging purposes */
         LOGREL(("Current win8 video driver only supports display-only mode no matter whether or not host 3D is enabled!"));

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxVideoW8.inf

@@ -31 +31 @@
 
 [Manufacturer]
-;x86   %ORACLE%=Model, NTx86.6.0
-;amd64 %ORACLE%=Model, NTamd64.6.0
+;x86   %ORACLE%=Model, NTx86.6.2
+;amd64 %ORACLE%=Model, NTamd64.6.2
 
-;amd64 [Model.NTamd64.6.0]
-;x86   [Model.NTx86.6.0]
+;amd64 [Model.NTamd64.6.2]
+;x86   [Model.NTx86.6.2]
 %VBoxVideo.SvcDesc% = VBoxVideo, PCI\VEN_80EE&DEV_BEEF
 
@@ -82 +82 @@
 ;dispd3d HKR,, UserModeDriverName,    %REG_MULTI_SZ%, VBoxDispD3D.dll
 ;amd64 ;dispd3d HKR,, UserModeDriverNameWow,    %REG_MULTI_SZ%, VBoxDispD3D-x86.dll
-;gl HKR,, OpenGLDriverName,    %REG_MULTI_SZ%, VBoxOGL.dll
-;amd64 ;gl HKR,, OpenGLDriverNameWoW, %REG_MULTI_SZ%, VBoxOGL-x86.dll
-;gl        HKR,, OpenGLFlags,         %REG_DWORD%,    0x00000001
-;amd64 ;gl HKR,, OpenGLFlagsWoW,      %REG_DWORD%,    0x00000001
-;gl        HKR,, OpenGLVersion,       %REG_DWORD%,    0x00000001
-;amd64 ;gl HKR,, OpenGLVersionWoW,    %REG_DWORD%,    0x00000001
+;icd HKR,, OpenGLDriverName,    %REG_MULTI_SZ%, VBoxOGL.dll
+;amd64 ;icd HKR,, OpenGLDriverNameWoW, %REG_MULTI_SZ%, VBoxOGL-x86.dll
+;icd        HKR,, OpenGLFlags,         %REG_DWORD%,    0x00000001
+;amd64 ;icd HKR,, OpenGLFlagsWoW,      %REG_DWORD%,    0x00000001
+;icd        HKR,, OpenGLVersion,       %REG_DWORD%,    0x00000001
+;amd64 ;icd HKR,, OpenGLVersionWoW,    %REG_DWORD%,    0x00000001
 HKR,, VgaCompatible, %REG_DWORD%, 0
 
@@ -145 +145 @@
 ORACLE = "Oracle Corporation"
 VBoxVideo.Disk = "VirtualBox Video Driver Disk"
-VBoxVideo.SvcDesc = "VirtualBox Graphics Adapter WDDM 1.2"
+VBoxVideo.SvcDesc = "VirtualBox Graphics Adapter for Windows 8"

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxVideoWddm.inf

@@ -145 +145 @@
 ORACLE = "Oracle Corporation"
 VBoxVideo.Disk = "VirtualBox Video Driver Disk"
-VBoxVideo.SvcDesc = "VirtualBox Graphics Adapter (Microsoft Corporation - WDDM)"
+VBoxVideo.SvcDesc = "VirtualBox Graphics Adapter for Windows Vista and 7"