February 2007 - Wine-Commits

Stefan Dösinger : wined3d: Activate a different context if the active render target is destroyed.
by Alexandre Julliard Feb. 19, 2007

Feb. 19, 2007

Module: wine Branch: master Commit: 5e37345b3046aa0c80a9d12044a506028ed8e65b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e37345b3046aa0c80a9d1204… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Feb 17 18:06:30 2007 +0100 wined3d: Activate a different context if the active render target is destroyed. --- dlls/wined3d/surface.c | 36 ++++++++++++++++++++++++++++++++---- 1 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 333712d..b090366 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -247,6 +247,38 @@ ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) { if (ref == 0) { IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->resource.wineD3DDevice; TRACE("(%p) : cleaning up\n", This); + + if(iface == device->lastActiveRenderTarget) { + IWineD3DSwapChainImpl *swapchain = device->swapchains ? (IWineD3DSwapChainImpl *) device->swapchains[0] : NULL; + + TRACE("Last active render target destroyed\n"); + /* Find a replacement surface for the currently active back buffer. The context manager does not do NULL + * checks, so switch to a valid target as long as the currently set surface is still valid. Use the + * surface of the implicit swpchain. If that is the same as the destroyed surface the device is destroyed + * and the lastActiveRenderTarget member shouldn't matter + */ + if(swapchain) { + if(swapchain->backBuffer && swapchain->backBuffer[0] != iface) { + TRACE("Activating primary back buffer\n"); + ActivateContext(device, swapchain->backBuffer[0], CTXUSAGE_RESOURCELOAD); + } else if(!swapchain->backBuffer && swapchain->frontBuffer != iface) { + /* Single buffering environment */ + TRACE("Activating primary front buffer\n"); + ActivateContext(device, swapchain->frontBuffer, CTXUSAGE_RESOURCELOAD); + } else { + TRACE("Device is beeing destroyed, setting lastActiveRenderTarget = 0xdeadbabe\n"); + /* Implicit render target destroyed, that means the device is beeing destroyed + * whatever we set here, it shouldn't matter + */ + device->lastActiveRenderTarget = (IWineD3DSurface *) 0xdeadbabe; + } + } else { + /* May happen during ddraw uninitialization */ + TRACE("Render target set, but swapchain does not exist!\n"); + device->lastActiveRenderTarget = (IWineD3DSurface *) 0xdeadcafe; + } + } + if (This->glDescription.textureName != 0) { /* release the openGL texture.. */ ENTER_GL(); TRACE("Deleting texture %d\n", This->glDescription.textureName); @@ -269,10 +301,6 @@ ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) { if(iface == device->ddraw_primary) device->ddraw_primary = NULL; - if(iface == device->lastActiveRenderTarget) { - device->lastActiveRenderTarget = NULL; - } - TRACE("(%p) Released\n", This); HeapFree(GetProcessHeap(), 0, This);

1 0

Stefan Dösinger : wined3d: Only scream about unsupported vertex blending when it is used.
by Alexandre Julliard Feb. 19, 2007

Feb. 19, 2007

Module: wine Branch: master Commit: 762e227994b4bcd71a9f230efcf89e92dea40b8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=762e227994b4bcd71a9f230ef… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 16 19:15:15 2007 +0100 wined3d: Only scream about unsupported vertex blending when it is used. --- dlls/wined3d/state.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 16fddf7..257757f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2396,8 +2396,10 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVerte #endif } else { - /* TODO: support blends in fixupVertices */ - FIXME("unsupported blending in openGl\n"); + /* TODO: support blends in drawStridedSlow + * No need to write a FIXME here, this is done after the general vertex decl decoding + */ + WARN("unsupported blending in openGl\n"); } } else { if (GL_SUPPORT(ARB_VERTEX_BLEND)) { @@ -2785,8 +2787,11 @@ static inline void handleStreams(IWineD3DStateBlockImpl *stateblock, BOOL useVer /* Generate some fixme's if unsupported functionality is being used */ #define BUFFER_OR_DATA(_attribute) dataLocations->u.s._attribute.lpData /* TODO: Either support missing functionality in fixupVertices or by creating a shader to replace the pipeline. */ - if (!useVertexShaderFunction && (BUFFER_OR_DATA(blendMatrixIndices) || BUFFER_OR_DATA(blendWeights))) { - FIXME("Blending data is only valid with vertex shaders %p %p\n",dataLocations->u.s.blendWeights.lpData,dataLocations->u.s.blendWeights.lpData); + if (!useVertexShaderFunction && + stateblock->renderState[WINED3DRS_VERTEXBLEND] && + (BUFFER_OR_DATA(blendMatrixIndices) || BUFFER_OR_DATA(blendWeights))) { + FIXME("Vertex Blending is not implemented yet %p %p\n",dataLocations->u.s.blendWeights.lpData,dataLocations->u.s.blendWeights.lpData); + /* TODO: Implement it using GL_ARB_vertex_blend or software emulation in drawStridedSlow */ } if (!useVertexShaderFunction && (BUFFER_OR_DATA(position2) || BUFFER_OR_DATA(normal2))) { FIXME("Tweening is only valid with vertex shaders\n");

1 0

Stefan Dösinger : wined3d: Pretend to support event queries.
by Alexandre Julliard Feb. 19, 2007

Feb. 19, 2007

Module: wine Branch: master Commit: 06f2829b921f7f18aa66ec880f86b95d49c4bf3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=06f2829b921f7f18aa66ec880… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 16 19:14:46 2007 +0100 wined3d: Pretend to support event queries. --- dlls/wined3d/device.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3ad864e..30771b0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1088,10 +1088,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateQuery(IWineD3DDevice *iface, WINE else WARN("Unsupported in local OpenGL implementation: ARB_OCCLUSION_QUERY/NV_OCCLUSION_QUERY\n"); break; + + case WINED3DQUERYTYPE_EVENT: + /* Half-Life 2 needs this query. It does not render the main menu correctly otherwise + * Pretend to support it, faking this query does not do much harm except potentially lowering performance + */ + FIXME("(%p) Event query: Unimplemented, but pretending to be supported\n", This); + hr = WINED3D_OK; + break; + case WINED3DQUERYTYPE_VCACHE: case WINED3DQUERYTYPE_RESOURCEMANAGER: case WINED3DQUERYTYPE_VERTEXSTATS: - case WINED3DQUERYTYPE_EVENT: case WINED3DQUERYTYPE_TIMESTAMP: case WINED3DQUERYTYPE_TIMESTAMPDISJOINT: case WINED3DQUERYTYPE_TIMESTAMPFREQ:

1 0

Stefan Dösinger : ddraw: Test and fix IDirectDrawSurfaceX::GetDDInterface.
by Alexandre Julliard Feb. 19, 2007

Feb. 19, 2007

Module: wine Branch: master Commit: cd3bc1d17d2aaf0b751ea38a1ef66f79a77f4f2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd3bc1d17d2aaf0b751ea38a1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 16 19:09:19 2007 +0100 ddraw: Test and fix IDirectDrawSurfaceX::GetDDInterface. --- dlls/ddraw/surface.c | 10 +- dlls/ddraw/tests/dsurface.c | 284 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 290 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd3bc1d17d2aaf0b751ea…

1 0

Stefan Dösinger : ddraw: Creating surfaces with old interfaces doesn't addref.
by Alexandre Julliard Feb. 19, 2007

Feb. 19, 2007

Module: wine Branch: master Commit: 1036ca0df66d4b286448ff474601b7896debce44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1036ca0df66d4b286448ff474… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 16 19:08:09 2007 +0100 ddraw: Creating surfaces with old interfaces doesn't addref. --- dlls/ddraw/ddraw_thunks.c | 6 ++---- dlls/ddraw/surface.c | 2 +- dlls/ddraw/tests/refcount.c | 26 ++++++++++++++++++++++++-- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw_thunks.c b/dlls/ddraw/ddraw_thunks.c index ce61f18..964466d 100644 --- a/dlls/ddraw/ddraw_thunks.c +++ b/dlls/ddraw/ddraw_thunks.c @@ -410,8 +410,7 @@ IDirectDrawImpl_CreateSurface(LPDIRECTDRAW This, LPDDSURFACEDESC pSDesc, IDirectDraw, IDirectDraw7, This)); - IDirectDraw_AddRef(This); - impl->ifaceToRelease = (IUnknown *) This; + impl->ifaceToRelease = NULL; } return hr; @@ -446,8 +445,7 @@ IDirectDraw2Impl_CreateSurface(LPDIRECTDRAW2 This, LPDDSURFACEDESC pSDesc, IDirectDraw2, IDirectDraw7, This)); - IDirectDraw2_AddRef(This); - impl->ifaceToRelease = (IUnknown *) This; + impl->ifaceToRelease = NULL; } return hr; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index cd35832..c41d08f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -376,7 +376,7 @@ IDirectDrawSurfaceImpl_Release(IDirectDrawSurface7 *iface) IDirectDrawSurfaceImpl_Destroy(This); /* Reduce the ddraw refcount */ - IUnknown_Release(ifaceToRelease); + if(ifaceToRelease) IUnknown_Release(ifaceToRelease); } return ref; diff --git a/dlls/ddraw/tests/refcount.c b/dlls/ddraw/tests/refcount.c index b79612f..11301d3 100644 --- a/dlls/ddraw/tests/refcount.c +++ b/dlls/ddraw/tests/refcount.c @@ -49,10 +49,12 @@ static void test_ddraw_objects(void) unsigned long ref; IDirectDraw7 *DDraw7; IDirectDraw4 *DDraw4; - IDirectDraw4 *DDraw2; - IDirectDraw4 *DDraw1; + IDirectDraw2 *DDraw2; + IDirectDraw *DDraw1; IDirectDrawPalette *palette; IDirectDrawSurface7 *surface; + IDirectDrawSurface *surface1; + IDirectDrawSurface4 *surface4; PALETTEENTRY Table[256]; DDSURFACEDESC2 ddsd; @@ -163,6 +165,26 @@ static void test_ddraw_objects(void) ok(ref == 1, "Got refcount %ld, expected 1\n", ref); IDirectDrawPalette_Release(palette); + /* Simmilar for surfaces */ + hr = IDirectDraw4_CreateSurface(DDraw4, &ddsd, &surface4, NULL); + ok(hr == DD_OK, "CreateSurface returned %08x\n", hr); + ref = getRefcount( (IUnknown *) DDraw4); + ok(ref == 2, "Got refcount %ld, expected 2\n", ref); + IDirectDrawSurface4_Release(surface4); + + ddsd.dwSize = sizeof(DDSURFACEDESC); + hr = IDirectDraw2_CreateSurface(DDraw2, (DDSURFACEDESC *) &ddsd, &surface1, NULL); + ok(hr == DD_OK, "CreateSurface returned %08x\n", hr); + ref = getRefcount( (IUnknown *) DDraw2); + ok(ref == 1, "Got refcount %ld, expected 1\n", ref); + IDirectDrawSurface_Release(surface1); + + hr = IDirectDraw_CreateSurface(DDraw1, (DDSURFACEDESC *) &ddsd, &surface1, NULL); + ok(hr == DD_OK, "CreateSurface returned %08x\n", hr); + ref = getRefcount( (IUnknown *) DDraw1); + ok(ref == 1, "Got refcount %ld, expected 1\n", ref); + IDirectDrawSurface_Release(surface1); + IDirectDraw7_Release(DDraw7); IDirectDraw4_Release(DDraw4); IDirectDraw2_Release(DDraw2);

1 0

Stefan Dösinger : ddraw: Fix a leak in a test.
by Alexandre Julliard Feb. 19, 2007

Feb. 19, 2007

Module: wine Branch: master Commit: 68e7ed2c90f0bd981ef9aaae5b4396e8537f0ff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68e7ed2c90f0bd981ef9aaae5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 16 19:08:13 2007 +0100 ddraw: Fix a leak in a test. --- dlls/ddraw/tests/dsurface.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 5948f3e..5e7f649 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -107,6 +107,9 @@ static void MipMapCreationTest(void) ok(U2(ddsd).dwMipMapCount == 1, "Incorrect mipmap count: %d.\n", U2(ddsd).dwMipMapCount); + /* Destroy the surface. */ + IDirectDrawSurface_Release(lpDDSMipMapTest); + /* Third mipmap creation test: create a surface with DDSCAPS_MIPMAP, DDSCAPS_COMPLEX and without DDSD_MIPMAPCOUNT. @@ -133,6 +136,9 @@ static void MipMapCreationTest(void) ok(U2(ddsd).dwMipMapCount == 6, "Incorrect mipmap count: %d.\n", U2(ddsd).dwMipMapCount); + /* Destroy the surface. */ + IDirectDrawSurface_Release(lpDDSMipMapTest); + /* Fourth mipmap creation test: same as above with a different texture size.

1 0

Stefan Dösinger : ddraw: SetClipper refcounting fix.
by Alexandre Julliard Feb. 19, 2007

Feb. 19, 2007

Module: wine Branch: master Commit: ae91cfe380f53c29f7d91f97f4f7dcbdef288be4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae91cfe380f53c29f7d91f97f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 16 19:08:21 2007 +0100 ddraw: SetClipper refcounting fix. --- dlls/ddraw/surface.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a84b08f..cd35832 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1882,17 +1882,18 @@ IDirectDrawSurfaceImpl_SetClipper(IDirectDrawSurface7 *iface, IDirectDrawClipper *Clipper) { ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawSurface7, iface); + IDirectDrawClipperImpl *oldClipper = This->clipper; TRACE("(%p)->(%p)\n",This,Clipper); if (ICOM_OBJECT(IDirectDrawClipperImpl, IDirectDrawClipper, Clipper) == This->clipper) return DD_OK; - if (This->clipper != NULL) - IDirectDrawClipper_Release(ICOM_INTERFACE(This->clipper, IDirectDrawClipper) ); - This->clipper = ICOM_OBJECT(IDirectDrawClipperImpl, IDirectDrawClipper, Clipper); + if (Clipper != NULL) IDirectDrawClipper_AddRef(Clipper); + if(oldClipper) + IDirectDrawClipper_Release(ICOM_INTERFACE(oldClipper, IDirectDrawClipper)); return DD_OK; }

1 0

Stefan Dösinger : wined3d: Lighting is calculated for vertices without normals.
by Alexandre Julliard Feb. 19, 2007

Feb. 19, 2007

Module: wine Branch: master Commit: 266fc77cf0dcad53155b05b551356eef5604111d URL: http://source.winehq.org/git/wine.git/?a=commit;h=266fc77cf0dcad53155b05b55… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 16 19:08:34 2007 +0100 wined3d: Lighting is calculated for vertices without normals. It still should be disabled for transformed vertices though. --- dlls/d3d8/tests/visual.c | 139 ++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/visual.c | 146 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/visual.c | 129 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/state.c | 11 ++-- 4 files changed, 420 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=266fc77cf0dcad53155b0…

1 0

Stefan Dösinger : wined3d: Visual test framework.
by Alexandre Julliard Feb. 19, 2007

Feb. 19, 2007

Module: wine Branch: master Commit: 03bc11fa16a7af2bf461fd33e44cff3fe717ca4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=03bc11fa16a7af2bf461fd33e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 16 19:08:28 2007 +0100 wined3d: Visual test framework. --- dlls/d3d8/tests/Makefile.in | 1 + dlls/d3d8/tests/visual.c | 175 +++++++++++++++++++++++++++++++++ dlls/d3d9/tests/Makefile.in | 1 + dlls/d3d9/tests/visual.c | 175 +++++++++++++++++++++++++++++++++ dlls/ddraw/tests/Makefile.in | 3 +- dlls/ddraw/tests/visual.c | 219 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 4 + 7 files changed, 577 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03bc11fa16a7af2bf461f…

1 0

Stefan Dösinger : wined3d: Remove an outdated TODO comment.
by Alexandre Julliard Feb. 19, 2007

Feb. 19, 2007

Module: wine Branch: master Commit: 5916fdd56033994078a0c7671aea5180f82f6e08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5916fdd56033994078a0c7671… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 16 19:05:31 2007 +0100 wined3d: Remove an outdated TODO comment. BltFast takes care of activating the correct context nowadays. --- dlls/wined3d/swapchain.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f9a402c..48253e9 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -364,16 +364,14 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_GetFrontBufferData(IWineD3DSwapChain POINT start; TRACE("(%p) : iface(%p) pDestSurface(%p)\n", This, iface, pDestSurface); - + start.x = 0; start.y = 0; - + if (This->presentParms.Windowed) { MapWindowPoints(This->win_handle, NULL, &start, 1); } -#if 0 /* TODO: make sure that this swapchains context is active */ - IWineD3DDevice_ActivateSwapChainContext(This->wineD3DDevice, iface); -#endif + IWineD3DSurface_BltFast(pDestSurface, start.x, start.y, This->frontBuffer, NULL, 0); return WINED3D_OK; }

1 0