diff options
Diffstat (limited to 'src/VBox/Additions/WINNT/Graphics/Wine/vbox')
5 files changed, 26 insertions, 6 deletions
diff --git a/src/VBox/Additions/WINNT/Graphics/Wine/vbox/VBoxDbgGl.c b/src/VBox/Additions/WINNT/Graphics/Wine/vbox/VBoxDbgGl.c index 467b2ec1..9fb564c0 100644 --- a/src/VBox/Additions/WINNT/Graphics/Wine/vbox/VBoxDbgGl.c +++ b/src/VBox/Additions/WINNT/Graphics/Wine/vbox/VBoxDbgGl.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/WINNT/Graphics/Wine/vbox/VBoxDbgGl.h b/src/VBox/Additions/WINNT/Graphics/Wine/vbox/VBoxDbgGl.h index 2e98cbd3..247e94e9 100644 --- a/src/VBox/Additions/WINNT/Graphics/Wine/vbox/VBoxDbgGl.h +++ b/src/VBox/Additions/WINNT/Graphics/Wine/vbox/VBoxDbgGl.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/WINNT/Graphics/Wine/vbox/VBoxWineEx.h b/src/VBox/Additions/WINNT/Graphics/Wine/vbox/VBoxWineEx.h index 011caa8b..c2283b5e 100644 --- a/src/VBox/Additions/WINNT/Graphics/Wine/vbox/VBoxWineEx.h +++ b/src/VBox/Additions/WINNT/Graphics/Wine/vbox/VBoxWineEx.h @@ -2,7 +2,7 @@ * * VBox extension to Wine D3D * - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -68,6 +68,12 @@ typedef FNVBOXWINEEXD3DDEV9_VOLTEXBLT *PFNVBOXWINEEXD3DDEV9_VOLTEXBLT; typedef VBOXWINEEX_DECL(HRESULT) FNVBOXWINEEXD3DDEV9_FLUSH(IDirect3DDevice9Ex *iface); typedef FNVBOXWINEEXD3DDEV9_FLUSH *PFNVBOXWINEEXD3DDEV9_FLUSH; +typedef VBOXWINEEX_DECL(HRESULT) FNVBOXWINEEXD3DDEV9_FLUSHTOHOST(IDirect3DDevice9Ex *iface); +typedef FNVBOXWINEEXD3DDEV9_FLUSHTOHOST *PFNVBOXWINEEXD3DDEV9_FLUSHTOHOST; + +typedef VBOXWINEEX_DECL(HRESULT) FNVBOXWINEEXD3DDEV9_FINISH(IDirect3DDevice9Ex *iface); +typedef FNVBOXWINEEXD3DDEV9_FINISH *PFNVBOXWINEEXD3DDEV9_FINISH; + typedef VBOXWINEEX_DECL(HRESULT) FNVBOXWINEEXD3DDEV9_UPDATE(IDirect3DDevice9Ex *iface, D3DPRESENT_PARAMETERS * pParams, IDirect3DDevice9Ex **outIface); typedef FNVBOXWINEEXD3DDEV9_UPDATE *PFNVBOXWINEEXD3DDEV9_UPDATE; @@ -113,6 +119,10 @@ VBOXWINEEX_DECL(HRESULT) VBoxWineExD3DDev9VolTexBlt(IDirect3DDevice9Ex *iface, VBOXWINEEX_DECL(HRESULT) VBoxWineExD3DDev9Flush(IDirect3DDevice9Ex *iface); /* perform glFlush */ +VBOXWINEEX_DECL(HRESULT) VBoxWineExD3DDev9Finish(IDirect3DDevice9Ex *iface); /* perform glFinish */ + +VBOXWINEEX_DECL(HRESULT) VBoxWineExD3DDev9FlushToHost(IDirect3DDevice9Ex *iface); /* flash data to host */ + VBOXWINEEX_DECL(HRESULT) VBoxWineExD3DDev9Update(IDirect3DDevice9Ex *iface, D3DPRESENT_PARAMETERS * pParams, IDirect3DDevice9Ex **outIface); /* update device parameters */ diff --git a/src/VBox/Additions/WINNT/Graphics/Wine/vbox/libWineStub/include/wine/debug.h b/src/VBox/Additions/WINNT/Graphics/Wine/vbox/libWineStub/include/wine/debug.h index b52e82ce..e9d7c7ba 100644 --- a/src/VBox/Additions/WINNT/Graphics/Wine/vbox/libWineStub/include/wine/debug.h +++ b/src/VBox/Additions/WINNT/Graphics/Wine/vbox/libWineStub/include/wine/debug.h @@ -358,16 +358,18 @@ static inline const char *debugstr_w( const WCHAR *s ) { return wine_dbgstr_wn( #endif -#ifdef DEBUG_misha -//# define VBOXWINEDBG_SHADERS +#if 0//def DEBUG_misha +# define VBOXWINEDBG_SHADERS #endif -#ifdef VBOXWINEDBG_SHADERS +#if defined(VBOXWINEDBG_SHADERS) || defined(VBOX_WINE_WITH_PROFILE) #include <stdio.h> #include <stdarg.h> void vboxWDbgPrintF(char * szString, ...); +#endif +#ifdef VBOXWINEDBG_SHADERS # define WDLOG(_m) do {\ vboxWDbgPrintF _m ; \ } while (0) diff --git a/src/VBox/Additions/WINNT/Graphics/Wine/vbox/libWineStub/include/wine/wined3d.h b/src/VBox/Additions/WINNT/Graphics/Wine/vbox/libWineStub/include/wine/wined3d.h index 41ee98bb..5dbf7a46 100644 --- a/src/VBox/Additions/WINNT/Graphics/Wine/vbox/libWineStub/include/wine/wined3d.h +++ b/src/VBox/Additions/WINNT/Graphics/Wine/vbox/libWineStub/include/wine/wined3d.h @@ -8251,6 +8251,12 @@ typedef struct IWineD3DDeviceVtbl { const WINED3DBOX *pSrcBoxArg, const struct VBOXPOINT3D *pDstPoin3D ); + + HRESULT (STDMETHODCALLTYPE *FlushToHost)( + IWineD3DDevice *iface); + + HRESULT (STDMETHODCALLTYPE *Finish)( + IWineD3DDevice* This); #endif END_INTERFACE @@ -8426,6 +8432,8 @@ interface IWineD3DDevice { #define IWineD3DDevice_Flush(This) (This)->lpVtbl->Flush(This) #define IWineD3DDevice_VolBlt(This, pSourceVolume, pDestinationVolume, pSrcBoxArg, pDstPoin3D) (This)->lpVtbl->VolBlt(This, pSourceVolume, pDestinationVolume, pSrcBoxArg, pDstPoin3D) #define IWineD3DDevice_VolTexBlt(This, pSourceTexture, pDestinationTexture, pSrcBoxArg, pDstPoin3D) (This)->lpVtbl->VolTexBlt(This, pSourceTexture, pDestinationTexture, pSrcBoxArg, pDstPoin3D) +#define IWineD3DDevice_FlushToHost(This) (This)->lpVtbl->FlushToHost(This) +#define IWineD3DDevice_Finish(This) (This)->lpVtbl->Finish(This) #endif #endif |