Changeset 22675 in vbox

Timestamp:

Sep 1, 2009 2:50:32 PM (15 years ago)

Author:

vboxsync

Message:

qgl frambuffer: fix warnings

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBQGL.cpp (modified) (17 diffs)

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

@@ -2889 +2889 @@
                              new VBoxRepaintEvent (aX, aY, aW, aH));
 #else
-    vboxWidget()->postCmd(VBOXVHWA_PIPECMD_PAINT, &QRect(aX, aY, aW, aH));
+    QRect r(aX, aY, aW, aH);
+    vboxWidget()->postCmd(VBOXVHWA_PIPECMD_PAINT, &r);
 #endif
     return S_OK;
@@ -2949 +2950 @@
 VBoxGLWidget::VBoxGLWidget (VBoxConsoleView *aView, QWidget *aParent)
     : QGLWidget (VBoxGLWidget::vboxGLFormat(), aParent),
+    mSurfHandleTable(128), /* 128 should be enough */
+    mpfnOp(NULL),
+    mOpContext(NULL),
     mPixelFormat(0),
     mUsesGuestVRAM(false),
@@ -2954 +2958 @@
     mView(aView),
     mConstructingList(NULL),
-    mcRemaining2Contruct(0),
-    mpfnOp(NULL),
-    mSurfHandleTable(128) /* 128 should be enough */
+    mcRemaining2Contruct(0)
 {
     cmdPipeInit();
@@ -3169 +3171 @@
 void VBoxGLWidget::vboxDoProcessVHWACommands(void *pContext)
 {
+    Q_UNUSED(pContext);
     VBoxVHWACommandElement * pFirst = detachCmdList(NULL, NULL);
     do
@@ -3215 +3218 @@
     vboxDoVHWACmdExec(cmd);
 
-    delete cmd;
+    free(cmd);
 }
 
@@ -3472 +3475 @@
         if(pCmd->SurfInfo.PixelFormat.flags & VBOXVHWA_PF_RGB)
         {
-                VBoxVHWAColorFormat format(pCmd->SurfInfo.PixelFormat.c.rgbBitCount,
+            VBoxVHWAColorFormat format(pCmd->SurfInfo.PixelFormat.c.rgbBitCount,
                                                 pCmd->SurfInfo.PixelFormat.m1.rgbRBitMask,
                                                 pCmd->SurfInfo.PixelFormat.m2.rgbGBitMask,
                                                 pCmd->SurfInfo.PixelFormat.m3.rgbBBitMask);
-            surf = new VBoxVHWASurfaceBase(this, &QSize(pCmd->SurfInfo.width, pCmd->SurfInfo.height),
-//                        ((pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_OVERLAY) ? mDisplay.getPrimary()->rect().size() : &QSize(pCmd->SurfInfo.width, pCmd->SurfInfo.height)),
-                        &mDisplay.getPrimary()->rect().size(),
+            QSize surfSize(pCmd->SurfInfo.width, pCmd->SurfInfo.height);
+            QSize primarySize = mDisplay.getPrimary()->rect().size();
+            surf = new VBoxVHWASurfaceBase(this, &surfSize,
+//                        ((pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_OVERLAY) ? mDisplay.getPrimary()->rect().size() : &surfSize),
+                        &primarySize,
                         format,
                         pSrcBltCKey, pDstBltCKey, pSrcOverlayCKey, pDstOverlayCKey,
@@ -3485 +3490 @@
         else if(pCmd->SurfInfo.PixelFormat.flags & VBOXVHWA_PF_FOURCC)
         {
+            QSize surfSize(pCmd->SurfInfo.width, pCmd->SurfInfo.height);
+            QSize primarySize = mDisplay.getPrimary()->rect().size();
+
             VBoxVHWAColorFormat format(pCmd->SurfInfo.PixelFormat.fourCC);
-            surf = new VBoxVHWASurfaceBase(this, &QSize(pCmd->SurfInfo.width, pCmd->SurfInfo.height),
+            surf = new VBoxVHWASurfaceBase(this, &surfSize,
             //                        ((pCmd->SurfInfo.surfCaps & VBOXVHWA_SCAPS_OVERLAY) ? mDisplay.getPrimary()->rect().size() : &QSize(pCmd->SurfInfo.width, pCmd->SurfInfo.height)),
-                                    &mDisplay.getPrimary()->rect().size(),
+                                    &primarySize,
                                     format,
                                     pSrcBltCKey, pDstBltCKey, pSrcOverlayCKey, pDstOverlayCKey,
@@ -3657 +3665 @@
 {
     /**/
+    Q_UNUSED(pCmd);
     return VERR_NOT_IMPLEMENTED;
 //    VBoxVHWASurfaceBase *pDstSurf = (VBoxVHWASurfaceBase*)pCmd->u.in.hDstSurf;
@@ -3754 +3763 @@
          * i.e.
          * 1. indicate the value is overridden (no matter what we write here, bu it should be not NULL)*/
-        pSrcSurf->setOverriddenDstOverlayCKey(&VBoxVHWAColorKey(0, 0));
+        VBoxVHWAColorKey dummyCKey(0, 0);
+        pSrcSurf->setOverriddenDstOverlayCKey(&dummyCKey);
         /* tell the ckey is disabled */
         pSrcSurf->setDefaultDstOverlayCKey(NULL);
@@ -3767 +3777 @@
     {
         VBOXQGLLOG((", KEYSRCOVERRIDE"));
-        pSrcSurf->setOverriddenSrcOverlayCKey(&VBoxVHWAColorKey(pCmd->u.in.desc.SrcCK.high, pCmd->u.in.desc.SrcCK.low));
+        VBoxVHWAColorKey ckey(pCmd->u.in.desc.SrcCK.high, pCmd->u.in.desc.SrcCK.low);
+        pSrcSurf->setOverriddenSrcOverlayCKey(&ckey);
     }
     else
@@ -3879 +3890 @@
     const SurfList & surfaces = pList->surfaces();
 
+    QPoint pos(pCmd->u.in.xPos, pCmd->u.in.yPos);
+
     for (SurfList::const_iterator it = surfaces.begin();
              it != surfaces.end(); ++ it)
     {
         VBoxVHWASurfaceBase *pCurSrcSurf = (*it);
-        pCurSrcSurf->setTargetRectPosition(pDstSurf, &QPoint(pCmd->u.in.xPos, pCmd->u.in.yPos));;
+        pCurSrcSurf->setTargetRectPosition(pDstSurf, &pos);
     }
 
@@ -3900 +3913 @@
     if(pCmd->u.in.flags & VBOXVHWA_CKEY_DESTBLT)
     {
-        pSurf->setDstBltCKey(&VBoxVHWAColorKey(pCmd->u.in.CKey.high, pCmd->u.in.CKey.low));
+        VBoxVHWAColorKey ckey(pCmd->u.in.CKey.high, pCmd->u.in.CKey.low);
+        pSurf->setDstBltCKey(&ckey);
     }
     if(pCmd->u.in.flags & VBOXVHWA_CKEY_DESTOVERLAY)
     {
-        pSurf->setDefaultDstOverlayCKey(&VBoxVHWAColorKey(pCmd->u.in.CKey.high, pCmd->u.in.CKey.low));
+        VBoxVHWAColorKey ckey(pCmd->u.in.CKey.high, pCmd->u.in.CKey.low);
+        pSurf->setDefaultDstOverlayCKey(&ckey);
     }
     if(pCmd->u.in.flags & VBOXVHWA_CKEY_SRCBLT)
     {
-        pSurf->setSrcBltCKey(&VBoxVHWAColorKey(pCmd->u.in.CKey.high, pCmd->u.in.CKey.low));
+        VBoxVHWAColorKey ckey(pCmd->u.in.CKey.high, pCmd->u.in.CKey.low);
+        pSurf->setSrcBltCKey(&ckey);
     }
     if(pCmd->u.in.flags & VBOXVHWA_CKEY_SRCOVERLAY)
     {
-        pSurf->setDefaultSrcOverlayCKey(&VBoxVHWAColorKey(pCmd->u.in.CKey.high, pCmd->u.in.CKey.low));
+        VBoxVHWAColorKey ckey(pCmd->u.in.CKey.high, pCmd->u.in.CKey.low);
+        pSurf->setDefaultSrcOverlayCKey(&ckey);
     }
 
@@ -4037 +4054 @@
 static DECLCALLBACK(int) vboxQGLLoadExec(PSSMHANDLE pSSM, void *pvUser, uint32_t u32Version, uint32_t uPhase)
 {
+    Q_UNUSED(uPhase);
     VBoxGLWidget * pw = (VBoxGLWidget*)pvUser;
     return pw->vhwaLoadExec(pSSM, u32Version);
@@ -4122 +4140 @@
 int VBoxGLWidget::vhwaLoadSurface(struct SSMHANDLE * pSSM, uint32_t u32Version)
 {
+    Q_UNUSED(u32Version);
+
     VBOXQGL_LOAD_SURFSTART(pSSM);
 
-    char *buf = new char[VBOXVHWACMD_SIZE(VBOXVHWACMD_SURF_CREATE)];
+    char *buf = (char*)malloc(VBOXVHWACMD_SIZE(VBOXVHWACMD_SURF_CREATE));
     memset(buf, 0, sizeof(buf));
     VBOXVHWACMD * pCmd = (VBOXVHWACMD*)buf;
@@ -4271 +4291 @@
 int VBoxGLWidget::vhwaLoadOverlayData(struct SSMHANDLE * pSSM, uint32_t u32Version)
 {
+    Q_UNUSED(u32Version);
+    
     VBOXQGL_LOAD_OVERLAYSTART(pSSM);
 
@@ -4588 +4610 @@
 void VBoxGLWidget::vboxDoPaint(void *pe)
 {
+    Q_UNUSED(pe);
+
 #ifdef VBOXQGL_DBG_SURF
     vboxDoTestSurfaces(NULL);
@@ -4718 +4742 @@
         if (!fallback)
         {
-            ulong virtWdt = bitsPerLine / re->bitsPerPixel();
+            // ulong virtWdt = bitsPerLine / re->bitsPerPixel();
             mPixelFormat = FramebufferPixelFormat_FOURCC_RGB;
             mUsesGuestVRAM = true;