VirtualBox

Changeset 22099 in vbox


Ignore:
Timestamp:
Aug 7, 2009 10:49:23 PM (16 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
50848
Message:

video hw accel: YUY2 format support debugged, bugfixes

Location:
trunk/src/VBox
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified trunk/src/VBox/Additions/WINNT/Graphics/Display/dd.c

    r22028 r22099  
    4848static DECLCALLBACK(void) vboxVHWASurfBltCompletion(PPDEV ppdev, VBOXVHWACMD * pCmd, void * pContext);
    4949static DECLCALLBACK(void) vboxVHWASurfFlipCompletion(PPDEV ppdev, VBOXVHWACMD * pCmd, void * pContext);
     50
     51//#define DBG_DDSTUBS 1
    5052#endif
    5153
     
    10031005    if(pDev->vhwaInfo.bVHWAEnabled)
    10041006    {
     1007#ifndef DBG_DDSTUBS
    10051008        DD_SURFACE_GLOBAL*  lpSurfaceGlobal = lpSurfaceLocal->lpGbl;
    10061009        PVBOXVHWASURFDESC pDesc = (PVBOXVHWASURFDESC)lpSurfaceGlobal->dwReserved1;
     
    10971100            }
    10981101        }
     1102#else
     1103        lpLock->ddRVal = DD_OK;
     1104#endif
    10991105        return DDHAL_DRIVER_NOTHANDLED;
    11001106    }
     
    11551161    if (pDev->vhwaInfo.bVHWAEnabled)
    11561162    {
     1163#ifndef DBG_DDSTUBS
    11571164        DD_SURFACE_LOCAL*   lpSurfaceLocal = lpUnlock->lpDDSurface;
    11581165        DD_SURFACE_GLOBAL*  lpSurfaceGlobal = lpSurfaceLocal->lpGbl;
     
    12091216            }
    12101217        }
     1218#else
     1219        lpUnlock->ddRVal = DD_OK;
     1220#endif
    12111221
    12121222        return DDHAL_DRIVER_NOTHANDLED;
     
    14091419
    14101420#ifdef VBOX_WITH_VIDEOHWACCEL
    1411 #if 1
     1421#ifndef DBG_DDSTUBS
    14121422DWORD APIENTRY DdSetColorKey(PDD_SETCOLORKEYDATA  lpSetColorKey)
    14131423{
  • TabularUnified trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r21939 r22099  
    189189 VirtualBox_DEFS        += VBOX_WITH_VIDEOHWACCEL \
    190190            VBOX_GUI_USE_QGL
     191else ifdef VBOX_GUI_USE_QGL
     192 VirtualBox_DEFS        += VBOX_GUI_USE_QGL
    191193endif
    192194
     
    227229endif
    228230
    229 ifdef VBOX_WITH_VIDEOHWACCEL
     231if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
    230232 VirtualBox_LIBS.win     += $(PATH_SDK_WINPSDK_LIB)/Opengl32.lib
    231233endif
     
    454456endif
    455457
    456 ifdef VBOX_WITH_VIDEOHWACCEL
     458if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
    457459 VirtualBox_SOURCES += \
    458460        src/VBoxFBQGL.cpp
     
    462464VirtualBox_QT_MODULES = Core Gui Network
    463465
    464 ifdef VBOX_WITH_VIDEOHWACCEL
     466if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
    465467VirtualBox_QT_MODULES += OpenGL
    466468endif
     
    476478VirtualBox_SOURCES += $(VBOX_VIRTUALBOX4_OUT_DIR)/VirtualBoxBrand.qrc
    477479$(VBOX_VIRTUALBOX4_OUT_DIR)/VirtualBoxBrand.qrc_RCCFLAGS = -name BRAND
    478 ifdef VBOX_WITH_VIDEOHWACCEL
     480if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
    479481VirtualBox_SOURCES += VirtualBoxShaders.qrc
    480482VirtualBoxShaders.qrc_RCCFLAGS = -name SHADERS
  • TabularUnified trunk/src/VBox/Frontends/VirtualBox/include/VBoxDefs.h

    r21939 r22099  
    8383    {
    8484        InvalidRenderMode, TimerMode, QImageMode, SDLMode, DDRAWMode, Quartz2DMode
    85 #ifdef VBOX_WITH_VIDEOHWACCEL
     85#ifdef VBOX_GUI_USE_QGL
    8686        , QGLMode
    8787#endif
  • TabularUnified trunk/src/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h

    r22028 r22099  
    2424#define ___VBoxFrameBuffer_h___
    2525//#define VBOXQGL_PROF_BASE 1
     26//#define VBOXQGL_DBG_SURF 1
    2627#include "COMDefs.h"
    2728#include <iprt/critsect.h>
     
    965966    class VBoxVHWASurfList * getComplexList() {return mComplexList; }
    966967
    967 //    bool isOverlay() { return mIsOverlay; }
    968 
    969 #ifdef VBOX_WITH_VIDEOHWACCEL
    970968    class VBoxVHWAGlProgramMngr * getGlProgramMngr();
    971969    static int setCKey(class VBoxVHWAGlProgramVHWA * pProgram, const VBoxVHWAColorFormat * pFormat, const VBoxVHWAColorKey * pCKey, bool bDst);
    972 #endif
    973970private:
    974971    void setComplexList(VBoxVHWASurfList *aComplexList) { mComplexList = aComplexList; }
     
    12331230
    12341231    uchar *vboxAddress() { return mDisplay.getVGA() ? mDisplay.getVGA()->address() : NULL; }
     1232#ifdef VBOX_WITH_VIDEOHWACCEL
    12351233    uchar *vboxVRAMAddressFromOffset(uint64_t offset);
     1234#endif
    12361235    ulong vboxBitsPerPixel() { return mDisplay.getVGA()->bitsPerPixel(); }
    12371236    ulong vboxBytesPerLine() { return mDisplay.getVGA() ? mDisplay.getVGA()->bytesPerLine() : NULL; }
     
    12421241    void vboxPaintEvent (QPaintEvent *pe) {vboxPerformGLOp(&VBoxGLWidget::vboxDoPaint, pe);}
    12431242    void vboxResizeEvent (VBoxResizeEvent *re) {vboxPerformGLOp(&VBoxGLWidget::vboxDoResize, re);}
    1244 #ifdef DEBUG_misha
    1245     void vboxTestSurfaces () {vboxPerformGLOp(&VBoxGLWidget::vboxDoTestSurfaces, NULL);}
    1246 #endif
     1243//#ifdef VBOXQGL_DBG_SURF
     1244//    void vboxTestSurfaces () {vboxPerformGLOp(&VBoxGLWidget::vboxDoTestSurfaces, NULL);}
     1245//#endif
    12471246    void vboxProcessVHWACommands(VBoxVHWACommandProcessEvent * pEvent) {vboxPerformGLOp(&VBoxGLWidget::vboxDoProcessVHWACommands, pEvent);}
    12481247#ifdef VBOX_WITH_VIDEOHWACCEL
    12491248    void vboxVHWACmd (struct _VBOXVHWACMD * pCmd) {vboxPerformGLOp(&VBoxGLWidget::vboxDoVHWACmd, pCmd);}
     1249#endif
    12501250    class VBoxVHWAGlProgramMngr * vboxVHWAGetGlProgramMngr() { return mpMngr; }
    1251 #endif
    12521251
    12531252    VBoxVHWASurfaceBase * vboxGetVGASurface() { return mDisplay.getVGA(); }
     
    12861285
    12871286    void vboxDoUpdateRect(const QRect * pRect);
    1288 #ifdef DEBUG_misha
     1287#ifdef VBOXQGL_DBG_SURF
    12891288    void vboxDoTestSurfaces(void *context);
    12901289#endif
     
    12931292    void vboxCheckUpdateAddress (VBoxVHWASurfaceBase * pSurface, uint64_t offset)
    12941293    {
     1294#ifndef VBOXQGL_DBG_SURF
     1295        if(offset == 0xffffffff)
     1296        {
     1297                return;
     1298        }
     1299#endif
    12951300        if (pSurface->addressAlocated())
    12961301        {
     
    13561361    int32_t mcRemaining2Contruct;
    13571362
    1358 #ifdef VBOX_WITH_VIDEOHWACCEL
    13591363    class VBoxVHWAGlProgramMngr *mpMngr;
    1360 #endif
    13611364};
    13621365
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette