Index: /trunk/src/VBox/Frontends/VBoxBFE/Framebuffer.h =================================================================== --- /trunk/src/VBox/Frontends/VBoxBFE/Framebuffer.h (revision 19797) +++ /trunk/src/VBox/Frontends/VBoxBFE/Framebuffer.h (revision 19798) @@ -47,8 +47,4 @@ ULONG w, ULONG h, BOOL *finished) = 0; virtual HRESULT RequestResize(ULONG w, ULONG h, BOOL *finished) = 0; - virtual HRESULT SolidFill(ULONG x, ULONG y, ULONG width, ULONG height, - ULONG color, BOOL *handled) = 0; - virtual HRESULT CopyScreenBits(ULONG xDst, ULONG yDst, ULONG xSrc, ULONG ySrc, - ULONG width, ULONG height, BOOL *handled) = 0; virtual HRESULT GetVisibleRegion(BYTE *aRectangles, ULONG aCount, ULONG *aCountCopied) = 0; Index: /trunk/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.cpp (revision 19797) +++ /trunk/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.cpp (revision 19798) @@ -312,16 +312,4 @@ } -HRESULT SDLFramebuffer::SolidFill(ULONG x, ULONG y, ULONG width, ULONG height, - ULONG color, BOOL *handled) -{ - return E_NOTIMPL; -} - -HRESULT SDLFramebuffer::CopyScreenBits(ULONG xDst, ULONG yDst, ULONG xSrc, ULONG ySrc, - ULONG width, ULONG height, BOOL *handled) -{ - return E_NOTIMPL; -} - HRESULT SDLFramebuffer::GetVisibleRegion(BYTE *aRectangles, ULONG aCount, ULONG *aCountCopied) Index: /trunk/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.h =================================================================== --- /trunk/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.h (revision 19797) +++ /trunk/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.h (revision 19798) @@ -53,8 +53,4 @@ ULONG w, ULONG h, BOOL *finished); virtual HRESULT RequestResize(ULONG w, ULONG h, BOOL *finished); - virtual HRESULT SolidFill(ULONG x, ULONG y, ULONG width, ULONG height, - ULONG color, BOOL *handled); - virtual HRESULT CopyScreenBits(ULONG xDst, ULONG yDst, ULONG xSrc, ULONG ySrc, - ULONG width, ULONG height, BOOL *handled); virtual HRESULT GetVisibleRegion(BYTE *aRectangles, ULONG aCount, ULONG *aCountCopied); virtual HRESULT SetVisibleRegion(BYTE *aRectangles, ULONG aCount); Index: /trunk/src/VBox/Frontends/VBoxHeadless/VideoCapture/FFmpegFB.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxHeadless/VideoCapture/FFmpegFB.cpp (revision 19797) +++ /trunk/src/VBox/Frontends/VBoxHeadless/VideoCapture/FFmpegFB.cpp (revision 19798) @@ -599,23 +599,4 @@ } - -/** - * Queries whether we support a given accelerated opperation. Since we - * do not have any way of performing accelerated operations, we always - * return false in supported. - * - * @returns COM status code - * @param operation The operation being queried - * @retval supported Whether or not we support that operation - */ -STDMETHODIMP FFmpegFB::OperationSupported(FramebufferAccelerationOperation_T operation, - BOOL *supported) -{ - if (!supported) - return E_POINTER; - *supported = false; - return S_OK; -} - /** * Returns whether we like the given video mode. @@ -639,35 +620,4 @@ return E_POINTER; *supported = true; - return S_OK; -} - -/** - * Since we currently do not have any way of doing this faster than - * the VGA device, we simply false in handled. Behaviour taken from - * src/VBox/RDP/server/framebuffer.cpp. - */ -STDMETHODIMP FFmpegFB::SolidFill(ULONG x, ULONG y, ULONG width, - ULONG height, ULONG color, BOOL *handled) -{ - LogFlow(("FFmpeg::SolidFill called.\n")); - if (!handled) - return E_POINTER; - *handled = false; - return S_OK; -} - -/** - * Since we currently do not have any way of doing this faster than - * the VGA device, we simply false in handled. Behaviour taken from - * src/VBox/RDP/server/framebuffer.cpp. - */ -STDMETHODIMP FFmpegFB::CopyScreenBits(ULONG xDst, ULONG yDst, ULONG xSrc, - ULONG ySrc, ULONG width, - ULONG height, BOOL *handled) -{ - LogFlow(("FFmpeg::CopyScreenBits called.\n")); - if (!handled) - return E_POINTER; - *handled = false; return S_OK; } Index: /trunk/src/VBox/Frontends/VBoxHeadless/VideoCapture/FFmpegFB.h =================================================================== --- /trunk/src/VBox/Frontends/VBoxHeadless/VideoCapture/FFmpegFB.h (revision 19797) +++ /trunk/src/VBox/Frontends/VBoxHeadless/VideoCapture/FFmpegFB.h (revision 19798) @@ -105,10 +105,5 @@ ULONG bitsPerPixel, ULONG bytesPerLine, 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 *rectangles, ULONG count, ULONG *countCopied); STDMETHOD(SetVisibleRegion)(BYTE *rectangles, ULONG count); Index: /trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp (revision 19797) +++ /trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp (revision 19798) @@ -521,34 +521,4 @@ /** - * Returns which acceleration operations are supported - * - * @returns COM status code - * @param operation acceleration operation code - * @supported result - */ -STDMETHODIMP VBoxSDLFB::OperationSupported(FramebufferAccelerationOperation_T operation, BOOL *supported) -{ - if (!supported) - return E_POINTER; - - // SDL gives us software surfaces, futile - *supported = false; -#if 0 - switch (operation) - { - case FramebufferAccelerationOperation_SolidFillAcceleration: - *supported = true; - break; - case FramebufferAccelerationOperation_ScreenCopyAcceleration: - *supported = true; - break; - default: - *supported = false; - } -#endif - return S_OK; -} - -/** * Returns whether we like the given video mode. * @@ -581,39 +551,4 @@ *supported = true; } - return S_OK; -} - -STDMETHODIMP VBoxSDLFB::SolidFill(ULONG x, ULONG y, ULONG width, ULONG height, - ULONG color, BOOL *handled) -{ - if (!handled) - return E_POINTER; - // SDL gives us software surfaces, futile -#if 0 - printf("SolidFill: x: %d, y: %d, w: %d, h: %d, color: %d\n", x, y, width, height, color); - SDL_Rect rect = { (Sint16)x, (Sint16)y, (Sint16)width, (Sint16)height }; - SDL_FillRect(mScreen, &rect, color); - //SDL_UpdateRect(mScreen, x, y, width, height); - *handled = true; -#else - *handled = false; -#endif - return S_OK; -} - -STDMETHODIMP VBoxSDLFB::CopyScreenBits(ULONG xDst, ULONG yDst, ULONG xSrc, ULONG ySrc, - ULONG width, ULONG height, BOOL *handled) -{ - if (!handled) - return E_POINTER; - // SDL gives us software surfaces, futile -#if 0 - SDL_Rect srcRect = { (Sint16)xSrc, (Sint16)ySrc, (Sint16)width, (Sint16)height }; - SDL_Rect dstRect = { (Sint16)xDst, (Sint16)yDst, (Sint16)width, (Sint16)height }; - SDL_BlitSurface(mScreen, &srcRect, mScreen, &dstRect); - *handled = true; -#else - *handled = false; -#endif return S_OK; } @@ -1558,23 +1493,4 @@ /** - * Queries whether we support a given accelerated opperation. Since we do not currently - * support any accelerated operations, we always return false in supported. - * - * @returns COM status code - * @param operation The operation being queried - * @retval supported Whether or not we support that operation - */ -STDMETHODIMP VBoxSDLFBOverlay::OperationSupported(FramebufferAccelerationOperation_T - operation, BOOL *supported) -{ - if (!supported) - return E_POINTER; - /* We currently do not support any acceleration here, and will probably not in - the forseeable future. */ - *supported = false; - return S_OK; -} - -/** * Returns whether we like the given video mode. * @@ -1598,42 +1514,2 @@ return S_OK; } - -/** - * Fill an area of the framebuffer with solid colour - * - * @returns COM status code - * @param x X co-ordinate of the area to fill, top-left corner - * @param y Y co-ordinate of the area to fill, top-left corner - * @param width width of the area to fill - * @param height height of the area to fill - * @param color colour with which to fill the area - * @retval handled whether we support this operation or not - * - * Since we currently do not have any way of doing this faster than - * the VGA device, we simply false in handled. - */ -STDMETHODIMP VBoxSDLFBOverlay::SolidFill(ULONG x, ULONG y, ULONG width, - ULONG height, ULONG color, BOOL *handled) -{ - LogFlow(("VBoxSDLFBOverlay::SolidFill called\n")); - if (!handled) - return E_POINTER; - *handled = false; - return S_OK; -} - -/** - * Since we currently do not have any way of doing this faster than - * the VGA device, we simply false in handled. - */ -STDMETHODIMP VBoxSDLFBOverlay::CopyScreenBits(ULONG xDst, ULONG yDst, ULONG xSrc, - ULONG ySrc, ULONG width, - ULONG height, BOOL *handled) -{ - LogFlow(("VBoxSDLFBOverlay::CopyScreenBits called.\n")); - if (!handled) - return E_POINTER; - *handled = false; - return S_OK; -} - Index: /trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.h =================================================================== --- /trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.h (revision 19797) +++ /trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.h (revision 19798) @@ -106,10 +106,5 @@ ULONG bitsPerPixel, ULONG bytesPerLine, 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); @@ -278,11 +273,5 @@ ULONG bitsPerPixel, ULONG bytesPerLine, 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); // internal public methods Index: /trunk/src/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h (revision 19797) +++ /trunk/src/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h (revision 19798) @@ -200,12 +200,6 @@ BOOL *aFinished); - STDMETHOD(OperationSupported)(FramebufferAccelerationOperation_T aOperation, - BOOL *aSupported); STDMETHOD(VideoModeSupported) (ULONG aWidth, ULONG aHeight, ULONG aBPP, BOOL *aSupported); - STDMETHOD(SolidFill) (ULONG aX, ULONG aY, ULONG aWidth, ULONG aHeight, - ULONG aColor, BOOL *aHandled); - STDMETHOD(CopyScreenBits) (ULONG aXDst, ULONG aYDst, ULONG aXSrc, ULONG aYSrc, - ULONG aWidth, ULONG aHeight, BOOL *aHandled); STDMETHOD(GetVisibleRegion)(BYTE *aRectangles, ULONG aCount, ULONG *aCountCopied); Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxFrameBuffer.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxFrameBuffer.cpp (revision 19797) +++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxFrameBuffer.cpp (revision 19798) @@ -187,15 +187,4 @@ } -STDMETHODIMP -VBoxFrameBuffer::OperationSupported (FramebufferAccelerationOperation_T aOperation, - BOOL *aSupported) -{ - NOREF(aOperation); - if (!aSupported) - return E_POINTER; - *aSupported = FALSE; - return S_OK; -} - /** * Returns whether we like the given video mode. @@ -228,36 +217,4 @@ LogFlowThisFunc(("screenW=%lu, screenH=%lu -> aSupported=%s\n", screen.width(), screen.height(), *aSupported ? "TRUE" : "FALSE")); - return S_OK; -} - -STDMETHODIMP VBoxFrameBuffer::SolidFill (ULONG aX, ULONG aY, - ULONG aWidth, ULONG aHeight, - ULONG aColor, BOOL *aHandled) -{ - NOREF(aX); - NOREF(aY); - NOREF(aWidth); - NOREF(aHeight); - NOREF(aColor); - if (!aHandled) - return E_POINTER; - *aHandled = FALSE; - return S_OK; -} - -STDMETHODIMP VBoxFrameBuffer::CopyScreenBits (ULONG aXDst, ULONG aYDst, - ULONG aXSrc, ULONG aYSrc, - ULONG aWidth, ULONG aHeight, - BOOL *aHandled) -{ - NOREF(aXDst); - NOREF(aYDst); - NOREF(aXSrc); - NOREF(aYSrc); - NOREF(aWidth); - NOREF(aHeight); - if (!aHandled) - return E_POINTER; - *aHandled = FALSE; return S_OK; } Index: /trunk/src/VBox/Main/DisplayImpl.cpp =================================================================== --- /trunk/src/VBox/Main/DisplayImpl.cpp (revision 19797) +++ /trunk/src/VBox/Main/DisplayImpl.cpp (revision 19798) @@ -1990,24 +1990,4 @@ 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 (); Index: /trunk/src/VBox/Main/FramebufferImpl.cpp =================================================================== --- /trunk/src/VBox/Main/FramebufferImpl.cpp (revision 19797) +++ /trunk/src/VBox/Main/FramebufferImpl.cpp (revision 19798) @@ -177,13 +177,4 @@ } -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,22 +186,4 @@ } -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) Index: /trunk/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h =================================================================== --- /trunk/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h (revision 19797) +++ /trunk/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h (revision 19798) @@ -1181,18 +1181,4 @@ -/* 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,10 +3743,4 @@ ); - nsresult (*OperationSupported)( - IFramebuffer *pThis, - PRUint32 operation, - PRBool * supported - ); - nsresult (*VideoModeSupported)( IFramebuffer *pThis, @@ -3769,25 +3749,4 @@ 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 ); Index: /trunk/src/VBox/Main/idl/VirtualBox.xidl =================================================================== --- /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 19797) +++ /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 19798) @@ -10248,16 +10248,4 @@ - - Frame buffer acceleration operation. - - - - - - - @@ -10519,20 +10507,4 @@ - - - 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. - - - - - @@ -10549,29 +10521,4 @@ - - - - - Fills the specified rectangle on screen with a solid color. - - - - - - - - - - - - Copies specified rectangle on the screen. - - - - - - - - Index: /trunk/src/VBox/Main/include/FramebufferImpl.h =================================================================== --- /trunk/src/VBox/Main/include/FramebufferImpl.h (revision 19797) +++ /trunk/src/VBox/Main/include/FramebufferImpl.h (revision 19798) @@ -69,11 +69,5 @@ 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);