Changeset 53519 in vbox for trunk

Timestamp:

Dec 12, 2014 10:34:36 AM (10 years ago)

Author:

vboxsync

Message:

Additions/WINNT: fix texture format mismatch in WDDM driver.

Location:

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

Files:

• common/wddm/VBoxMPIf.h (modified) (2 diffs)
• disp/wddm/VBoxDispD3DIf.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/common/wddm/VBoxMPIf.h

@@ -548 +548 @@
             return 32;
         case D3DDDIFMT_A16B16G16R16:
-        case D3DDDIFMT_A16B16G16R16F:
+// Floating-point formats are not implemented in Chromium.
+//        case D3DDDIFMT_A16B16G16R16F:
             return 64;
         case D3DDDIFMT_A8P8:
@@ -598 +599 @@
         case D3DDDIFMT_R16F:
             return 16;
+        case D3DDDIFMT_YUY2: /* 4 bytes per 2 pixels. */
+            return 16;
         default:
             AssertBreakpoint();

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

@@ -384 +384 @@
         FORMATOP_VERTEXTEXTURE, 0, 0, 0},
 
-    {D3DDDIFMT_A16B16G16R16F,
-        FORMATOP_TEXTURE|FORMATOP_VOLUMETEXTURE|FORMATOP_CUBETEXTURE|FORMATOP_OFFSCREEN_RENDERTARGET|
-        FORMATOP_SAME_FORMAT_RENDERTARGET|
-        0|
-        FORMATOP_OFFSCREENPLAIN|
-        0|
-        FORMATOP_VERTEXTEXTURE, 0, 0, 0},
-
-    {D3DDDIFMT_A32B32G32R32F,
-        FORMATOP_TEXTURE|FORMATOP_VOLUMETEXTURE|FORMATOP_CUBETEXTURE|FORMATOP_OFFSCREEN_RENDERTARGET|
-        FORMATOP_SAME_FORMAT_RENDERTARGET|
-        0|
-        FORMATOP_OFFSCREENPLAIN|
-        0|
-        FORMATOP_VERTEXTEXTURE, 0, 0, 0},
+// Floating-point formats are not implemented in Chromium.
+//    {D3DDDIFMT_A16B16G16R16F,
+//        FORMATOP_TEXTURE|FORMATOP_VOLUMETEXTURE|FORMATOP_CUBETEXTURE|FORMATOP_OFFSCREEN_RENDERTARGET|
+//        FORMATOP_SAME_FORMAT_RENDERTARGET|
+//        0|
+//        FORMATOP_OFFSCREENPLAIN|
+//        0|
+//        FORMATOP_VERTEXTEXTURE, 0, 0, 0},
+//
+//    {D3DDDIFMT_A32B32G32R32F,
+//        FORMATOP_TEXTURE|FORMATOP_VOLUMETEXTURE|FORMATOP_CUBETEXTURE|FORMATOP_OFFSCREEN_RENDERTARGET|
+//        FORMATOP_SAME_FORMAT_RENDERTARGET|
+//        0|
+//        FORMATOP_OFFSCREENPLAIN|
+//        0|
+//        FORMATOP_VERTEXTEXTURE, 0, 0, 0},
 
     {D3DDDIFMT_G16R16,