Changeset 25441 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Dec 16, 2009 5:13:10 PM (15 years ago)

Author:

vboxsync

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

56092

Message:

2d: cleanup + warning fixes

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxFBOverlay.cpp (modified) (5 diffs)
• VBoxFBOverlay.h (modified) (1 diff)

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

@@ -311 +311 @@
 static VBoxVHWATextureImage* vboxVHWAImageCreate(const QRect & aRect, const VBoxVHWAColorFormat & aFormat, class VBoxVHWAGlProgramMngr * pMgr, bool bDisablePBO)
 {
+#ifdef VBOXVHWA_NEW_PBO
     const VBoxVHWAInfo & info = vboxVHWAGetSupportInfo(NULL);
-#ifdef VBOXVHWA_NEW_PBO
     if(!bDisablePBO && info.getGlInfo().isPBOSupported())
     {
@@ -2889 +2889 @@
     }
 
-    /* ensure all overlays programs & display lists are updated */
-    const OverlayList & overlays = mDisplay.overlays();
-    for (OverlayList::const_iterator it = overlays.begin();
-         it != overlays.end(); ++ it)
-    {
-        VBoxVHWASurfList * pSurfList = *it;
-        const SurfList & surfaces = pSurfList->surfaces();
-        for (SurfList::const_iterator sit = surfaces.begin();
-             sit != surfaces.end(); ++ sit)
-        {
-            VBoxVHWASurfaceBase *pOverlaySurf = *sit;
-        }
-    }
     return VINF_SUCCESS;
 }
@@ -5122 +5109 @@
     {
         return createSetDisplay(pDst, pDstRect, pSrcRect,
-                pDstCKey, pSrcCKey, bNotIntersected,
-                &mVisibleDisplay, &mpProgram);
+                pDstCKey, pSrcCKey, bNotIntersected);
 
     }
@@ -5187 +5173 @@
 
 int VBoxVHWATextureImage::createSetDisplay(VBoxVHWATextureImage *pDst, const QRect * pDstRect, const QRect * pSrcRect,
-        const VBoxVHWAColorKey * pDstCKey, const VBoxVHWAColorKey * pSrcCKey, bool bNotIntersected,
-        GLuint *pDisplay, class VBoxVHWAGlProgramVHWA ** ppProgram)
+        const VBoxVHWAColorKey * pDstCKey, const VBoxVHWAColorKey * pSrcCKey, bool bNotIntersected)
 {
     deleteDisplay();
@@ -5218 +5203 @@
         GLuint *pDisplay)
 {
+    Q_UNUSED(pDstCKey);
+    Q_UNUSED(pSrcCKey);
+    Q_UNUSED(bNotIntersected);
+
     glGetError(); /* clear the err flag */
     GLuint display = glGenLists(1);

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

@@ -509 +509 @@
 
     int createSetDisplay(VBoxVHWATextureImage *pDst, const QRect * pDstRect, const QRect * pSrcRect,
-            const VBoxVHWAColorKey * pDstCKey, const VBoxVHWAColorKey * pSrcCKey, bool bNotIntersected,
-            GLuint *pDisplay, class VBoxVHWAGlProgramVHWA ** ppProgram);
+            const VBoxVHWAColorKey * pDstCKey, const VBoxVHWAColorKey * pSrcCKey, bool bNotIntersected);
 
     virtual int createDisplayList(VBoxVHWATextureImage *pDst, const QRect * pDstRect, const QRect * pSrcRect,