Changeset 51604 in vbox

Timestamp:

Jun 11, 2014 12:16:51 PM (11 years ago)

Author:

vboxsync

Message:

DisplayImpl: removed obsolete mLast* fields.

Location:

trunk/src/VBox/Main

Files:

• include/DisplayImpl.h (modified) (1 diff)
• src-client/DisplayImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -293 +293 @@
     bool volatile fVGAResizing;
 
-    /* arguments of the last handleDisplayResize() call */
-    void       *mLastAddress;
-    uint32_t    mLastBytesPerLine;
-    uint32_t    mLastBitsPerPixel;
-    uint32_t    mLastWidth;
-    uint32_t    mLastHeight;
-    uint16_t    mLastFlags;
-
     VBVAMEMORY *mpVbvaMemory;
     bool        mfVideoAccelEnabled;

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -127 +127 @@
     mpVMMDev = NULL;
     mfVMMDevInited = false;
-
-    mLastAddress = NULL;
-    mLastBytesPerLine = 0;
-    mLastBitsPerPixel = 0,
-    mLastWidth = 0;
-    mLastHeight = 0;
 
     int rc = RTCritSectInit(&mVBVALock);
@@ -905 +899 @@
     if (uScreenId == VBOX_VIDEO_PRIMARY_SCREEN)
     {
-        mLastAddress = pvVRAM;
-        mLastBytesPerLine = cbLine;
-        mLastBitsPerPixel = bpp;
-        mLastWidth = w;
-        mLastHeight = h;
-        mLastFlags = flags;
-
         DISPLAYFBINFO *pFBInfo = &maFramebuffers[uScreenId];
         pFBInfo->w = w;
@@ -919 +906 @@
         pFBInfo->pu8FramebufferVRAM = (uint8_t *)pvVRAM;
         pFBInfo->u32LineSize = cbLine;
+        pFBInfo->flags = flags;
     }
 
@@ -2195 +2183 @@
                                 pFBInfo->w,
                                 pFBInfo->h,
-                                0);
+                                pFBInfo->flags);
         }
     }
@@ -2285 +2273 @@
     {
         /* Setup the new framebuffer. */
-
-        /* @todo generic code for all monitors. */
-        if (pFBInfo->fVBVAEnabled && pFBInfo->pu8FramebufferVRAM)
-        {
-            /* This display in VBVA mode. Resize it to the last guest resolution,
-             * if it has been reported.
-             */
-            handleDisplayResize(aScreenId, pFBInfo->u16BitsPerPixel,
-                                pFBInfo->pu8FramebufferVRAM,
-                                pFBInfo->u32LineSize,
-                                pFBInfo->w,
-                                pFBInfo->h,
-                                pFBInfo->flags);
-        }
-        else if (aScreenId == VBOX_VIDEO_PRIMARY_SCREEN)
-        {
-            /* VGA device mode, only for the primary screen. */
-            handleDisplayResize(VBOX_VIDEO_PRIMARY_SCREEN, mLastBitsPerPixel,
-                                mLastAddress,
-                                mLastBytesPerLine,
-                                mLastWidth,
-                                mLastHeight,
-                                mLastFlags);
-        }
+        handleDisplayResize(aScreenId, pFBInfo->u16BitsPerPixel,
+                            pFBInfo->pu8FramebufferVRAM,
+                            pFBInfo->u32LineSize,
+                            pFBInfo->w,
+                            pFBInfo->h,
+                            pFBInfo->flags);
     }
 
@@ -4849 +4819 @@
         pThis->pDisplay->mpDrv = NULL;
         pThis->pDisplay->mpVMMDev = NULL;
-        pThis->pDisplay->mLastAddress = NULL;
-        pThis->pDisplay->mLastBytesPerLine = 0;
-        pThis->pDisplay->mLastBitsPerPixel = 0,
-        pThis->pDisplay->mLastWidth = 0;
-        pThis->pDisplay->mLastHeight = 0;
     }
 }