Changeset 37216 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

May 26, 2011 8:50:49 AM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: fix google earth rendering

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Video/common/wddm/VBoxMPIf.h (modified) (1 diff)
• Video/disp/wddm/VBoxDispD3D.cpp (modified) (1 diff)
• Video/disp/wddm/VBoxDispDbg.cpp (modified) (1 diff)
• Video/disp/wddm/VBoxDispDbg.h (modified) (1 diff)
• Wine/libWine/debug.c (modified) (3 diffs)
• Wine/vbox/libWineStub/debug.c (modified) (3 diffs)
• Wine/wined3d/context.c (modified) (2 diffs)
• Wine/wined3d/swapchain.c (modified) (1 diff)
• Wine/wined3d/wined3d_gl.h (modified) (2 diffs)

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

@@ -458 +458 @@
         case D3DDDIFMT_S8_LOCKABLE:
             return 8;
+        case D3DDDIFMT_DXT1:
+            return 4;
+        case D3DDDIFMT_DXT2:
+        case D3DDDIFMT_DXT3:
+        case D3DDDIFMT_DXT4:
+        case D3DDDIFMT_DXT5:
+            return 8;
         default:
             AssertBreakpoint();

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

@@ -4951 +4951 @@
             PVBOXWDDMDISP_ALLOCATION pAllocation = &pRc->aAllocations[i];
             CONST D3DDDI_SURFACEINFO* pSurf = &pResource->pSurfList[i];
+
+            /*@fixme: Those formats are actually blocks of 4x4 pixels,
+             * for some reason we're getting pSurf->SysMemPitch as if took 4x1 column from this block,
+             * which leads us to having 4x times bigger pitch than actual line takes.
+             * Simply trying to read here provided pointer 
+             * at (byte*)pSurf->pSysMem + pSurf->pSurf->SysMemPitch*pSurf->Height - 1 causes access violation.
+             */
+            if (pResource->Format == D3DDDIFMT_DXT1
+                || pResource->Format == D3DDDIFMT_DXT2
+                || pResource->Format == D3DDDIFMT_DXT3
+                || pResource->Format == D3DDDIFMT_DXT4
+                || pResource->Format == D3DDDIFMT_DXT5)
+            {
+                *((UINT*)&pSurf->SysMemPitch) = pSurf->SysMemPitch >> 2;
+            }
+
             pAllocation->hAllocation = NULL;
             pAllocation->enmType = VBOXWDDM_ALLOC_TYPE_UMD_RC_GENERIC;

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

@@ -438 +438 @@
         case 0xe06d7363: /* <- ms compiler - generated exception related to C++ exception */
         case 0x000006d9: /* <- RPC exception, ignore */
+        case 0x406d1388: /* <- VS/WinDbg thread naming exception, ignore */
             break;
         default:

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

@@ -25 +25 @@
 /* generic debugging facilities & extra data checks */
 # define VBOXWDDMDISP_DEBUG
