February 2007 - Wine-commits

Andrew Talbot : itss: Constify a variable.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: d517b54c433b299fd3c587bb6d3d40019171b60e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d517b54c433b299fd3c587bb6… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Feb 14 19:16:51 2007 +0000 itss: Constify a variable. --- dlls/itss/moniker.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/itss/moniker.c b/dlls/itss/moniker.c index 5149a14..370a23f 100644 --- a/dlls/itss/moniker.c +++ b/dlls/itss/moniker.c @@ -347,7 +347,7 @@ static const IMonikerVtbl ITS_IMonikerImpl_Vtbl = ITS_IMonikerImpl_IsSystemMoniker }; -static HRESULT ITS_IMoniker_create( IMoniker **ppObj, LPWSTR name, DWORD n ) +static HRESULT ITS_IMoniker_create( IMoniker **ppObj, LPCWSTR name, DWORD n ) { ITS_IMonikerImpl *itsmon; DWORD sz;

1 0

Andrew Talbot : dxdiagn: Constify a variable.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 7ae8d236e5190a3cf22c810ce0cca5bed0a51b20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ae8d236e5190a3cf22c810ce… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Feb 14 17:05:46 2007 +0000 dxdiagn: Constify a variable. --- dlls/dxdiagn/provider.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 64425a2..260c3a7 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -145,7 +145,7 @@ HRESULT DXDiag_CreateDXDiagProvider(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, R static HRESULT DXDiag_AddFileDescContainer(IDxDiagContainer* pSubCont, const WCHAR* szFilePath, const WCHAR* szFileName) { HRESULT hr = S_OK; /**/ - static WCHAR szSlashSep[] = {'\\',0}; + static const WCHAR szSlashSep[] = {'\\',0}; static const WCHAR szPath[] = {'s','z','P','a','t','h',0}; static const WCHAR szName[] = {'s','z','N','a','m','e',0}; static const WCHAR szVersion[] = {'s','z','V','e','r','s','i','o','n',0};

1 0

Stefan Dösinger : wined3d: More fullscreen window fixes.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 388499ff28616ef03bf8949a78e658e1bdb4e4fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=388499ff28616ef03bf8949a7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 14 17:59:08 2007 +0100 wined3d: More fullscreen window fixes. --- dlls/ddraw/ddraw.c | 10 ---------- dlls/wined3d/device.c | 36 ++++++++++++++++++++++++++++++++---- include/wine/wined3d_interface.h | 4 ---- 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 11e3579..c2dbc9e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -426,9 +426,6 @@ IDirectDrawImpl_SetCooperativeLevel(IDirectDraw7 *iface, /* Restore the display mode */ IDirectDraw7_RestoreDisplayMode(iface); - if(window) - IWineD3DDevice_RestoreWindow(This->wineD3DDevice, window); - This->cooperative_level &= ~DDSCL_FULLSCREEN; This->cooperative_level &= ~DDSCL_EXCLUSIVE; This->cooperative_level &= ~DDSCL_ALLOWMODEX; @@ -476,13 +473,6 @@ IDirectDrawImpl_SetCooperativeLevel(IDirectDraw7 *iface, !(This->devicewindow) && (hwnd != window) ) { - /* On a window change, restore the old window and set the new one */ - if(window != hwnd) - { - if(window) - IWineD3DDevice_RestoreWindow(This->wineD3DDevice, window); - IWineD3DDevice_SetupFullscreenWindow(This->wineD3DDevice, hwnd); - } IWineD3DDevice_SetHWND(This->wineD3DDevice, hwnd); } } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3376bf9..7e6ef3e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1159,7 +1159,7 @@ static void WINAPI IWineD3DDeviceImpl_SetupFullscreenWindow(IWineD3DDevice *ifac * That shouldn't happen */ TRACE("(%p): Setting up window %p for exclusive mode\n", This, window); - if (This->style && This->exStyle) { + if (This->style || This->exStyle) { ERR("(%p): Want to change the window parameters of HWND %p, but " "another style is stored for restoration afterwards\n", This, window); } @@ -1404,7 +1404,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic This->ddraw_height = devmode.dmPelsHeight; This->ddraw_format = *(pPresentationParameters->BackBufferFormat); - IWineD3DDeviceImpl_SetupFullscreenWindow(iface, object->win_handle); + IWineD3DDevice_SetFullscreen(iface, TRUE); /* And finally clip mouse to our screen */ SetRect(&clip_rc, 0, 0, devmode.dmPelsWidth, devmode.dmPelsHeight); @@ -1681,6 +1681,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR } This->swapchains[0] = (IWineD3DSwapChain *) swapchain; + if(!This->ddraw_window) IWineD3DDevice_SetHWND(iface, swapchain->win_handle); + if(swapchain->backBuffer && swapchain->backBuffer[0]) { TRACE("Setting rendertarget to %p\n", swapchain->backBuffer); This->render_targets[0] = swapchain->backBuffer[0]; @@ -1810,6 +1812,13 @@ static void WINAPI IWineD3DDeviceImpl_SetFullscreen(IWineD3DDevice *iface, BOOL IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; TRACE("(%p) Setting DDraw fullscreen mode to %s\n", This, fullscreen ? "true" : "false"); + /* Setup the window for fullscreen mode */ + if(fullscreen && !This->ddraw_fullscreen) { + IWineD3DDeviceImpl_SetupFullscreenWindow(iface, This->ddraw_window); + } else if(!fullscreen && This->ddraw_fullscreen) { + IWineD3DDeviceImpl_RestoreWindow(iface, This->ddraw_window); + } + /* DirectDraw apps can change between fullscreen and windowed mode after device creation with * IDirectDraw7::SetCooperativeLevel. The GDI surface implementation needs to know this. * DDraw doesn't necessarily have a swapchain, so we have to store the fullscreen flag @@ -4006,6 +4015,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetHWND(IWineD3DDevice *iface, HWND hWn IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p)->(%p)\n", This, hWnd); + if(This->ddraw_fullscreen) { + if(This->ddraw_window && This->ddraw_window != hWnd) { + IWineD3DDeviceImpl_RestoreWindow(iface, This->ddraw_window); + } + if(hWnd && This->ddraw_window != hWnd) { + IWineD3DDeviceImpl_SetupFullscreenWindow(iface, hWnd); + } + } + This->ddraw_window = hWnd; return WINED3D_OK; } @@ -5455,7 +5473,19 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE if((*pPresentationParameters->Windowed && !swapchain->presentParms.Windowed) || (swapchain->presentParms.Windowed && !*pPresentationParameters->Windowed) || DisplayModeChanged) { + + /* Switching to fullscreen? Change to fullscreen mode, THEN change the screen res */ + if(!(*pPresentationParameters->Windowed)) { + IWineD3DDevice_SetFullscreen(iface, TRUE); + } + IWineD3DDevice_SetDisplayMode(iface, 0, &mode); + + /* Switching out of fullscreen mode? First set the original res, then change the window */ + if(*pPresentationParameters->Windowed) { + IWineD3DDevice_SetFullscreen(iface, FALSE); + } + swapchain->presentParms.Windowed = *pPresentationParameters->Windowed; } IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); @@ -5809,8 +5839,6 @@ const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl = IWineD3DDeviceImpl_UpdateTexture, IWineD3DDeviceImpl_UpdateSurface, IWineD3DDeviceImpl_GetFrontBufferData, - IWineD3DDeviceImpl_SetupFullscreenWindow, - IWineD3DDeviceImpl_RestoreWindow, /*** object tracking ***/ IWineD3DDeviceImpl_ResourceReleased }; diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index d4fc8ea..998c84c 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -470,8 +470,6 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD3DBase) STDMETHOD(UpdateTexture)(THIS_ struct IWineD3DBaseTexture *pSourceTexture, struct IWineD3DBaseTexture *pDestinationTexture) PURE; STDMETHOD(UpdateSurface)(THIS_ struct IWineD3DSurface* pSourceSurface, CONST RECT* pSourceRect, struct IWineD3DSurface* pDestinationSurface, CONST POINT* pDestPoint) PURE; STDMETHOD(GetFrontBufferData)(THIS_ UINT iSwapChain,struct IWineD3DSurface* pSurface) PURE; - STDMETHOD_(void, SetupFullscreenWindow)(THIS_ HWND window) PURE; - STDMETHOD_(void, RestoreWindow)(THIS_ HWND window) PURE; /*** object tracking ***/ STDMETHOD_(void, ResourceReleased)(THIS_ struct IWineD3DResource *resource); }; @@ -609,8 +607,6 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD3DBase) #define IWineD3DDevice_UpdateTexture(p,a,b) (p)->lpVtbl->UpdateTexture(p,a,b) #define IWineD3DDevice_UpdateSurface(p,a,b,c,d) (p)->lpVtbl->UpdateSurface(p,a,b,c,d) #define IWineD3DDevice_GetFrontBufferData(p,a,b) (p)->lpVtbl->GetFrontBufferData(p,a,b) -#define IWineD3DDevice_SetupFullscreenWindow(p, a) (p)->lpVtbl->SetupFullscreenWindow(p,a); -#define IWineD3DDevice_RestoreWindow(p, a) (p)->lpVtbl->RestoreWindow(p,a); #define IWineD3DDevice_ResourceReleased(p,a) (p)->lpVtbl->ResourceReleased(p,a) #endif

1 0

Stefan Dösinger : wined3d: Instancing emulation.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 0feddccfe3b3664c263490bacda6e89ce7ca5461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0feddccfe3b3664c263490bac… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 14 17:56:29 2007 +0100 wined3d: Instancing emulation. --- dlls/wined3d/device.c | 7 ++- dlls/wined3d/directx.c | 20 ++++++ dlls/wined3d/drawprim.c | 148 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/state.c | 18 ++++- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 188 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0feddccfe3b3664c26349…

1 0

Stefan Dösinger : wined3d: Properly release the converted vertex declaration.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 7f5dccb69649c7d83ab1b5ea26469b9500b8553e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f5dccb69649c7d83ab1b5ea2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 14 17:57:07 2007 +0100 wined3d: Properly release the converted vertex declaration. --- dlls/d3d9/d3d9_private.h | 5 +++++ dlls/d3d9/device.c | 3 +++ dlls/d3d9/vertexdeclaration.c | 5 +++++ 3 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 435a37e..972945d 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -179,6 +179,11 @@ typedef struct IDirect3DDevice9Impl /* Avoids recursion with nested ReleaseRef to 0 */ BOOL inDestruction; + /* A vertex declaration was converted from setFVF. + * Keep track of it, so it can be properly freed + */ + IDirect3DVertexDeclaration9 *convertedDecl; + } IDirect3DDevice9Impl; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 4eff550..e6ecd96 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -62,6 +62,8 @@ static ULONG WINAPI IDirect3DDevice9Impl_Release(LPDIRECT3DDEVICE9 iface) { if (ref == 0) { This->inDestruction = TRUE; + if (This->convertedDecl != NULL) + IUnknown_Release(This->convertedDecl); IWineD3DDevice_Uninit3D(This->WineD3DDevice, D3D9CB_DestroyDepthStencilSurface, D3D9CB_DestroySwapChain); IWineD3DDevice_Release(This->WineD3DDevice); HeapFree(GetProcessHeap(), 0, This); @@ -766,6 +768,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetFVF(LPDIRECT3DDEVICE9 iface, DWORD FVF) hr = IDirect3DDevice9Impl_SetVertexDeclaration(iface, pDecl); if (hr != S_OK) goto exit; + This->convertedDecl = pDecl; pDecl = NULL; exit: diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index a7f5486..c3f462e 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -360,6 +360,11 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetVertexDeclaration(LPDIRECT3DDEVICE9 ifa TRACE("(%p) : Relay\n", iface); + if (This->convertedDecl && This->convertedDecl != pDecl) { + IUnknown_Release(This->convertedDecl); + This->convertedDecl = NULL; + } + hr = IWineD3DDevice_SetVertexDeclaration(This->WineD3DDevice, pDeclImpl == NULL ? NULL : pDeclImpl->wineD3DVertexDeclaration); return hr;

1 0

Stefan Dösinger : wined3d: Do not leave SetStreamSource early.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: aec06f60e749c10ca29a8f48e2b7eb9b42e8d5e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec06f60e749c10ca29a8f48e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 14 17:52:19 2007 +0100 wined3d: Do not leave SetStreamSource early. --- dlls/wined3d/device.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a28714d..757b147 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2002,10 +2002,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetStreamSource(IWineD3DDevice *iface, return WINED3D_OK; } - /* Same stream object: no action */ - if (oldSrc == pStreamData) - return WINED3D_OK; - /* Need to do a getParent and pass the reffs up */ /* MSDN says ..... When an application no longer holds a references to this interface, the interface will automatically be freed. which suggests that we shouldn't be ref counting? and do need a _release on the stream source to reset the stream source

1 0

Stefan Dösinger : wined3d: Correctly load vertex attributes with a stride of 0.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 93cd7ef7ff5d6ce012ffdbaefd57cd7405f16795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93cd7ef7ff5d6ce012ffdbaef… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 14 17:55:56 2007 +0100 wined3d: Correctly load vertex attributes with a stride of 0. --- dlls/wined3d/state.c | 112 ++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 99 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 3dac07f..d083997 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2153,19 +2153,105 @@ static inline void loadNumberedArrays(IWineD3DStateBlockImpl *stateblock, WineDi TRACE_(d3d_shader)("Loading array %u [VBO=%u]\n", i, strided->u.input[i].VBO); - if(curVBO != strided->u.input[i].VBO) { - GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, strided->u.input[i].VBO)); - checkGLcall("glBindBufferARB"); - curVBO = strided->u.input[i].VBO; - } - GL_EXTCALL(glVertexAttribPointerARB(i, - WINED3D_ATR_SIZE(strided->u.input[i].dwType), - WINED3D_ATR_GLTYPE(strided->u.input[i].dwType), - WINED3D_ATR_NORMALIZED(strided->u.input[i].dwType), - strided->u.input[i].dwStride, - strided->u.input[i].lpData + stateblock->loadBaseVertexIndex * strided->u.input[i].dwStride + offset[strided->u.input[i].streamNo]) ); - GL_EXTCALL(glEnableVertexAttribArrayARB(i)); - } + if(strided->u.input[i].dwStride) { + if(curVBO != strided->u.input[i].VBO) { + GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, strided->u.input[i].VBO)); + checkGLcall("glBindBufferARB"); + curVBO = strided->u.input[i].VBO; + } + GL_EXTCALL(glVertexAttribPointerARB(i, + WINED3D_ATR_SIZE(strided->u.input[i].dwType), + WINED3D_ATR_GLTYPE(strided->u.input[i].dwType), + WINED3D_ATR_NORMALIZED(strided->u.input[i].dwType), + strided->u.input[i].dwStride, + strided->u.input[i].lpData + stateblock->loadBaseVertexIndex * strided->u.input[i].dwStride + offset[strided->u.input[i].streamNo]) ); + GL_EXTCALL(glEnableVertexAttribArrayARB(i)); + } else { + /* Stride = 0 means always the same values. glVertexAttribPointerARB doesn't do that. Instead disable the pointer and + * set up the attribute statically. But we have to figure out the system memory address. + */ + BYTE *ptr = strided->u.input[i].lpData + offset[strided->u.input[i].streamNo]; + if(strided->u.input[i].VBO) { + IWineD3DVertexBufferImpl *vb = (IWineD3DVertexBufferImpl *) stateblock->streamSource[strided->u.input[i].streamNo]; + ptr += (long) vb->resource.allocatedMemory; + } + GL_EXTCALL(glDisableVertexAttribArrayARB(i)); + + switch(strided->u.input[i].dwType) { + case WINED3DDECLTYPE_FLOAT1: + GL_EXTCALL(glVertexAttrib1fvARB(i, (float *) ptr)); + break; + case WINED3DDECLTYPE_FLOAT2: + GL_EXTCALL(glVertexAttrib2fvARB(i, (float *) ptr)); + break; + case WINED3DDECLTYPE_FLOAT3: + GL_EXTCALL(glVertexAttrib3fvARB(i, (float *) ptr)); + break; + case WINED3DDECLTYPE_FLOAT4: + GL_EXTCALL(glVertexAttrib4fvARB(i, (float *) ptr)); + break; + + case WINED3DDECLTYPE_UBYTE4: + GL_EXTCALL(glVertexAttrib4NubvARB(i, ptr)); + break; + case WINED3DDECLTYPE_UBYTE4N: + case WINED3DDECLTYPE_D3DCOLOR: + GL_EXTCALL(glVertexAttrib4NubvARB(i, ptr)); + break; + + case WINED3DDECLTYPE_SHORT2: + GL_EXTCALL(glVertexAttrib4svARB(i, (GLshort *) ptr)); + break; + case WINED3DDECLTYPE_SHORT4: + GL_EXTCALL(glVertexAttrib4svARB(i, (GLshort *) ptr)); + break; + + case WINED3DDECLTYPE_SHORT2N: + { + GLshort s[4] = {((short *) ptr)[0], ((short *) ptr)[1], 0, 1}; + GL_EXTCALL(glVertexAttrib4NsvARB(i, s)); + break; + } + case WINED3DDECLTYPE_USHORT2N: + { + GLushort s[4] = {((unsigned short *) ptr)[0], ((unsigned short *) ptr)[1], 0, 1}; + GL_EXTCALL(glVertexAttrib4NusvARB(i, s)); + break; + } + case WINED3DDECLTYPE_SHORT4N: + GL_EXTCALL(glVertexAttrib4NsvARB(i, (GLshort *) ptr)); + break; + case WINED3DDECLTYPE_USHORT4N: + GL_EXTCALL(glVertexAttrib4NusvARB(i, (GLushort *) ptr)); + break; + + case WINED3DDECLTYPE_UDEC3: + FIXME("Unsure about WINED3DDECLTYPE_UDEC3\n"); + /*glVertexAttrib3usvARB(instancedData[j], (GLushort *) ptr); Does not exist */ + break; + case WINED3DDECLTYPE_DEC3N: + FIXME("Unsure about WINED3DDECLTYPE_DEC3N\n"); + /*glVertexAttrib3NusvARB(instancedData[j], (GLushort *) ptr); Does not exist */ + break; + + case WINED3DDECLTYPE_FLOAT16_2: + /* Are those 16 bit floats. C doesn't have a 16 bit float type. I could read the single bits and calculate a 4 + * byte float according to the IEEE standard + */ + FIXME("Unsupported WINED3DDECLTYPE_FLOAT16_2\n"); + break; + case WINED3DDECLTYPE_FLOAT16_4: + FIXME("Unsupported WINED3DDECLTYPE_FLOAT16_4\n"); + break; + + case WINED3DDECLTYPE_UNUSED: + default: + ERR("Unexpected declaration in stride 0 attributes\n"); + break; + + } + } + } } /* Used from 2 different functions, and too big to justify making it inlined */

1 0

Stefan Dösinger : wined3d: Do not release the local vertex buffer copy.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: e6fedfca7a4cbbca6c362fb7f6ee70130771736e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6fedfca7a4cbbca6c362fb7f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 14 17:51:21 2007 +0100 wined3d: Do not release the local vertex buffer copy. --- dlls/wined3d/device.c | 28 +++-------- dlls/wined3d/vertexbuffer.c | 104 +++++++++---------------------------------- 2 files changed, 29 insertions(+), 103 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8396f63..a28714d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -355,31 +355,26 @@ static void CreateVBO(IWineD3DVertexBufferImpl *object) { } /* Don't use static, because dx apps tend to update the buffer - * quite often even if they specify 0 usage - */ + * quite often even if they specify 0 usage. Because we always keep the local copy + * we never read from the vbo and can create a write only opengl buffer. + */ switch(vboUsage & (D3DUSAGE_WRITEONLY | D3DUSAGE_DYNAMIC) ) { case D3DUSAGE_WRITEONLY | D3DUSAGE_DYNAMIC: + case D3DUSAGE_DYNAMIC: TRACE("Gl usage = GL_STREAM_DRAW\n"); glUsage = GL_STREAM_DRAW_ARB; break; case D3DUSAGE_WRITEONLY: + default: TRACE("Gl usage = GL_DYNAMIC_DRAW\n"); glUsage = GL_DYNAMIC_DRAW_ARB; break; - case D3DUSAGE_DYNAMIC: - TRACE("Gl usage = GL_STREAM_COPY\n"); - glUsage = GL_STREAM_COPY_ARB; - break; - default: - TRACE("Gl usage = GL_DYNAMIC_COPY\n"); - glUsage = GL_DYNAMIC_COPY_ARB; - break; } /* Reserve memory for the buffer. The amount of data won't change - * so we are safe with calling glBufferData once with a NULL ptr and - * calling glBufferSubData on updates - */ + * so we are safe with calling glBufferData once with a NULL ptr and + * calling glBufferSubData on updates + */ GL_EXTCALL(glBufferDataARB(GL_ARRAY_BUFFER_ARB, object->resource.size, NULL, glUsage)); error = glGetError(); if(error != GL_NO_ERROR) { @@ -444,13 +439,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac if( GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT) && Pool != WINED3DPOOL_SYSTEMMEM && !(Usage & WINED3DUSAGE_DYNAMIC) && (dxVersion > 7 || !conv) ) { CreateVBO(object); - - /* DX7 buffers can be locked directly into the VBO (no conversion, see above */ - if(dxVersion == 7 && object->vbo) { - HeapFree(GetProcessHeap(), 0, object->resource.allocatedMemory); - object->resource.allocatedMemory = NULL; - } - } return WINED3D_OK; } diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 6ef7533..84d0ca3 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -289,27 +289,21 @@ static void WINAPI IWineD3DVertexBufferImpl_PreLoad(IWineD3DVertexBuffer *if This->draws = 0; if(This->declChanges > VB_MAXDECLCHANGES) { - if(This->resource.allocatedMemory) { - FIXME("Too much declaration changes, stopping converting\n"); - ENTER_GL(); - GL_EXTCALL(glDeleteBuffersARB(1, &This->vbo)); - checkGLcall("glDeleteBuffersARB"); - LEAVE_GL(); - This->vbo = 0; - - /* The stream source state handler might have read the memory of the vertex buffer already - * and got the memory in the vbo which is not valid any longer. Dirtify the stream source - * to force a reload. This happens only once per changed vertexbuffer and should occur rather - * rarely - */ - IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_STREAMSRC); - - return; - } - /* Otherwise do not bother to release the VBO. If we're doing direct locking now, - * and the declarations changed the code below will fetch the VBO's contents, convert - * and on the next decl change the data will be in sysmem too and we can just release the VBO + FIXME("Too much declaration changes, stopping converting\n"); + ENTER_GL(); + GL_EXTCALL(glDeleteBuffersARB(1, &This->vbo)); + checkGLcall("glDeleteBuffersARB"); + LEAVE_GL(); + This->vbo = 0; + + /* The stream source state handler might have read the memory of the vertex buffer already + * and got the memory in the vbo which is not valid any longer. Dirtify the stream source + * to force a reload. This happens only once per changed vertexbuffer and should occur rather + * rarely */ + IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_STREAMSRC); + + return; } } else { /* However, it is perfectly fine to change the declaration every now and then. We don't want a game that @@ -339,46 +333,20 @@ static void WINAPI IWineD3DVertexBufferImpl_PreLoad(IWineD3DVertexBuffer *if This->dirtystart = 0; This->dirtyend = 0; - /* If there was no conversion done before, then resource.allocatedMemory does not exist - * because locking was done directly into the VBO. In this case get the data out - */ - if(declChanged && !This->resource.allocatedMemory) { - - This->resource.allocatedMemory = HeapAlloc(GetProcessHeap(), 0, This->resource.size); - if(!This->resource.allocatedMemory) { - ERR("Out of memory when allocating memory for a vertex buffer\n"); - return; - } - ERR("Was locking directly into the VBO, reading data back because conv is needed\n"); - - ENTER_GL(); - GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, This->vbo)); - checkGLcall("glBindBufferARB"); - data = GL_EXTCALL(glMapBufferARB(GL_ARRAY_BUFFER_ARB, GL_READ_WRITE_ARB)); - if(!data) { - ERR("glMapBuffer failed!\n"); - LEAVE_GL(); - return; - } - memcpy(This->resource.allocatedMemory, data, This->resource.size); - GL_EXTCALL(glUnmapBufferARB(GL_ARRAY_BUFFER_ARB)); - checkGLcall("glUnmapBufferARB"); - LEAVE_GL(); - } - if (This->strided.u.s.position.dwStride) stride = This->strided.u.s.position.dwStride; else if(This->strided.u.s.specular.dwStride) stride = This->strided.u.s.specular.dwStride; else if(This->strided.u.s.diffuse.dwStride) stride = This->strided.u.s.diffuse.dwStride; else { - /* That means that there is nothing to fixup. Upload everything into the VBO and - * free This->resource.allocatedMemory + /* That means that there is nothing to fixup. Just upload from This->resource.allocatedMemory + * directly into the vbo. Do not free the system memory copy because drawPrimitive may need it if + * the stride is 0, for instancing emulation, vertex blending emulation or shader emulation. */ TRACE("No conversion needed, locking directly into the VBO in future\n"); ENTER_GL(); GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, This->vbo)); checkGLcall("glBindBufferARB"); - GL_EXTCALL(glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, This->resource.size, This->resource.allocatedMemory)); + GL_EXTCALL(glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, start, end-start, This->resource.allocatedMemory + start)); checkGLcall("glBufferSubDataARB"); LEAVE_GL(); return; @@ -448,31 +416,8 @@ static HRESULT WINAPI IWineD3DVertexBufferImpl_Lock(IWineD3DVertexBuffer *iface This->dirtyend = This->resource.size; } - if(This->resource.allocatedMemory) { - data = This->resource.allocatedMemory; - This->Flags |= VBFLAG_DIRTY; - } else { - GLenum mode = GL_READ_WRITE_ARB; - /* Return data to the VBO */ - - TRACE("Locking directly into the buffer\n"); - - if((This->resource.usage & WINED3DUSAGE_WRITEONLY) || ( Flags & WINED3DLOCK_DISCARD) ) { - mode = GL_WRITE_ONLY_ARB; - } else if( Flags & (WINED3DLOCK_READONLY | WINED3DLOCK_NO_DIRTY_UPDATE) ) { - mode = GL_READ_ONLY_ARB; - } - - ENTER_GL(); - GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, This->vbo)); - checkGLcall("glBindBufferARB"); - data = GL_EXTCALL(glMapBufferARB(GL_ARRAY_BUFFER_ARB, mode)); - LEAVE_GL(); - if(!data) { - ERR("glMapBuffer failed\n"); - return WINED3DERR_INVALIDCALL; - } - } + data = This->resource.allocatedMemory; + This->Flags |= VBFLAG_DIRTY; *ppbData = data + OffsetToLock; TRACE("(%p) : returning memory of %p (base:%p,offset:%u)\n", This, data + OffsetToLock, data, OffsetToLock); @@ -491,14 +436,7 @@ HRESULT WINAPI IWineD3DVertexBufferImpl_Unlock(IWineD3DVertexBuffer *iface) { return D3D_OK; } - if(!This->resource.allocatedMemory) { - ENTER_GL(); - GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, This->vbo)); - checkGLcall("glBindBufferARB"); - GL_EXTCALL(glUnmapBufferARB(GL_ARRAY_BUFFER_ARB)); - checkGLcall("glUnmapBufferARB"); - LEAVE_GL(); - } else if(This->Flags & VBFLAG_HASDESC){ + if(This->Flags & VBFLAG_HASDESC) { IWineD3DVertexBufferImpl_PreLoad(iface); } return WINED3D_OK;

1 0

Stefan Dösinger : wined3d: Replace the light chain with a hashmap.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: acadf3f241be9270799d4dd1007303200d047fc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acadf3f241be9270799d4dd10… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 14 17:46:54 2007 +0100 wined3d: Replace the light chain with a hashmap. --- dlls/wined3d/device.c | 360 +++++++++++---------------------------- dlls/wined3d/state.c | 12 +- dlls/wined3d/stateblock.c | 139 +++++++++++----- dlls/wined3d/wined3d_private.h | 11 +- 4 files changed, 210 insertions(+), 312 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=acadf3f241be9270799d4…

1 0

Stefan Dösinger : wined3d: Move lights to the state table.
by Alexandre Julliard 14 Feb '07

14 Feb '07

Module: wine Branch: master Commit: 174b6321eba9633419737a189019f66d5d34a2fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=174b6321eba9633419737a189… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 14 17:48:52 2007 +0100 wined3d: Move lights to the state table. --- dlls/wined3d/device.c | 110 +------------------------------------- dlls/wined3d/state.c | 113 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 5 ++- 3 files changed, 120 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=174b6321eba9633419737…

1 0