Changeset 27960 in vbox

Timestamp:

Apr 2, 2010 4:29:06 PM (15 years ago)

Author:

vboxsync

Message:

2d: bugfix

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -2273 +2273 @@
                         surf->resetDefaultDstOverlayCKey();
 
-                        surf->setDefaultSrcOverlayCKey(pDstOverlayCKey);
+                        surf->setDefaultSrcOverlayCKey(pSrcOverlayCKey);
                         surf->resetDefaultSrcOverlayCKey();
 //                        mbVGASurfCreated = true;
@@ -2788 +2788 @@
         VBoxVHWAColorKey ckey(pCmd->u.in.CKey.high, pCmd->u.in.CKey.low);
         pSurf->setSrcBltCKey(&ckey);
+
     }
     if (pCmd->u.in.flags & VBOXVHWA_CKEY_SRCOVERLAY)
@@ -5282 +5283 @@
 {
     VBoxVHWAGlProgramVHWA * pProgram = NULL;
-    if(!pDst)
+    if (!pDst)
     {
         /* sanity */
@@ -5288 +5289 @@
         pDstCKey = NULL;
     }
+
+    Assert(!pSrcCKey);
+    if (pSrcCKey)
+        pSrcCKey = NULL; /* fallback */
 
     pProgram = calcProgram(pDst, pDstCKey, pSrcCKey, bNotIntersected);