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

Timestamp:

May 18, 2009 3:50:20 PM (16 years ago)

Author:

vboxsync

Message:

removed long obsolete methods IFramebuffer::solidFill() and IFramebuffer::copyScreenBits()

Location:

trunk/src/VBox/Main

Files:

• DisplayImpl.cpp (modified) (1 diff)
• FramebufferImpl.cpp (modified) (2 diffs)
• cbinding/VBoxCAPI_v2_2.h (modified) (3 diffs)
• idl/VirtualBox.xidl (modified) (4 diffs)
• include/FramebufferImpl.h (modified) (1 diff)

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -1990 +1990 @@
     that->mInternalFramebuffer = aInternal;
     that->mSupportedAccelOps = 0;
-
-    /* determine which acceleration functions are supported by this framebuffer */
-    if (aFB && !aInternal)
-    {
-        HRESULT rc;
-        BOOL accelSupported = FALSE;
-        rc = aFB->OperationSupported (
-            FramebufferAccelerationOperation_SolidFillAcceleration, &accelSupported);
-        AssertComRC (rc);
-        if (accelSupported)
-            that->mSupportedAccelOps |=
-                FramebufferAccelerationOperation_SolidFillAcceleration;
-        accelSupported = FALSE;
-        rc = aFB->OperationSupported (
-            FramebufferAccelerationOperation_ScreenCopyAcceleration, &accelSupported);
-        AssertComRC (rc);
-        if (accelSupported)
-            that->mSupportedAccelOps |=
-                FramebufferAccelerationOperation_ScreenCopyAcceleration;
-    }
 
     that->mParent->consoleVRDPServer()->SendResize ();

trunk/src/VBox/Main/FramebufferImpl.cpp

@@ -177 +177 @@
 }
 
-STDMETHODIMP InternalFramebuffer::OperationSupported(FramebufferAccelerationOperation_T operation,
-                                                     BOOL *supported)
-{
-    CheckComArgOutPointerValid(supported);
-    /* no acceleration please, we're a slow fallback implementation! */
-    *supported = false;
-    return S_OK;
-}
-
 STDMETHODIMP InternalFramebuffer::VideoModeSupported(ULONG width, ULONG height, ULONG bpp,
                                                      BOOL *supported)
@@ -195 +186 @@
 }
 
-STDMETHODIMP InternalFramebuffer::SolidFill(ULONG x, ULONG y, ULONG width, ULONG height,
-                                             ULONG color, BOOL *handled)
-{
-    CheckComArgOutPointerValid(handled);
-    /* eek, what do you expect from us?! */
-    *handled = false;
-    return S_OK;
-}
-
-STDMETHODIMP InternalFramebuffer::CopyScreenBits(ULONG xDst, ULONG yDst, ULONG xSrc, ULONG ySrc,
-                                                 ULONG width, ULONG height, BOOL *handled)
-{
-    CheckComArgOutPointerValid(handled);
-    /* eek, what do you expect from us?! */
-    *handled = false;
-    return S_OK;
-}
-
 STDMETHODIMP InternalFramebuffer::GetVisibleRegion(BYTE *aRectangles, ULONG aCount,
                                                    ULONG *aCountCopied)

trunk/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h

@@ -1181 +1181 @@
 
 
-/* Start of enum FramebufferAccelerationOperation Declaration */
-#define FRAMEBUFFERACCELERATIONOPERATION_IID_STR "f0e5ebbe-dc8e-4e2d-916e-53baa3844df8"
-#define FRAMEBUFFERACCELERATIONOPERATION_IID { \
-    0xf0e5ebbe, 0xdc8e, 0x4e2d, \
-    { 0x91, 0x6e, 0x53, 0xba, 0xa3, 0x84, 0x4d, 0xf8 } \
-}
-enum FramebufferAccelerationOperation
-{
-    FramebufferAccelerationOperation_SolidFillAcceleration = 1,
-    FramebufferAccelerationOperation_ScreenCopyAcceleration = 2
-};
-/* End of enum FramebufferAccelerationOperation Declaration */
-
-
 /* Start of enum FramebufferPixelFormat Declaration */
 #define FRAMEBUFFERPIXELFORMAT_IID_STR "7acfd5ed-29e3-45e3-8136-73c9224f3d2d"
@@ -3757 +3743 @@
     );
 
