Changeset 38930 in vbox
- Timestamp:
- Oct 3, 2011 8:45:54 AM (13 years ago)
- Location:
- trunk/src/VBox/Additions/WINNT/Graphics
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.cpp
r38903 r38930 103 103 #define VBOXDISPPROFILE_DDI_REPORT_FRAME(_pDev) do {} while (0) 104 104 #endif 105 106 /* debugging/profiling stuff could go here. 107 * NOP in release */ 108 #define VBOXDISP_DDI_PROLOGUE() \ 109 VBOXVDBG_BREAK_DDI(); \ 110 VBOXDISPPROFILE_FUNCTION_DDI_PROLOGUE(); 105 111 106 112 #ifdef VBOXDISPMP_TEST … … 2331 2337 { 2332 2338 PVBOXWDDMDISP_RENDERTGT pRT = &pSwapchain->aRTs[i]; 2333 BOOL fHasSurf = !!pRT->pAlloc->pRc->aAllocations[0].pD3DIf; 2339 if (pRT->pAlloc->enmD3DIfType != VBOXDISP_D3DIFTYPE_SURFACE) 2340 continue; 2341 BOOL fHasSurf = !!pRT->pAlloc->pRc->aAllocations[i].pD3DIf; 2334 2342 if (!fForceCreate && !fHasSurf) 2335 2343 continue; … … 2401 2409 } 2402 2410 2403 pRT->pAlloc->pD3DIf->Release(); 2411 if (pRT->pAlloc->pD3DIf) 2412 pRT->pAlloc->pD3DIf->Release(); 2404 2413 pRT->pAlloc->pD3DIf = pD3D9NewSurf; 2405 2414 if (pD3D9OldSurf) … … 2462 2471 HRESULT hr = S_OK; 2463 2472 BOOL bReuseSwapchain = FALSE; 2473 BOOL fNeedRtPresentSwitch = FALSE; 2464 2474 2465 2475 if (pSwapchain->fFlags.bSwitchReportingPresent || pSwapchain->cRTs > VBOXWDDMDISP_MAX_DIRECT_RTS) 2466 2476 { 2467 2477 pSwapchain->fFlags.bSwitchReportingPresent = FALSE; 2468 /* switch to Render Target Reporting Present mode */ 2469 vboxWddmSwapchainSwtichRtPresent(pDevice, pSwapchain); 2478 /* indicae switch to Render Target Reporting Present mode is needed */ 2479 fNeedRtPresentSwitch = TRUE; 2480 // vboxWddmSwapchainSwtichRtPresent(pDevice, pSwapchain); 2470 2481 } 2471 2482 … … 2473 2484 if (pOldIf) 2474 2485 { 2475 if ( pSwapchain->fFlags.bRtReportingPresent)2486 if (fNeedRtPresentSwitch) 2476 2487 { 2477 2488 /* the number of swapchain backbuffers does not matter */ … … 2577 2588 } 2578 2589 2579 if (hr == S_OK) 2580 { 2581 Assert(pNewIf); 2582 pSwapchain->pSwapChainIf = pNewIf; 2590 if (FAILED(hr)) 2591 return hr; 2592 2593 Assert(pNewIf); 2594 pSwapchain->pSwapChainIf = pNewIf; 2595 2596 if (fNeedRtPresentSwitch) 2597 { 2598 hr = vboxWddmSwapchainSwtichRtPresent(pDevice, pSwapchain); 2599 } 2600 else 2601 { 2583 2602 #ifndef VBOXWDDM_WITH_VISIBLE_FB 2584 2603 if (!pSwapchain->fFlags.bRtReportingPresent) … … 2622 2641 } 2623 2642 #endif 2624 if (hr == S_OK) 2625 { 2643 } 2644 2645 /* ignore any subsequen failures */ 2646 Assert(hr == S_OK); 2647 2648 2626 2649 #ifdef DEBUG 2627 for (UINT i = 0; i < cSurfs; ++i) 2628 { 2629 PVBOXWDDMDISP_RENDERTGT pRt = &pSwapchain->aRTs[i]; 2630 Assert(pRt->pAlloc->enmD3DIfType == VBOXDISP_D3DIFTYPE_SURFACE 2631 || pRt->pAlloc->enmD3DIfType == VBOXDISP_D3DIFTYPE_TEXTURE); 2632 Assert(pRt->pAlloc->pRc->RcDesc.enmPool == D3DDDIPOOL_LOCALVIDMEM); 2633 } 2634 #endif 2635 hr = vboxWddmSwapchainSynch(pDevice, pSwapchain); 2636 Assert(hr == S_OK); 2637 if (hr == S_OK) 2638 { 2639 2640 Assert(hr == S_OK); 2641 if (hr == S_OK) 2642 { 2643 Assert(!pSwapchain->fFlags.bChanged); 2644 Assert(!pSwapchain->fFlags.bSwitchReportingPresent); 2645 if (pOldIf) 2646 { 2647 Assert(hOldWnd); 2648 pOldIf->Release(); 2649 } 2650 else 2651 { 2652 Assert(!hOldWnd); 2653 } 2654 return S_OK; 2655 } 2656 } 2657 pNewIf->Release(); 2658 pSwapchain->pSwapChainIf = pOldIf; 2659 } 2660 2661 Assert(hr != S_OK); 2662 pSwapchain->hWnd = hOldWnd; 2663 } 2664 2665 return hr; 2650 for (UINT i = 0; i < cSurfs; ++i) 2651 { 2652 PVBOXWDDMDISP_RENDERTGT pRt = &pSwapchain->aRTs[i]; 2653 Assert(pRt->pAlloc->enmD3DIfType == VBOXDISP_D3DIFTYPE_SURFACE 2654 || pRt->pAlloc->enmD3DIfType == VBOXDISP_D3DIFTYPE_TEXTURE); 2655 Assert(pRt->pAlloc->pRc->RcDesc.enmPool != D3DDDIPOOL_SYSTEMMEM); 2656 } 2657 #endif 2658 2659 hr = vboxWddmSwapchainSynch(pDevice, pSwapchain); 2660 Assert(hr == S_OK); 2661 2662 Assert(!pSwapchain->fFlags.bChanged); 2663 Assert(!pSwapchain->fFlags.bSwitchReportingPresent); 2664 if (pOldIf) 2665 { 2666 Assert(hOldWnd); 2667 pOldIf->Release(); 2668 } 2669 else 2670 { 2671 Assert(!hOldWnd); 2672 } 2673 return S_OK; 2666 2674 } 2667 2675 … … 3371 3379 case D3DDDICAPS_GETDECODEGUIDCOUNT: 3372 3380 case D3DDDICAPS_GETVIDEOPROCESSORDEVICEGUIDCOUNT: 3381 case D3DDDICAPS_GETVIDEOPROCESSORRTFORMATCOUNT: 3373 3382 if (pData->pData && pData->DataSize) 3374 3383 memset(pData->pData, 0, pData->DataSize); … … 3385 3394 case D3DDDICAPS_GETDECODECONFIGURATIONS: 3386 3395 case D3DDDICAPS_GETVIDEOPROCESSORDEVICEGUIDS: 3387 case D3DDDICAPS_GETVIDEOPROCESSORRTFORMATCOUNT:3388 3396 case D3DDDICAPS_GETVIDEOPROCESSORRTFORMATS: 3389 3397 case D3DDDICAPS_GETVIDEOPROCESSORRTSUBSTREAMFORMATCOUNT: … … 3410 3418 static HRESULT APIENTRY vboxWddmDDevSetRenderState(HANDLE hDevice, CONST D3DDDIARG_RENDERSTATE* pData) 3411 3419 { 3412 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();3420 VBOXDISP_DDI_PROLOGUE(); 3413 3421 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 3414 3422 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 3424 3432 static HRESULT APIENTRY vboxWddmDDevUpdateWInfo(HANDLE hDevice, CONST D3DDDIARG_WINFO* pData) 3425 3433 { 3426 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();3434 VBOXDISP_DDI_PROLOGUE(); 3427 3435 // PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; 3428 3436 // VBOXDISPCRHGSMI_SCOPE_SET_DEV(pDevice); … … 3434 3442 static HRESULT APIENTRY vboxWddmDDevValidateDevice(HANDLE hDevice, D3DDDIARG_VALIDATETEXTURESTAGESTATE* pData) 3435 3443 { 3436 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();3444 VBOXDISP_DDI_PROLOGUE(); 3437 3445 // PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; 3438 3446 // VBOXDISPCRHGSMI_SCOPE_SET_DEV(pDevice); … … 3449 3457 static HRESULT APIENTRY vboxWddmDDevSetTextureStageState(HANDLE hDevice, CONST D3DDDIARG_TEXTURESTAGESTATE* pData) 3450 3458 { 3451 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();3459 VBOXDISP_DDI_PROLOGUE(); 3452 3460 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 3453 3461 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 3475 3483 static HRESULT APIENTRY vboxWddmDDevSetTexture(HANDLE hDevice, UINT Stage, HANDLE hTexture) 3476 3484 { 3477 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();3485 VBOXDISP_DDI_PROLOGUE(); 3478 3486 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 3479 3487 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 3516 3524 static HRESULT APIENTRY vboxWddmDDevSetPixelShader(HANDLE hDevice, HANDLE hShaderHandle) 3517 3525 { 3518 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();3526 VBOXDISP_DDI_PROLOGUE(); 3519 3527 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 3520 3528 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 3531 3539 static HRESULT APIENTRY vboxWddmDDevSetPixelShaderConst(HANDLE hDevice, CONST D3DDDIARG_SETPIXELSHADERCONST* pData, CONST FLOAT* pRegisters) 3532 3540 { 3533 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();3541 VBOXDISP_DDI_PROLOGUE(); 3534 3542 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 3535 3543 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 3545 3553 static HRESULT APIENTRY vboxWddmDDevSetStreamSourceUm(HANDLE hDevice, CONST D3DDDIARG_SETSTREAMSOURCEUM* pData, CONST VOID* pUMBuffer ) 3546 3554 { 3547 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();3555 VBOXDISP_DDI_PROLOGUE(); 3548 3556 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 3549 3557 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 3571 3579 static HRESULT APIENTRY vboxWddmDDevSetIndices(HANDLE hDevice, CONST D3DDDIARG_SETINDICES* pData) 3572 3580 { 3573 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();3581 VBOXDISP_DDI_PROLOGUE(); 3574 3582 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 3575 3583 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 3601 3609 static HRESULT APIENTRY vboxWddmDDevSetIndicesUm(HANDLE hDevice, UINT IndexSize, CONST VOID* pUMBuffer) 3602 3610 { 3603 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();3611 VBOXDISP_DDI_PROLOGUE(); 3604 3612 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 3605 3613 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 3616 3624 static HRESULT APIENTRY vboxWddmDDevDrawPrimitive(HANDLE hDevice, CONST D3DDDIARG_DRAWPRIMITIVE* pData, CONST UINT* pFlagBuffer) 3617 3625 { 3618 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();3626 VBOXDISP_DDI_PROLOGUE(); 3619 3627 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 3620 3628 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 3692 3700 static HRESULT APIENTRY vboxWddmDDevDrawIndexedPrimitive(HANDLE hDevice, CONST D3DDDIARG_DRAWINDEXEDPRIMITIVE* pData) 3693 3701 { 3694 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();3702 VBOXDISP_DDI_PROLOGUE(); 3695 3703 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 3696 3704 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 3743 3751 static HRESULT APIENTRY vboxWddmDDevDrawRectPatch(HANDLE hDevice, CONST D3DDDIARG_DRAWRECTPATCH* pData, CONST D3DDDIRECTPATCH_INFO* pInfo, CONST FLOAT* pPatch) 3744 3752 { 3745 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();3753 VBOXDISP_DDI_PROLOGUE(); 3746 3754 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 3747 3755 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 3756 3764 static HRESULT APIENTRY vboxWddmDDevDrawTriPatch(HANDLE hDevice, CONST D3DDDIARG_DRAWTRIPATCH* pData, CONST D3DDDITRIPATCH_INFO* pInfo, CONST FLOAT* pPatch) 3757 3765 { 3758 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();3766 VBOXDISP_DDI_PROLOGUE(); 3759 3767 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 3760 3768 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 3769 3777 static HRESULT APIENTRY vboxWddmDDevDrawPrimitive2(HANDLE hDevice, CONST D3DDDIARG_DRAWPRIMITIVE2* pData) 3770 3778 { 3771 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();3779 VBOXDISP_DDI_PROLOGUE(); 3772 3780 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 3773 3781 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 3864 3872 static HRESULT APIENTRY vboxWddmDDevDrawIndexedPrimitive2(HANDLE hDevice, CONST D3DDDIARG_DRAWINDEXEDPRIMITIVE2* pData, UINT dwIndicesSize, CONST VOID* pIndexBuffer, CONST UINT* pFlagBuffer) 3865 3873 { 3866 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();3874 VBOXDISP_DDI_PROLOGUE(); 3867 3875 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 3868 3876 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 3877 3885 static HRESULT APIENTRY vboxWddmDDevVolBlt(HANDLE hDevice, CONST D3DDDIARG_VOLUMEBLT* pData) 3878 3886 { 3879 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();3887 VBOXDISP_DDI_PROLOGUE(); 3880 3888 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 3881 3889 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 3890 3898 static HRESULT APIENTRY vboxWddmDDevBufBlt(HANDLE hDevice, CONST D3DDDIARG_BUFFERBLT* pData) 3891 3899 { 3892 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();3900 VBOXDISP_DDI_PROLOGUE(); 3893 3901 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 3894 3902 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 3903 3911 static HRESULT APIENTRY vboxWddmDDevTexBlt(HANDLE hDevice, CONST D3DDDIARG_TEXBLT* pData) 3904 3912 { 3905 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();3913 VBOXDISP_DDI_PROLOGUE(); 3906 3914 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 3907 3915 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 3985 3993 static HRESULT APIENTRY vboxWddmDDevStateSet(HANDLE hDevice, D3DDDIARG_STATESET* pData) 3986 3994 { 3987 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();3995 VBOXDISP_DDI_PROLOGUE(); 3988 3996 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 3989 3997 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 3996 4004 static HRESULT APIENTRY vboxWddmDDevSetPriority(HANDLE hDevice, CONST D3DDDIARG_SETPRIORITY* pData) 3997 4005 { 3998 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();4006 VBOXDISP_DDI_PROLOGUE(); 3999 4007 // PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; 4000 4008 // Assert(pDevice); … … 4016 4024 static HRESULT APIENTRY vboxWddmDDevClear(HANDLE hDevice, CONST D3DDDIARG_CLEAR* pData, UINT NumRect, CONST RECT* pRect) 4017 4025 { 4018 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();4026 VBOXDISP_DDI_PROLOGUE(); 4019 4027 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 4020 4028 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 4033 4041 static HRESULT APIENTRY vboxWddmDDevUpdatePalette(HANDLE hDevice, CONST D3DDDIARG_UPDATEPALETTE* pData, CONST PALETTEENTRY* pPaletteData) 4034 4042 { 4035 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();4043 VBOXDISP_DDI_PROLOGUE(); 4036 4044 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 4037 4045 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 4045 4053 static HRESULT APIENTRY vboxWddmDDevSetPalette(HANDLE hDevice, CONST D3DDDIARG_SETPALETTE* pData) 4046 4054 { 4047 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();4055 VBOXDISP_DDI_PROLOGUE(); 4048 4056 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 4049 4057 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 4057 4065 static HRESULT APIENTRY vboxWddmDDevSetVertexShaderConst(HANDLE hDevice, CONST D3DDDIARG_SETVERTEXSHADERCONST* pData , CONST VOID* pRegisters) 4058 4066 { 4059 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();4067 VBOXDISP_DDI_PROLOGUE(); 4060 4068 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 4061 4069 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 4073 4081 static HRESULT APIENTRY vboxWddmDDevMultiplyTransform(HANDLE hDevice, CONST D3DDDIARG_MULTIPLYTRANSFORM* pData) 4074 4082 { 4075 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();4083 VBOXDISP_DDI_PROLOGUE(); 4076 4084 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 4077 4085 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 4084 4092 static HRESULT APIENTRY vboxWddmDDevSetTransform(HANDLE hDevice, CONST D3DDDIARG_SETTRANSFORM* pData) 4085 4093 { 4086 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();4094 VBOXDISP_DDI_PROLOGUE(); 4087 4095 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 4088 4096 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 4095 4103 static HRESULT APIENTRY vboxWddmDDevSetViewport(HANDLE hDevice, CONST D3DDDIARG_VIEWPORTINFO* pData) 4096 4104 { 4097 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();4105 VBOXDISP_DDI_PROLOGUE(); 4098 4106 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 4099 4107 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 4113 4121 static HRESULT APIENTRY vboxWddmDDevSetZRange(HANDLE hDevice, CONST D3DDDIARG_ZRANGE* pData) 4114 4122 { 4115 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();4123 VBOXDISP_DDI_PROLOGUE(); 4116 4124 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 4117 4125 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 4129 4137 static HRESULT APIENTRY vboxWddmDDevSetMaterial(HANDLE hDevice, CONST D3DDDIARG_SETMATERIAL* pData) 4130 4138 { 4131 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();4139 VBOXDISP_DDI_PROLOGUE(); 4132 4140 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 4133 4141 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 4140 4148 static HRESULT APIENTRY vboxWddmDDevSetLight(HANDLE hDevice, CONST D3DDDIARG_SETLIGHT* pData, CONST D3DDDI_LIGHT* pLightProperties) 4141 4149 { 4142 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();4150 VBOXDISP_DDI_PROLOGUE(); 4143 4151 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 4144 4152 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 4151 4159 static HRESULT APIENTRY vboxWddmDDevCreateLight(HANDLE hDevice, CONST D3DDDIARG_CREATELIGHT* pData) 4152 4160 { 4153 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();4161 VBOXDISP_DDI_PROLOGUE(); 4154 4162 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 4155 4163 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 4162 4170 static HRESULT APIENTRY vboxWddmDDevDestroyLight(HANDLE hDevice, CONST D3DDDIARG_DESTROYLIGHT* pData) 4163 4171 { 4164 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();4172 VBOXDISP_DDI_PROLOGUE(); 4165 4173 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 4166 4174 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 4173 4181 static HRESULT APIENTRY vboxWddmDDevSetClipPlane(HANDLE hDevice, CONST D3DDDIARG_SETCLIPPLANE* pData) 4174 4182 { 4175 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();4183 VBOXDISP_DDI_PROLOGUE(); 4176 4184 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 4177 4185 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 4188 4196 static HRESULT APIENTRY vboxWddmDDevGetInfo(HANDLE hDevice, UINT DevInfoID, VOID* pDevInfoStruct, UINT DevInfoSize) 4189 4197 { 4190 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();4198 VBOXDISP_DDI_PROLOGUE(); 4191 4199 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 4192 4200 // PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 4221 4229 static HRESULT APIENTRY vboxWddmDDevLock(HANDLE hDevice, D3DDDIARG_LOCK* pData) 4222 4230 { 4223 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();4231 VBOXDISP_DDI_PROLOGUE(); 4224 4232 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 4225 4233 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 4652 4660 static HRESULT APIENTRY vboxWddmDDevUnlock(HANDLE hDevice, CONST D3DDDIARG_UNLOCK* pData) 4653 4661 { 4654 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();4662 VBOXDISP_DDI_PROLOGUE(); 4655 4663 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 4656 4664 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 4827 4835 static HRESULT APIENTRY vboxWddmDDevLockAsync(HANDLE hDevice, D3DDDIARG_LOCKASYNC* pData) 4828 4836 { 4829 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();4837 VBOXDISP_DDI_PROLOGUE(); 4830 4838 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 4831 4839 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 4838 4846 static HRESULT APIENTRY vboxWddmDDevUnlockAsync(HANDLE hDevice, CONST D3DDDIARG_UNLOCKASYNC* pData) 4839 4847 { 4840 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();4848 VBOXDISP_DDI_PROLOGUE(); 4841 4849 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 4842 4850 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 4849 4857 static HRESULT APIENTRY vboxWddmDDevRename(HANDLE hDevice, CONST D3DDDIARG_RENAME* pData) 4850 4858 { 4851 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();4859 VBOXDISP_DDI_PROLOGUE(); 4852 4860 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 4853 4861 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 4903 4911 static HRESULT APIENTRY vboxWddmDDevCreateResource(HANDLE hDevice, D3DDDIARG_CREATERESOURCE* pResource) 4904 4912 { 4905 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();4913 VBOXDISP_DDI_PROLOGUE(); 4906 4914 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 4907 4915 HRESULT hr = S_OK; … … 5507 5515 static HRESULT APIENTRY vboxWddmDDevDestroyResource(HANDLE hDevice, HANDLE hResource) 5508 5516 { 5509 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();5517 VBOXDISP_DDI_PROLOGUE(); 5510 5518 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 5511 5519 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 5591 5599 static HRESULT APIENTRY vboxWddmDDevSetDisplayMode(HANDLE hDevice, CONST D3DDDIARG_SETDISPLAYMODE* pData) 5592 5600 { 5593 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();5601 VBOXDISP_DDI_PROLOGUE(); 5594 5602 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 5595 5603 HRESULT hr = S_OK; … … 5670 5678 static HRESULT APIENTRY vboxWddmDDevPresent(HANDLE hDevice, CONST D3DDDIARG_PRESENT* pData) 5671 5679 { 5672 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();5680 VBOXDISP_DDI_PROLOGUE(); 5673 5681 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 5674 5682 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 5728 5736 static HRESULT APIENTRY vboxWddmDDevFlush(HANDLE hDevice) 5729 5737 { 5730 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();5738 VBOXDISP_DDI_PROLOGUE(); 5731 5739 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 5732 5740 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 5765 5773 static HRESULT APIENTRY vboxWddmDDevCreateVertexShaderDecl(HANDLE hDevice, D3DDDIARG_CREATEVERTEXSHADERDECL* pData, CONST D3DDDIVERTEXELEMENT* pVertexElements) 5766 5774 { 5767 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();5775 VBOXDISP_DDI_PROLOGUE(); 5768 5776 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 5769 5777 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 5813 5821 static HRESULT APIENTRY vboxWddmDDevSetVertexShaderDecl(HANDLE hDevice, HANDLE hShaderHandle) 5814 5822 { 5815 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();5823 VBOXDISP_DDI_PROLOGUE(); 5816 5824 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 5817 5825 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 5828 5836 static HRESULT APIENTRY vboxWddmDDevDeleteVertexShaderDecl(HANDLE hDevice, HANDLE hShaderHandle) 5829 5837 { 5830 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();5838 VBOXDISP_DDI_PROLOGUE(); 5831 5839 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 5832 5840 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 5841 5849 static HRESULT APIENTRY vboxWddmDDevCreateVertexShaderFunc(HANDLE hDevice, D3DDDIARG_CREATEVERTEXSHADERFUNC* pData, CONST UINT* pCode) 5842 5850 { 5843 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();5851 VBOXDISP_DDI_PROLOGUE(); 5844 5852 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 5845 5853 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 5861 5869 static HRESULT APIENTRY vboxWddmDDevSetVertexShaderFunc(HANDLE hDevice, HANDLE hShaderHandle) 5862 5870 { 5863 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();5871 VBOXDISP_DDI_PROLOGUE(); 5864 5872 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 5865 5873 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 5875 5883 static HRESULT APIENTRY vboxWddmDDevDeleteVertexShaderFunc(HANDLE hDevice, HANDLE hShaderHandle) 5876 5884 { 5877 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();5885 VBOXDISP_DDI_PROLOGUE(); 5878 5886 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 5879 5887 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 5888 5896 static HRESULT APIENTRY vboxWddmDDevSetVertexShaderConstI(HANDLE hDevice, CONST D3DDDIARG_SETVERTEXSHADERCONSTI* pData, CONST INT* pRegisters) 5889 5897 { 5890 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();5898 VBOXDISP_DDI_PROLOGUE(); 5891 5899 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 5892 5900 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 5901 5909 static HRESULT APIENTRY vboxWddmDDevSetVertexShaderConstB(HANDLE hDevice, CONST D3DDDIARG_SETVERTEXSHADERCONSTB* pData, CONST BOOL* pRegisters) 5902 5910 { 5903 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();5911 VBOXDISP_DDI_PROLOGUE(); 5904 5912 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 5905 5913 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 5914 5922 static HRESULT APIENTRY vboxWddmDDevSetScissorRect(HANDLE hDevice, CONST RECT* pRect) 5915 5923 { 5916 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();5924 VBOXDISP_DDI_PROLOGUE(); 5917 5925 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 5918 5926 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 5927 5935 static HRESULT APIENTRY vboxWddmDDevSetStreamSource(HANDLE hDevice, CONST D3DDDIARG_SETSTREAMSOURCE* pData) 5928 5936 { 5929 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();5937 VBOXDISP_DDI_PROLOGUE(); 5930 5938 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 5931 5939 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 5971 5979 static HRESULT APIENTRY vboxWddmDDevSetStreamSourceFreq(HANDLE hDevice, CONST D3DDDIARG_SETSTREAMSOURCEFREQ* pData) 5972 5980 { 5973 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();5981 VBOXDISP_DDI_PROLOGUE(); 5974 5982 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 5975 5983 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 5982 5990 static HRESULT APIENTRY vboxWddmDDevSetConvolutionKernelMono(HANDLE hDevice, CONST D3DDDIARG_SETCONVOLUTIONKERNELMONO* pData) 5983 5991 { 5984 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();5992 VBOXDISP_DDI_PROLOGUE(); 5985 5993 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 5986 5994 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 5993 6001 static HRESULT APIENTRY vboxWddmDDevComposeRects(HANDLE hDevice, CONST D3DDDIARG_COMPOSERECTS* pData) 5994 6002 { 5995 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6003 VBOXDISP_DDI_PROLOGUE(); 5996 6004 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 5997 6005 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6085 6093 static HRESULT APIENTRY vboxWddmDDevBlt(HANDLE hDevice, CONST D3DDDIARG_BLT* pData) 6086 6094 { 6087 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6095 VBOXDISP_DDI_PROLOGUE(); 6088 6096 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6089 6097 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6165 6173 static HRESULT APIENTRY vboxWddmDDevColorFill(HANDLE hDevice, CONST D3DDDIARG_COLORFILL* pData) 6166 6174 { 6167 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6175 VBOXDISP_DDI_PROLOGUE(); 6168 6176 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6169 6177 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6194 6202 static HRESULT APIENTRY vboxWddmDDevDepthFill(HANDLE hDevice, CONST D3DDDIARG_DEPTHFILL* pData) 6195 6203 { 6196 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6204 VBOXDISP_DDI_PROLOGUE(); 6197 6205 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6198 6206 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6206 6214 static HRESULT APIENTRY vboxWddmDDevCreateQuery(HANDLE hDevice, D3DDDIARG_CREATEQUERY* pData) 6207 6215 { 6208 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6216 VBOXDISP_DDI_PROLOGUE(); 6209 6217 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6210 6218 // PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6236 6244 static HRESULT APIENTRY vboxWddmDDevDestroyQuery(HANDLE hDevice, HANDLE hQuery) 6237 6245 { 6238 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6246 VBOXDISP_DDI_PROLOGUE(); 6239 6247 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6240 6248 HRESULT hr = S_OK; … … 6251 6259 static HRESULT APIENTRY vboxWddmDDevIssueQuery(HANDLE hDevice, CONST D3DDDIARG_ISSUEQUERY* pData) 6252 6260 { 6253 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6261 VBOXDISP_DDI_PROLOGUE(); 6254 6262 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6255 6263 HRESULT hr = S_OK; … … 6266 6274 static HRESULT APIENTRY vboxWddmDDevGetQueryData(HANDLE hDevice, CONST D3DDDIARG_GETQUERYDATA* pData) 6267 6275 { 6268 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6276 VBOXDISP_DDI_PROLOGUE(); 6269 6277 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6270 6278 HRESULT hr = S_OK; … … 6292 6300 static HRESULT APIENTRY vboxWddmDDevSetRenderTarget(HANDLE hDevice, CONST D3DDDIARG_SETRENDERTARGET* pData) 6293 6301 { 6294 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6302 VBOXDISP_DDI_PROLOGUE(); 6295 6303 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6296 6304 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6310 6318 static HRESULT APIENTRY vboxWddmDDevSetDepthStencil(HANDLE hDevice, CONST D3DDDIARG_SETDEPTHSTENCIL* pData) 6311 6319 { 6312 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6320 VBOXDISP_DDI_PROLOGUE(); 6313 6321 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6314 6322 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6333 6341 static HRESULT APIENTRY vboxWddmDDevGenerateMipSubLevels(HANDLE hDevice, CONST D3DDDIARG_GENERATEMIPSUBLEVELS* pData) 6334 6342 { 6335 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6343 VBOXDISP_DDI_PROLOGUE(); 6336 6344 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6337 6345 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6345 6353 static HRESULT APIENTRY vboxWddmDDevSetPixelShaderConstI(HANDLE hDevice, CONST D3DDDIARG_SETPIXELSHADERCONSTI* pData, CONST INT* pRegisters) 6346 6354 { 6347 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6355 VBOXDISP_DDI_PROLOGUE(); 6348 6356 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6349 6357 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6359 6367 static HRESULT APIENTRY vboxWddmDDevSetPixelShaderConstB(HANDLE hDevice, CONST D3DDDIARG_SETPIXELSHADERCONSTB* pData, CONST BOOL* pRegisters) 6360 6368 { 6361 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6369 VBOXDISP_DDI_PROLOGUE(); 6362 6370 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6363 6371 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6373 6381 static HRESULT APIENTRY vboxWddmDDevCreatePixelShader(HANDLE hDevice, D3DDDIARG_CREATEPIXELSHADER* pData, CONST UINT* pCode) 6374 6382 { 6375 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6383 VBOXDISP_DDI_PROLOGUE(); 6376 6384 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6377 6385 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6394 6402 static HRESULT APIENTRY vboxWddmDDevDeletePixelShader(HANDLE hDevice, HANDLE hShaderHandle) 6395 6403 { 6396 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6404 VBOXDISP_DDI_PROLOGUE(); 6397 6405 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6398 6406 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6408 6416 static HRESULT APIENTRY vboxWddmDDevCreateDecodeDevice(HANDLE hDevice, D3DDDIARG_CREATEDECODEDEVICE* pData) 6409 6417 { 6410 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6418 VBOXDISP_DDI_PROLOGUE(); 6411 6419 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6412 6420 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6420 6428 static HRESULT APIENTRY vboxWddmDDevDestroyDecodeDevice(HANDLE hDevice, HANDLE hDecodeDevice) 6421 6429 { 6422 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6430 VBOXDISP_DDI_PROLOGUE(); 6423 6431 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6424 6432 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6432 6440 static HRESULT APIENTRY vboxWddmDDevSetDecodeRenderTarget(HANDLE hDevice, CONST D3DDDIARG_SETDECODERENDERTARGET* pData) 6433 6441 { 6434 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6442 VBOXDISP_DDI_PROLOGUE(); 6435 6443 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6436 6444 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6444 6452 static HRESULT APIENTRY vboxWddmDDevDecodeBeginFrame(HANDLE hDevice, D3DDDIARG_DECODEBEGINFRAME* pData) 6445 6453 { 6446 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6454 VBOXDISP_DDI_PROLOGUE(); 6447 6455 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6448 6456 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6456 6464 static HRESULT APIENTRY vboxWddmDDevDecodeEndFrame(HANDLE hDevice, D3DDDIARG_DECODEENDFRAME* pData) 6457 6465 { 6458 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6466 VBOXDISP_DDI_PROLOGUE(); 6459 6467 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6460 6468 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6468 6476 static HRESULT APIENTRY vboxWddmDDevDecodeExecute(HANDLE hDevice, CONST D3DDDIARG_DECODEEXECUTE* pData) 6469 6477 { 6470 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6478 VBOXDISP_DDI_PROLOGUE(); 6471 6479 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6472 6480 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6480 6488 static HRESULT APIENTRY vboxWddmDDevDecodeExtensionExecute(HANDLE hDevice, CONST D3DDDIARG_DECODEEXTENSIONEXECUTE* pData) 6481 6489 { 6482 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6490 VBOXDISP_DDI_PROLOGUE(); 6483 6491 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6484 6492 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6492 6500 static HRESULT APIENTRY vboxWddmDDevCreateVideoProcessDevice(HANDLE hDevice, D3DDDIARG_CREATEVIDEOPROCESSDEVICE* pData) 6493 6501 { 6494 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6502 VBOXDISP_DDI_PROLOGUE(); 6495 6503 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6496 6504 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6504 6512 static HRESULT APIENTRY vboxWddmDDevDestroyVideoProcessDevice(HANDLE hDevice, HANDLE hVideoProcessor) 6505 6513 { 6506 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6514 VBOXDISP_DDI_PROLOGUE(); 6507 6515 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6508 6516 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6516 6524 static HRESULT APIENTRY vboxWddmDDevVideoProcessBeginFrame(HANDLE hDevice, HANDLE hVideoProcess) 6517 6525 { 6518 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6526 VBOXDISP_DDI_PROLOGUE(); 6519 6527 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6520 6528 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6528 6536 static HRESULT APIENTRY vboxWddmDDevVideoProcessEndFrame(HANDLE hDevice, D3DDDIARG_VIDEOPROCESSENDFRAME* pData) 6529 6537 { 6530 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6538 VBOXDISP_DDI_PROLOGUE(); 6531 6539 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6532 6540 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6540 6548 static HRESULT APIENTRY vboxWddmDDevSetVideoProcessRenderTarget(HANDLE hDevice, CONST D3DDDIARG_SETVIDEOPROCESSRENDERTARGET* pData) 6541 6549 { 6542 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6550 VBOXDISP_DDI_PROLOGUE(); 6543 6551 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6544 6552 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6552 6560 static HRESULT APIENTRY vboxWddmDDevVideoProcessBlt(HANDLE hDevice, CONST D3DDDIARG_VIDEOPROCESSBLT* pData) 6553 6561 { 6554 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6562 VBOXDISP_DDI_PROLOGUE(); 6555 6563 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6556 6564 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6564 6572 static HRESULT APIENTRY vboxWddmDDevCreateExtensionDevice(HANDLE hDevice, D3DDDIARG_CREATEEXTENSIONDEVICE* pData) 6565 6573 { 6566 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6574 VBOXDISP_DDI_PROLOGUE(); 6567 6575 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6568 6576 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6576 6584 static HRESULT APIENTRY vboxWddmDDevDestroyExtensionDevice(HANDLE hDevice, HANDLE hExtension) 6577 6585 { 6578 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6586 VBOXDISP_DDI_PROLOGUE(); 6579 6587 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6580 6588 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6588 6596 static HRESULT APIENTRY vboxWddmDDevExtensionExecute(HANDLE hDevice, CONST D3DDDIARG_EXTENSIONEXECUTE* pData) 6589 6597 { 6590 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6598 VBOXDISP_DDI_PROLOGUE(); 6591 6599 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6592 6600 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6600 6608 static HRESULT APIENTRY vboxWddmDDevDestroyDevice(IN HANDLE hDevice) 6601 6609 { 6602 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6610 VBOXDISP_DDI_PROLOGUE(); 6603 6611 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6604 6612 … … 6647 6655 static HRESULT APIENTRY vboxWddmDDevCreateOverlay(HANDLE hDevice, D3DDDIARG_CREATEOVERLAY* pData) 6648 6656 { 6649 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6657 VBOXDISP_DDI_PROLOGUE(); 6650 6658 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6651 6659 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6711 6719 static HRESULT APIENTRY vboxWddmDDevUpdateOverlay(HANDLE hDevice, CONST D3DDDIARG_UPDATEOVERLAY* pData) 6712 6720 { 6713 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6721 VBOXDISP_DDI_PROLOGUE(); 6714 6722 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6715 6723 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6755 6763 static HRESULT APIENTRY vboxWddmDDevFlipOverlay(HANDLE hDevice, CONST D3DDDIARG_FLIPOVERLAY* pData) 6756 6764 { 6757 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6765 VBOXDISP_DDI_PROLOGUE(); 6758 6766 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6759 6767 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6792 6800 static HRESULT APIENTRY vboxWddmDDevGetOverlayColorControls(HANDLE hDevice, D3DDDIARG_GETOVERLAYCOLORCONTROLS* pData) 6793 6801 { 6794 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6802 VBOXDISP_DDI_PROLOGUE(); 6795 6803 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6796 6804 Assert(0); … … 6800 6808 static HRESULT APIENTRY vboxWddmDDevSetOverlayColorControls(HANDLE hDevice, CONST D3DDDIARG_SETOVERLAYCOLORCONTROLS* pData) 6801 6809 { 6802 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6810 VBOXDISP_DDI_PROLOGUE(); 6803 6811 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6804 6812 Assert(0); … … 6808 6816 static HRESULT APIENTRY vboxWddmDDevDestroyOverlay(HANDLE hDevice, CONST D3DDDIARG_DESTROYOVERLAY* pData) 6809 6817 { 6810 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6818 VBOXDISP_DDI_PROLOGUE(); 6811 6819 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6812 6820 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6830 6838 static HRESULT APIENTRY vboxWddmDDevQueryResourceResidency(HANDLE hDevice, CONST D3DDDIARG_QUERYRESOURCERESIDENCY* pData) 6831 6839 { 6832 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6840 VBOXDISP_DDI_PROLOGUE(); 6833 6841 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6834 6842 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 6877 6885 static HRESULT APIENTRY vboxWddmDDevOpenResource(HANDLE hDevice, D3DDDIARG_OPENRESOURCE* pData) 6878 6886 { 6879 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();6887 VBOXDISP_DDI_PROLOGUE(); 6880 6888 vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 6881 6889 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 7087 7095 static HRESULT APIENTRY vboxWddmDDevGetCaptureAllocationHandle(HANDLE hDevice, D3DDDIARG_GETCAPTUREALLOCATIONHANDLE* pData) 7088 7096 { 7089 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();7097 VBOXDISP_DDI_PROLOGUE(); 7090 7098 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 7091 7099 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 7100 7108 static HRESULT APIENTRY vboxWddmDDevCaptureToSysMem(HANDLE hDevice, CONST D3DDDIARG_CAPTURETOSYSMEM* pData) 7101 7109 { 7102 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();7110 VBOXDISP_DDI_PROLOGUE(); 7103 7111 vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice)); 7104 7112 PVBOXWDDMDISP_DEVICE pDevice = (PVBOXWDDMDISP_DEVICE)hDevice; … … 7113 7121 static HRESULT APIENTRY vboxWddmDispCreateDevice (IN HANDLE hAdapter, IN D3DDDIARG_CREATEDEVICE* pCreateData) 7114 7122 { 7115 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();7123 VBOXDISP_DDI_PROLOGUE(); 7116 7124 HRESULT hr = S_OK; 7117 7125 vboxVDbgPrint(("==> "__FUNCTION__", hAdapter(0x%p), Interface(%d), Version(%d)\n", hAdapter, pCreateData->Interface, pCreateData->Version)); … … 7341 7349 static HRESULT APIENTRY vboxWddmDispCloseAdapter (IN HANDLE hAdapter) 7342 7350 { 7343 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();7351 VBOXDISP_DDI_PROLOGUE(); 7344 7352 vboxVDbgPrint(("==> "__FUNCTION__", hAdapter(0x%p)\n", hAdapter)); 7345 7353 … … 7367 7375 HRESULT APIENTRY OpenAdapter (__inout D3DDDIARG_OPENADAPTER* pOpenData) 7368 7376 { 7369 VBOXDISP PROFILE_FUNCTION_DDI_PROLOGUE();7377 VBOXDISP_DDI_PROLOGUE(); 7370 7378 vboxVDbgPrint(("==> "__FUNCTION__"\n")); 7371 7379 -
trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispDbg.cpp
r38331 r38930 62 62 63 63 DWORD g_VBoxVDbgFBreakShared = VBOXWDDMDISP_DEBUG_DUMP_DEFAULT; 64 DWORD g_VBoxVDbgFBreakDdi = 0; 65 66 DWORD g_VBoxVDbgFLogRel = 0; 67 DWORD g_VBoxVDbgFLog = 0; 68 DWORD g_VBoxVDbgFLogFlow = 0; 64 69 65 70 DWORD g_VBoxVDbgPid = 0; -
trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispDbg.h
r38903 r38930 29 29 * the workaround so far is to pass the log info to the kernel driver and DbgPrint'ed from there, 30 30 * which is enabled by this define */ 31 # define VBOXWDDMDISP_DEBUG_PRINTDRV31 //# define VBOXWDDMDISP_DEBUG_PRINTDRV 32 32 /* use OutputDebugString */ 33 33 # define VBOXWDDMDISP_DEBUG_PRINT … … 37 37 //# define VBOXWDDMDISP_DEBUG_NOSHARED 38 38 # endif 39 40 /* debug config vars */ 41 extern DWORD g_VBoxVDbgFDumpSetTexture; 42 extern DWORD g_VBoxVDbgFDumpDrawPrim; 43 extern DWORD g_VBoxVDbgFDumpTexBlt; 44 extern DWORD g_VBoxVDbgFDumpBlt; 45 extern DWORD g_VBoxVDbgFDumpRtSynch; 46 extern DWORD g_VBoxVDbgFDumpFlush; 47 extern DWORD g_VBoxVDbgFDumpShared; 48 extern DWORD g_VBoxVDbgFDumpLock; 49 extern DWORD g_VBoxVDbgFDumpUnlock; 50 51 extern DWORD g_VBoxVDbgFBreakShared; 52 extern DWORD g_VBoxVDbgFBreakDdi; 53 54 55 /* log enable flags */ 56 extern DWORD g_VBoxVDbgFLogRel; 57 extern DWORD g_VBoxVDbgFLog; 58 extern DWORD g_VBoxVDbgFLogFlow; 59 60 39 61 #endif 40 62 … … 72 94 # define DbgPrintUsr(_m) do { vboxDispLogDbgPrintF _m; } while (0) 73 95 # define DbgPrintUsrRel(_m) do { vboxDispLogDbgPrintF _m; } while (0) 74 # define DbgPrintUsrFlow(_m) do { } while (0)96 # define DbgPrintUsrFlow(_m) do { vboxDispLogDbgPrintF _m; } while (0) 75 97 #else 76 98 # define DbgPrintUsr(_m) do { } while (0) … … 83 105 # define WARN_BREAK() do { } while (0) 84 106 #endif 107 108 #ifdef VBOXWDDMDISP_DEBUG 109 #define vboxVDbgInternalLog(_p) if (g_VBoxVDbgFLog) { _p } 110 #define vboxVDbgInternalLogFlow(_p) if (g_VBoxVDbgFLogFlow) { _p } 111 #define vboxVDbgInternalLogRel(_p) if (g_VBoxVDbgFLogRel) { _p } 112 #else 113 #define vboxVDbgInternalLog(_p) do {} while (0) 114 #define vboxVDbgInternalLogFlow(_p) do {} while (0) 115 #define vboxVDbgInternalLogRel(_p) do { _p } while (0) 116 #endif 117 85 118 #define WARN(_m) do { \ 86 Log(_m); \ 87 DbgPrintUsr(_m); \ 88 DbgPrintDrv(_m); \ 119 vboxVDbgInternalLog( \ 120 Log(_m); \ 121 DbgPrintUsr(_m); \ 122 DbgPrintDrv(_m); \ 123 ); \ 89 124 WARN_BREAK(); \ 90 125 } while (0) 91 126 #define vboxVDbgPrint(_m) do { \ 92 Log(_m); \ 93 DbgPrintUsr(_m); \ 94 DbgPrintDrv(_m); \ 127 vboxVDbgInternalLog( \ 128 Log(_m); \ 129 DbgPrintUsr(_m); \ 130 DbgPrintDrv(_m); \ 131 ); \ 95 132 } while (0) 96 133 #define vboxVDbgPrintF(_m) do { \ 97 LogFlow(_m); \ 98 DbgPrintUsrFlow(_m); \ 99 DbgPrintDrvFlow(_m); \ 134 vboxVDbgInternalLogFlow( \ 135 LogFlow(_m); \ 136 DbgPrintUsrFlow(_m); \ 137 DbgPrintDrvFlow(_m); \ 138 ); \ 100 139 } while (0) 101 140 #define vboxVDbgPrintR(_m) do { \ 102 LogRel(_m); \ 103 DbgPrintUsrRel(_m); \ 104 DbgPrintDrvRel(_m); \ 141 vboxVDbgInternalLogRel( \ 142 LogRel(_m); \ 143 DbgPrintUsrRel(_m); \ 144 DbgPrintDrvRel(_m); \ 145 ); \ 105 146 } while (0) 106 147 107 148 #ifdef VBOXWDDMDISP_DEBUG 108 extern DWORD g_VBoxVDbgFDumpSetTexture;109 extern DWORD g_VBoxVDbgFDumpDrawPrim;110 extern DWORD g_VBoxVDbgFDumpTexBlt;111 extern DWORD g_VBoxVDbgFDumpBlt;112 extern DWORD g_VBoxVDbgFDumpRtSynch;113 extern DWORD g_VBoxVDbgFDumpFlush;114 extern DWORD g_VBoxVDbgFDumpShared;115 extern DWORD g_VBoxVDbgFDumpLock;116 extern DWORD g_VBoxVDbgFDumpUnlock;117 118 extern DWORD g_VBoxVDbgFBreakShared;119 149 120 150 void vboxDispLogDrvF(char * szString, ...); … … 174 204 if (VBOXVDBG_IS_BREAK_SHARED_ALLOWED(_pRc)) { \ 175 205 vboxVDbgPrint(("Break on shared access: Rc(0x%p), SharedHandle(0x%p)\n", (_pRc), (_pRc)->aAllocations[0].hSharedHandle)); \ 206 AssertFailed(); \ 207 } \ 208 } while (0) 209 210 #define VBOXVDBG_BREAK_DDI() do { \ 211 if (VBOXVDBG_IS_BREAK_ALLOWED(Ddi)) { \ 176 212 AssertFailed(); \ 177 213 } \ … … 293 329 #define VBOXVDBG_DUMP_UNLOCK_ST(_pData) do { } while (0) 294 330 #define VBOXVDBG_BREAK_SHARED(_pRc) do { } while (0) 331 #define VBOXVDBG_BREAK_DDI() do { } while (0) 295 332 #endif 296 333 -
trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.cpp
r38765 r38930 480 480 } 481 481 482 memset(&pSwapchain->ViewRect, 0, sizeof (pSwapchain->ViewRect)); 482 /* do not zero up the view rect since it may still be valid */ 483 // memset(&pSwapchain->ViewRect, 0, sizeof (pSwapchain->ViewRect)); 483 484 if (pSwapchain->pLastReportedRects) 484 485 { -
trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/context.c
r38565 r38930 2339 2339 swapchain = (IWineD3DSwapChainImpl *)This->swapchains[This->NumberOfSwapChains-1]; /* just fallback to anything to avoid NPE */ 2340 2340 if (swapchain->backBuffer) target = swapchain->backBuffer[0]; 2341 else target = swapchain->frontBuffer; 2341 else if (swapchain->frontBuffer) target = swapchain->frontBuffer; 2342 else target = swapchain->presentRt; 2342 2343 } 2343 2344 }
Note:
See TracChangeset
for help on using the changeset viewer.