-# ifdef DEBUG_misha
+# if defined(DEBUG_misha) || defined(DEBUG_leo)
 /* for some reason when debugging with VirtualKD, user-mode DbgPrint's are discarded
  * the workaround so far is to pass the log info to the kernel driver and DbgPrint'ed from there,

trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/debug.c

@@ -44 +44 @@
 #define MAX_DEBUG_OPTIONS 256
 
-static unsigned char default_flags = (1 << __WINE_DBCL_ERR) | (1 << __WINE_DBCL_FIXME);
+static unsigned char default_flags = (1 << __WINE_DBCL_ERR) | (1 << __WINE_DBCL_FIXME) | (1 << __WINE_DBCL_WARN);
 static int nb_debug_options = -1;
 static struct __wine_debug_channel debug_options[MAX_DEBUG_OPTIONS];
@@ -393 +393 @@
 static int default_dbg_vprintf( const char *format, va_list args )
 {
-    return vfprintf( stderr, format, args );
+#ifdef DEBUG_leo
+    static FILE *output=NULL;
+    static int first_time = 1;
+
+    if (first_time)
+    {   
+        first_time = 0;
+        output = fopen( "winelog.txt", "w" );
+    }
+
+    if (output) vfprintf( output, format, args );
+#endif
+    return vfprintf( stdout, format, args );
 }
 
@@ -404 +416 @@
 
     if (cls < sizeof(debug_classes)/sizeof(debug_classes[0]))
-        ret += wine_dbg_printf( "%s:%s:%s ", debug_classes[cls], channel->name, func );
+        ret += wine_dbg_printf( "%s:[%#x]:%s:%s ", debug_classes[cls], GetCurrentThreadId(), channel->name, func );
     if (format)
         ret += funcs.dbg_vprintf( format, args );

trunk/src/VBox/Additions/WINNT/Graphics/Wine/vbox/libWineStub/debug.c

@@ -46 +46 @@
 #define MAX_DEBUG_OPTIONS 256
 
-static unsigned char default_flags = (1 << __WINE_DBCL_ERR) | (1 << __WINE_DBCL_FIXME);
+static unsigned char default_flags = (1 << __WINE_DBCL_ERR) | (1 << __WINE_DBCL_FIXME) | (1 << __WINE_DBCL_WARN);
 static int nb_debug_options = -1;
 static struct __wine_debug_channel debug_options[MAX_DEBUG_OPTIONS];
@@ -395 +395 @@
 static int default_dbg_vprintf( const char *format, va_list args )
 {
-    return vfprintf( stderr, format, args );
+#ifdef DEBUG_leo
+    static FILE *output=NULL;
+    static int first_time = 1;
+
+    if (first_time)
+    {   
+        first_time = 0;
+        output = fopen( "winelog.txt", "w" );
+    }
+
+    if (output) vfprintf( output, format, args );
+#endif
+    return vfprintf( stdout, format, args );
 }
 
@@ -406 +418 @@
 
     if (cls < sizeof(debug_classes)/sizeof(debug_classes[0]))
-        ret += wine_dbg_printf( "%s:%s:%s ", debug_classes[cls], channel->name, func );
+        ret += wine_dbg_printf( "%s:[%#x]:%s:%s ", debug_classes[cls], GetCurrentThreadId(), channel->name, func );
     if (format)
         ret += funcs.dbg_vprintf( format, args );

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/context.c

@@ -734 +734 @@
 }
 
-static void context_update_window(struct wined3d_context *context
+void context_update_window(struct wined3d_context *context
 #ifdef VBOX_WITH_WDDM
         , IWineD3DSwapChainImpl *swapchain
@@ -761 +761 @@
 
 #ifdef VBOX_WITH_WDDM
+# ifdef DEBUG
+    {
+        HWND wnd = WindowFromDC(swapchain->hDC);
+        if (wnd != swapchain->win_handle)
+        {
+            ERR("Lost swapchain dc %p for window %p.\n", swapchain->hDC, swapchain->win_handle);
+            swapchain->hDC = GetDC(swapchain->win_handle);
+            Assert(swapchain->hDC && (WindowFromDC(swapchain->hDC)==swapchain->win_handle));
+        }
+    }
+# endif
+
     context->win_handle = swapchain->win_handle;
     context->currentSwapchain = swapchain;

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/swapchain.c

@@ -369 +369 @@
     if (This->num_contexts > 1) wglFinish();
 #endif
+
+#if defined(VBOX_WITH_WDDM) && defined(DEBUG)
+    {
+        HWND wnd = WindowFromDC(context->hdc);
+        Assert(context->currentSwapchain && context->win_handle==swapchain->win_handle);
+        Assert(wnd==context->win_handle);
+        Assert(IsWindow(context->win_handle));
+
+        if (wnd != context->win_handle)
+        {
+            extern void context_update_window(struct wined3d_context *context, IWineD3DSwapChainImpl *swapchain);
+
+            context->valid = 0;
+            Assert(context->currentSwapchain == This);
+            context_update_window(context, context->currentSwapchain);
+        }
+    }
+#endif
+
+#ifdef VBOX_WITH_WDDM
+    /* We're directly using wglMakeCurrent calls skipping GDI layer, which causes GDI SwapBuffers to fail trying to
+     * call glFinish, which doesn't have any context set. So we use wglSwapLayerBuffers directly as well.
+     */
+    pwglSwapLayerBuffers(context->hdc, WGL_SWAP_MAIN_PLANE);
+#else
     SwapBuffers(context->hdc); /* TODO: cycle through the swapchain buffers */
+#endif
 
     TRACE("SwapBuffers called, Starting new frame\n");

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_gl.h

@@ -1380 +1380 @@
 PROC (WINAPI *pwglGetProcAddress)(LPCSTR) DECLSPEC_HIDDEN;
 BOOL (WINAPI *pwglMakeCurrent)(HDC, HGLRC) DECLSPEC_HIDDEN;
+BOOL (WINAPI *pwglSwapLayerBuffers)(HDC) DECLSPEC_HIDDEN;
 BOOL (WINAPI *pwglShareLists)(HGLRC, HGLRC) DECLSPEC_HIDDEN;
 
@@ -1726 +1727 @@
     USE_WGL_FUNC(wglGetProcAddress) \
     USE_WGL_FUNC(wglMakeCurrent) \
-    USE_WGL_FUNC(wglShareLists)
+    USE_WGL_FUNC(wglShareLists) \
+    USE_WGL_FUNC(wglSwapLayerBuffers)
 
 /* OpenGL extensions. */