Changeset 51551 in vbox for trunk/src/VBox/Main

Timestamp:

Jun 5, 2014 12:09:12 PM (11 years ago)

Author:

vboxsync

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

94201

Message:

Main: removed obsolete RequestResize, ResizeCompleted methods.

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (2 diffs)
• include/DisplayImpl.h (modified) (1 diff)
• src-client/DisplayImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -15320 +15320 @@
     </method>
 
-  <!--
-    <method name="requestResize" wsmap="suppress">
-      <desc>
-        Requests a size and pixel format change.
-
-        There are two modes of working with the video buffer of the virtual
-        machine. The <i>indirect</i> mode implies that the IFramebuffer
-        implementation allocates a memory buffer for the requested display mode
-        and provides it to the virtual machine. In <i>direct</i> mode, the
-        IFramebuffer implementation uses the memory buffer allocated and owned
-        by the virtual machine. This buffer represents the video memory of the
-        emulated video adapter (so called <i>guest VRAM</i>). The direct mode is
-        usually faster because the implementation gets a raw pointer to the
-        guest VRAM buffer which it can directly use for visualizing the contents
-        of the virtual display, as opposed to the indirect mode where the
-        contents of guest VRAM are copied to the memory buffer provided by
-        the implementation every time a display update occurs.
-
-        It is important to note that the direct mode is really fast only when
-        the implementation uses the given guest VRAM buffer directly, for
-        example, by blitting it to the window representing the virtual machine's
-        display, which saves at least one copy operation comparing to the
-        indirect mode. However, using the guest VRAM buffer directly is not
-        always possible: the format and the color depth of this buffer may be
-        not supported by the target window, or it may be unknown (opaque) as in
-        case of text or non-linear multi-plane VGA video modes. In this case,
-        the indirect mode (that is always available) should be used as a
-        fallback: when the guest VRAM contents are copied to the
-        implementation-provided memory buffer, color and format conversion is
-        done automatically by the underlying code.
-
-        The @a pixelFormat parameter defines whether the direct mode is
-        available or not. If @a pixelFormat is <link
-        to="FramebufferPixelFormat_Opaque"/> then direct access to the guest
-        VRAM buffer is not available - the @a VRAM, @a bitsPerPixel and
-        @a bytesPerLine parameters must be ignored and the implementation must use
-        the indirect mode (where it provides its own buffer in one of the
-        supported formats). In all other cases, @a pixelFormat together with
-        @a bitsPerPixel and @a bytesPerLine define the format of the video memory
-        buffer pointed to by the @a VRAM parameter and the implementation is
-        free to choose which mode to use. To indicate that this frame buffer uses
-        the direct mode, the implementation of the <link to="#usesGuestVRAM"/>
-        attribute must return @c true and <link to="#address"/> must
-        return exactly the same address that is passed in the @a VRAM parameter
-        of this method; otherwise it is assumed that the indirect strategy is
-        chosen.
-
-        The @a width and @a height parameters represent the size of the
-        requested display mode in both modes. In case of indirect mode, the
-        provided memory buffer should be big enough to store data of the given
-        display mode. In case of direct mode, it is guaranteed that the given
-        @a VRAM buffer contains enough space to represent the display mode of the
-        given size. Note that this frame buffer's <link to="#width"/> and <link
-        to="#height"/> attributes must return exactly the same values as
-        passed to this method after the resize is completed (see below).
-
-        The @a finished output parameter determines if the implementation has
-        finished resizing the frame buffer or not. If, for some reason, the
-        resize cannot be finished immediately during this call, @a finished
-        must be set to @c false, and the implementation must call
-        <link to="IDisplay::resizeCompleted"/> after it has returned from
-        this method as soon as possible. If @a finished is @c false, the
-        machine will not call any frame buffer methods until
-        <link to="IDisplay::resizeCompleted"/> is called.
-
-        Note that if the direct mode is chosen, the <link to="#bitsPerPixel"/>,
-        <link to="#bytesPerLine"/> and <link to="#pixelFormat"/> attributes of
-        this frame buffer must return exactly the same values as specified in the
-        parameters of this method, after the resize is completed. If the
-        indirect mode is chosen, these attributes must return values describing
-        the format of the implementation's own memory buffer <link
-        to="#address"/> points to. Note also that the <link to="#bitsPerPixel"/>
-        value must always correlate with <link to="#pixelFormat"/>. Note that
-        the <link to="#pixelFormat"/> attribute must never return <link
-        to="FramebufferPixelFormat_Opaque"/> regardless of the selected mode.
-
-        <note>
-          This method is called by the IDisplay object under the
-          <link to="#lock"/> provided by this IFramebuffer
-          implementation. If this method returns @c false in @a finished, then
-          this lock is not released until
-          <link to="IDisplay::resizeCompleted"/> is called.
-        </note>
-      </desc>
-      <param name="screenId" type="unsigned long" dir="in">
-        <desc>
-          Logical screen number. Must be used in the corresponding call to
-          <link to="IDisplay::resizeCompleted"/> if this call is made.
-        </desc>
-      </param>
-      <param name="pixelFormat" type="unsigned long" dir="in">
-        <desc>
-          Pixel format of the memory buffer pointed to by @a VRAM.
-          See also <link to="FramebufferPixelFormat"/>.
-        </desc>
-      </param>
-      <param name="VRAM" type="octet" mod="ptr" dir="in">
-        <desc>Pointer to the virtual video card's VRAM (may be @c null).</desc>
-      </param>
-      <param name="bitsPerPixel" type="unsigned long" dir="in">
-        <desc>Color depth, bits per pixel.</desc>
-      </param>
-      <param name="bytesPerLine" type="unsigned long" dir="in">
-        <desc>Size of one scan line, in bytes.</desc>
-      </param>
-      <param name="width" type="unsigned long" dir="in">
-        <desc>Width of the guest display, in pixels.</desc>
-      </param>
-      <param name="height" type="unsigned long" dir="in">
-        <desc>Height of the guest display, in pixels.</desc>
-      </param>
-      <param name="finished" type="boolean" dir="return">
-        <desc>
-          Can the VM start using the new frame buffer immediately
-          after this method returns or it should wait for
-          <link to="IDisplay::resizeCompleted"/>.
-        </desc>
-      </param>
-    </method>
-  -->
-
     <method name="notifyChange">
       <desc>
@@ -15902 +15781 @@
       </desc>
     </method>
-
-  <!--
-    <method name="resizeCompleted">
-      <desc>
-        Signals that a framebuffer has completed the resize operation.
-
-        <result name="VBOX_E_NOT_SUPPORTED">
-          Operation only valid for external frame buffers.
-        </result>
-
-      </desc>
-      <param name="screenId" type="unsigned long" dir="in"/>
-    </method>
-  -->
 
     <method name="completeVHWACommand">

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

@@ -236 +236 @@
     STDMETHOD(DrawToScreen)(ULONG aScreenId, BYTE *address, ULONG x, ULONG y, ULONG width, ULONG height);
     STDMETHOD(InvalidateAndUpdate)();
-    STDMETHOD(ResizeCompleted)(ULONG aScreenId);
     STDMETHOD(SetSeamlessMode)(BOOL enabled);
 

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

@@ -924 +924 @@
 /**
  *  Handles display resize event.
- *  Disables access to VGA device;
- *  calls the framebuffer RequestResize method;
- *  if framebuffer resizes synchronously,
- *      updates the display connector data and enables access to the VGA device.
  *
  *  @param w New display width
@@ -1025 +1021 @@
     if (!maFramebuffers[uScreenId].pFramebuffer.isNull())
     {
-        int rc = callFramebufferResize (maFramebuffers[uScreenId].pFramebuffer, uScreenId,
-                                        pixelFormat, pvVRAM, bpp, cbLine, w, h);
-        if (rc == VINF_VGA_RESIZE_IN_PROGRESS)
-        {
-            /* Immediately return to the caller. ResizeCompleted will be called back by the
-             * GUI thread. The ResizeCompleted callback will change the resize status from
-             * InProgress to UpdateDisplayData. The latter status will be checked by the
-             * display timer callback on EMT and all required adjustments will be done there.
-             */
-            return rc;
-        }
+        callFramebufferResize(maFramebuffers[uScreenId].pFramebuffer, uScreenId,
+                              pixelFormat, pvVRAM, bpp, cbLine, w, h);
     }
 
@@ -3649 +3636 @@
     LogRelFlowFunc(("rc=%Rhrc\n", rc));
     return rc;
-}
-
-/**
- * Notification that the framebuffer has completed the
- * asynchronous resize processing
- *
- * @returns COM status code
- */
-STDMETHODIMP Display::ResizeCompleted(ULONG aScreenId)
-{
-    LogRelFlowFunc(("\n"));
-
-    /// @todo (dmik) can we AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); here?
-    //  This will require general code review and may add some details.
-    //  In particular, we may want to check whether EMT is really waiting for
-    //  this notification, etc. It might be also good to obey the caller to make
-    //  sure this method is not called from more than one thread at a time
-    //  (and therefore don't use Display lock at all here to save some
-    //  milliseconds).
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    /* this is only valid for external framebuffers */
-    if (maFramebuffers[aScreenId].pFramebuffer == NULL)
-        return setError(VBOX_E_NOT_SUPPORTED,
-                        tr("Resize completed notification is valid only for external framebuffers"));
-
-    /* Set the flag indicating that the resize has completed and display
-     * data need to be updated. */
-    bool f = ASMAtomicCmpXchgU32 (&maFramebuffers[aScreenId].u32ResizeStatus,
-        ResizeStatus_UpdateDisplayData, ResizeStatus_InProgress);
-    AssertRelease(f);NOREF(f);
-
-    return S_OK;
 }