Changeset 22099 in vbox
- Timestamp:
- Aug 7, 2009 10:49:23 PM (16 years ago)
- svn:sync-xref-src-repo-rev:
- 50848
- Location:
- trunk/src/VBox
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified trunk/src/VBox/Additions/WINNT/Graphics/Display/dd.c ¶
r22028 r22099 48 48 static DECLCALLBACK(void) vboxVHWASurfBltCompletion(PPDEV ppdev, VBOXVHWACMD * pCmd, void * pContext); 49 49 static DECLCALLBACK(void) vboxVHWASurfFlipCompletion(PPDEV ppdev, VBOXVHWACMD * pCmd, void * pContext); 50 51 //#define DBG_DDSTUBS 1 50 52 #endif 51 53 … … 1003 1005 if(pDev->vhwaInfo.bVHWAEnabled) 1004 1006 { 1007 #ifndef DBG_DDSTUBS 1005 1008 DD_SURFACE_GLOBAL* lpSurfaceGlobal = lpSurfaceLocal->lpGbl; 1006 1009 PVBOXVHWASURFDESC pDesc = (PVBOXVHWASURFDESC)lpSurfaceGlobal->dwReserved1; … … 1097 1100 } 1098 1101 } 1102 #else 1103 lpLock->ddRVal = DD_OK; 1104 #endif 1099 1105 return DDHAL_DRIVER_NOTHANDLED; 1100 1106 } … … 1155 1161 if (pDev->vhwaInfo.bVHWAEnabled) 1156 1162 { 1163 #ifndef DBG_DDSTUBS 1157 1164 DD_SURFACE_LOCAL* lpSurfaceLocal = lpUnlock->lpDDSurface; 1158 1165 DD_SURFACE_GLOBAL* lpSurfaceGlobal = lpSurfaceLocal->lpGbl; … … 1209 1216 } 1210 1217 } 1218 #else 1219 lpUnlock->ddRVal = DD_OK; 1220 #endif 1211 1221 1212 1222 return DDHAL_DRIVER_NOTHANDLED; … … 1409 1419 1410 1420 #ifdef VBOX_WITH_VIDEOHWACCEL 1411 #if 11421 #ifndef DBG_DDSTUBS 1412 1422 DWORD APIENTRY DdSetColorKey(PDD_SETCOLORKEYDATA lpSetColorKey) 1413 1423 { -
TabularUnified trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk ¶
r21939 r22099 189 189 VirtualBox_DEFS += VBOX_WITH_VIDEOHWACCEL \ 190 190 VBOX_GUI_USE_QGL 191 else ifdef VBOX_GUI_USE_QGL 192 VirtualBox_DEFS += VBOX_GUI_USE_QGL 191 193 endif 192 194 … … 227 229 endif 228 230 229 if def VBOX_WITH_VIDEOHWACCEL231 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL) 230 232 VirtualBox_LIBS.win += $(PATH_SDK_WINPSDK_LIB)/Opengl32.lib 231 233 endif … … 454 456 endif 455 457 456 if def VBOX_WITH_VIDEOHWACCEL458 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL) 457 459 VirtualBox_SOURCES += \ 458 460 src/VBoxFBQGL.cpp … … 462 464 VirtualBox_QT_MODULES = Core Gui Network 463 465 464 if def VBOX_WITH_VIDEOHWACCEL466 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL) 465 467 VirtualBox_QT_MODULES += OpenGL 466 468 endif … … 476 478 VirtualBox_SOURCES += $(VBOX_VIRTUALBOX4_OUT_DIR)/VirtualBoxBrand.qrc 477 479 $(VBOX_VIRTUALBOX4_OUT_DIR)/VirtualBoxBrand.qrc_RCCFLAGS = -name BRAND 478 if def VBOX_WITH_VIDEOHWACCEL480 if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL) 479 481 VirtualBox_SOURCES += VirtualBoxShaders.qrc 480 482 VirtualBoxShaders.qrc_RCCFLAGS = -name SHADERS -
TabularUnified trunk/src/VBox/Frontends/VirtualBox/include/VBoxDefs.h ¶
r21939 r22099 83 83 { 84 84 InvalidRenderMode, TimerMode, QImageMode, SDLMode, DDRAWMode, Quartz2DMode 85 #ifdef VBOX_ WITH_VIDEOHWACCEL85 #ifdef VBOX_GUI_USE_QGL 86 86 , QGLMode 87 87 #endif -
TabularUnified trunk/src/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h ¶
r22028 r22099 24 24 #define ___VBoxFrameBuffer_h___ 25 25 //#define VBOXQGL_PROF_BASE 1 26 //#define VBOXQGL_DBG_SURF 1 26 27 #include "COMDefs.h" 27 28 #include <iprt/critsect.h> … … 965 966 class VBoxVHWASurfList * getComplexList() {return mComplexList; } 966 967 967 // bool isOverlay() { return mIsOverlay; }968 969 #ifdef VBOX_WITH_VIDEOHWACCEL970 968 class VBoxVHWAGlProgramMngr * getGlProgramMngr(); 971 969 static int setCKey(class VBoxVHWAGlProgramVHWA * pProgram, const VBoxVHWAColorFormat * pFormat, const VBoxVHWAColorKey * pCKey, bool bDst); 972 #endif973 970 private: 974 971 void setComplexList(VBoxVHWASurfList *aComplexList) { mComplexList = aComplexList; } … … 1233 1230 1234 1231 uchar *vboxAddress() { return mDisplay.getVGA() ? mDisplay.getVGA()->address() : NULL; } 1232 #ifdef VBOX_WITH_VIDEOHWACCEL 1235 1233 uchar *vboxVRAMAddressFromOffset(uint64_t offset); 1234 #endif 1236 1235 ulong vboxBitsPerPixel() { return mDisplay.getVGA()->bitsPerPixel(); } 1237 1236 ulong vboxBytesPerLine() { return mDisplay.getVGA() ? mDisplay.getVGA()->bytesPerLine() : NULL; } … … 1242 1241 void vboxPaintEvent (QPaintEvent *pe) {vboxPerformGLOp(&VBoxGLWidget::vboxDoPaint, pe);} 1243 1242 void vboxResizeEvent (VBoxResizeEvent *re) {vboxPerformGLOp(&VBoxGLWidget::vboxDoResize, re);} 1244 #ifdef DEBUG_misha 1245 void vboxTestSurfaces () {vboxPerformGLOp(&VBoxGLWidget::vboxDoTestSurfaces, NULL);}1246 #endif1243 //#ifdef VBOXQGL_DBG_SURF 1244 // void vboxTestSurfaces () {vboxPerformGLOp(&VBoxGLWidget::vboxDoTestSurfaces, NULL);} 1245 //#endif 1247 1246 void vboxProcessVHWACommands(VBoxVHWACommandProcessEvent * pEvent) {vboxPerformGLOp(&VBoxGLWidget::vboxDoProcessVHWACommands, pEvent);} 1248 1247 #ifdef VBOX_WITH_VIDEOHWACCEL 1249 1248 void vboxVHWACmd (struct _VBOXVHWACMD * pCmd) {vboxPerformGLOp(&VBoxGLWidget::vboxDoVHWACmd, pCmd);} 1249 #endif 1250 1250 class VBoxVHWAGlProgramMngr * vboxVHWAGetGlProgramMngr() { return mpMngr; } 1251 #endif1252 1251 1253 1252 VBoxVHWASurfaceBase * vboxGetVGASurface() { return mDisplay.getVGA(); } … … 1286 1285 1287 1286 void vboxDoUpdateRect(const QRect * pRect); 1288 #ifdef DEBUG_misha1287 #ifdef VBOXQGL_DBG_SURF 1289 1288 void vboxDoTestSurfaces(void *context); 1290 1289 #endif … … 1293 1292 void vboxCheckUpdateAddress (VBoxVHWASurfaceBase * pSurface, uint64_t offset) 1294 1293 { 1294 #ifndef VBOXQGL_DBG_SURF 1295 if(offset == 0xffffffff) 1296 { 1297 return; 1298 } 1299 #endif 1295 1300 if (pSurface->addressAlocated()) 1296 1301 { … … 1356 1361 int32_t mcRemaining2Contruct; 1357 1362 1358 #ifdef VBOX_WITH_VIDEOHWACCEL1359 1363 class VBoxVHWAGlProgramMngr *mpMngr; 1360 #endif1361 1364 }; 1362 1365
Note:
See TracChangeset
for help on using the changeset viewer.