-    nsresult (*OperationSupported)(
-        IFramebuffer *pThis,
-        PRUint32 operation,
-        PRBool * supported
-    );
-
     nsresult (*VideoModeSupported)(
         IFramebuffer *pThis,
@@ -3769 +3749 @@
         PRUint32 bpp,
         PRBool * supported
-    );
-
-    nsresult (*SolidFill)(
-        IFramebuffer *pThis,
-        PRUint32 x,
-        PRUint32 y,
-        PRUint32 width,
-        PRUint32 height,
-        PRUint32 color,
-        PRBool * handled
-    );
-
-    nsresult (*CopyScreenBits)(
-        IFramebuffer *pThis,
-        PRUint32 xDst,
-        PRUint32 yDst,
-        PRUint32 xSrc,
-        PRUint32 ySrc,
-        PRUint32 width,
-        PRUint32 height,
-        PRBool * handled
     );
 

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

@@ -10248 +10248 @@
 
   <enum
-    name="FramebufferAccelerationOperation"
-    uuid="f0e5ebbe-dc8e-4e2d-916e-53baa3844df8"
-  >
-    <desc>
-      Frame buffer acceleration operation.
-    </desc>
-
-    <const name="SolidFillAcceleration"   value="1"/>
-    <const name="ScreenCopyAcceleration"  value="2"/>
-  </enum>
-
-  <enum
     name="FramebufferPixelFormat"
     uuid="7acfd5ed-29e3-45e3-8136-73c9224f3d2d"
@@ -10288 +10276 @@
   <interface
      name="IFramebuffer" extends="$unknown"
-     uuid="af431304-5b09-40e2-94da-3c3cb03822c1"
+     uuid="3ce29e6d-835a-4283-8ee0-eb9971b81d81"
      wsmap="suppress"
      >
@@ -10519 +10507 @@
     </method>
 
-    <method name="operationSupported">
-      <desc>
-        Returns whether the given acceleration operation is supported
-        by the IFramebuffer implementation. If not, the display object
-        will not attempt to call the corresponding IFramebuffer entry
-        point. Even if an operation is indicated as supported, the
-        IFramebuffer implementation always has the option to return non
-        supported from the corresponding acceleration method in which
-        case the operation will be performed by the display engine. This
-        allows for reduced IFramebuffer implementation complexity where
-        only common cases are handled.
-      </desc>
-      <param name="operation" type="FramebufferAccelerationOperation" dir="in"/>
-      <param name="supported" type="boolean" dir="return"/>
-    </method>
-
     <method name="videoModeSupported">
       <desc>
@@ -10549 +10521 @@
       <param name="bpp" type="unsigned long" dir="in"/>
       <param name="supported" type="boolean" dir="return"/>
-    </method>
-
-    <method name="solidFill">
-      <desc>
-        Fills the specified rectangle on screen with a solid color.
-      </desc>
-      <param name="x" type="unsigned long" dir="in"/>
-      <param name="y" type="unsigned long" dir="in"/>
-      <param name="width" type="unsigned long" dir="in"/>
-      <param name="height" type="unsigned long" dir="in"/>
-      <param name="color" type="unsigned long" dir="in"/>
-      <param name="handled" type="boolean" dir="return"/>
-    </method>
-
-    <method name="copyScreenBits">
-      <desc>
-        Copies specified rectangle on the screen.
-      </desc>
-      <param name="xDst" type="unsigned long" dir="in"/>
-      <param name="yDst" type="unsigned long" dir="in"/>
-      <param name="xSrc" type="unsigned long" dir="in"/>
-      <param name="ySrc" type="unsigned long" dir="in"/>
-      <param name="width" type="unsigned long" dir="in"/>
-      <param name="height" type="unsigned long" dir="in"/>
-      <param name="handled" type="boolean" dir="return"/>
     </method>
 

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

@@ -69 +69 @@
                              ULONG bpp, ULONG bpl, ULONG w, ULONG h,
                              BOOL *finished);
-    STDMETHOD(OperationSupported)(FramebufferAccelerationOperation_T operation,
-                                  BOOL *supported);
     STDMETHOD(VideoModeSupported)(ULONG width, ULONG height, ULONG bpp, BOOL *supported);
-    STDMETHOD(SolidFill)(ULONG x, ULONG y, ULONG width, ULONG height,
-                         ULONG color, BOOL *handled);
-    STDMETHOD(CopyScreenBits)(ULONG xDst, ULONG yDst, ULONG xSrc, ULONG ySrc,
-                              ULONG width, ULONG height, BOOL *handled);
 
     STDMETHOD(GetVisibleRegion)(BYTE *aRectangles, ULONG aCount, ULONG *aCountCopied);