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

Timestamp:

Sep 6, 2011 3:04:56 PM (13 years ago)

Author:

vboxsync

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

73872

Message:

Wddm/3D: fix incorrect window border blurs under aero on ati cards

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Video/disp/wddm/VBoxDispD3D.cpp (modified) (2 diffs)
• Video/mp/wddm/VBoxMPWddm.cpp (modified) (1 diff)
• Wine/wined3d/surface.c (modified) (1 diff)

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

@@ -5923 +5923 @@
                 VBOXVDBG_BREAK_SHARED(pSrcRc);
                 VBOXVDBG_BREAK_SHARED(pDstRc);
-                if (   pSrcAlloc->SurfDesc.width == 658 && pSrcAlloc->SurfDesc.height == 493
-                    && pData->SrcRect.left == 0 && pData->SrcRect.top == 0
-                    && pData->SrcRect.right == 658 && pData->SrcRect.bottom == 493
-                    && pDstAlloc->SurfDesc.width == 756 && pDstAlloc->SurfDesc.height == 493
-                    && pData->DstRect.left == 0 && pData->DstRect.top == 0
-                    && pData->DstRect.right == 658 && pData->DstRect.bottom == 493)
-                {
-                    VBOXVDBG_DUMP_BLT_ENTER(pSrcAlloc, pSrcSurfIf, &pData->SrcRect, pDstAlloc, pDstSurfIf, &pData->DstRect);
-                }
+                VBOXVDBG_DUMP_BLT_ENTER(pSrcAlloc, pSrcSurfIf, &pData->SrcRect, pDstAlloc, pDstSurfIf, &pData->DstRect);
 
                 /* we support only Point & Linear, we ignore [Begin|Continue|End]PresentToDwm */
@@ -5942 +5934 @@
                 Assert(hr == S_OK);
 
-                if (   pSrcAlloc->SurfDesc.width == 658 && pSrcAlloc->SurfDesc.height == 493
-                    && pData->SrcRect.left == 0 && pData->SrcRect.top == 0
-                    && pData->SrcRect.right == 658 && pData->SrcRect.bottom == 493
-                    && pDstAlloc->SurfDesc.width == 756 && pDstAlloc->SurfDesc.height == 493
-                    && pData->DstRect.left == 0 && pData->DstRect.top == 0
-                    && pData->DstRect.right == 658 && pData->DstRect.bottom == 493)
-                {
-                    VBOXVDBG_DUMP_BLT_LEAVE(pSrcAlloc, pSrcSurfIf, &pData->SrcRect, pDstAlloc, pDstSurfIf, &pData->DstRect);
-                }
+                VBOXVDBG_DUMP_BLT_LEAVE(pSrcAlloc, pSrcSurfIf, &pData->SrcRect, pDstAlloc, pDstSurfIf, &pData->DstRect);
 
                 pSrcSurfIf->Release();

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

@@ -3733 +3733 @@
                     /* ensure the last char is \0*/
                     *((uint8_t*)pDbgPrint + pEscape->PrivateDriverDataSize - 1) = '\0';
-#ifdef DEBUG_misha
+#if defined(DEBUG_misha) || defined(DEBUG_leo)
                     DbgPrint("%s", pDbgPrint->aStringBuf);
 #else

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

@@ -3536 +3536 @@
         /* top left */
         glTexCoord2f(left, top);
-        glVertex2i(0, fbheight - dst_rect.bottom - dst_rect.top);
+        glVertex2i(0, fbheight - (dst_rect.bottom - dst_rect.top));
 
         /* top right */
         glTexCoord2f(right, top);
-        glVertex2i(dst_rect.right - dst_rect.left, fbheight - dst_rect.bottom - dst_rect.top);
+        glVertex2i(dst_rect.right - dst_rect.left, fbheight - (dst_rect.bottom - dst_rect.top));
 
         /* bottom right */