January 2008 - Wine-commits

Stefan Dösinger : wined3d: Reset the shader state on shader_*_destroy.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: 4d0a609452156b75ca09227d68b5a2317ae94888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d0a609452156b75ca09227d6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 8 20:53:17 2008 +0100 wined3d: Reset the shader state on shader_*_destroy. --- dlls/wined3d/arb_program_shader.c | 4 ++++ dlls/wined3d/glsl_shader.c | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index aad2865..6bdf265 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1733,6 +1733,10 @@ static void shader_arb_cleanup(IWineD3DDevice *iface) { } static void shader_arb_destroy(IWineD3DBaseShader *iface) { + IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *) iface; + + This->baseShader.prgId = 0; + This->baseShader.is_compiled = FALSE; } const shader_backend_t arb_program_shader_backend = { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 07415d2..64ca8b1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3278,6 +3278,8 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { TRACE("Deleting shader object %u\n", This->baseShader.prgId); GL_EXTCALL(glDeleteObjectARB(This->baseShader.prgId)); checkGLcall("glDeleteObjectARB"); + This->baseShader.prgId = 0; + This->baseShader.is_compiled = FALSE; } const shader_backend_t glsl_shader_backend = {

1 0

Stefan Dösinger : wined3d: Destroy arb shaders on shader destroy.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: 11561948818138c779a8eb260a133068a76106e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11561948818138c779a8eb260… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 8 20:56:22 2008 +0100 wined3d: Destroy arb shaders on shader destroy. --- dlls/wined3d/arb_program_shader.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6bdf265..5c1e5c3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1734,7 +1734,12 @@ static void shader_arb_cleanup(IWineD3DDevice *iface) { static void shader_arb_destroy(IWineD3DBaseShader *iface) { IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *) iface; + WineD3D_GL_Info *gl_info = &((IWineD3DDeviceImpl *) This->baseShader.device)->adapter->gl_info; + ENTER_GL(); + GL_EXTCALL(glDeleteProgramsARB(1, &This->baseShader.prgId)); + checkGLcall("GL_EXTCALL(glDeleteProgramsARB(1, &This->baseShader.prgId))"); + LEAVE_GL(); This->baseShader.prgId = 0; This->baseShader.is_compiled = FALSE; }

1 0

Stefan Dösinger : wined3d: Destroy opengl shaders on reset.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: 11d6ed0c0b1d391bae58fb063a2062f4a30e0315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11d6ed0c0b1d391bae58fb063… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 8 21:00:22 2008 +0100 wined3d: Destroy opengl shaders on reset. --- dlls/wined3d/device.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e0e3bf2..84cbe89 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6781,6 +6781,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE HRESULT hr; BOOL DisplayModeChanged = FALSE; WINED3DDISPLAYMODE mode; + IWineD3DBaseShaderImpl *shader; TRACE("(%p)\n", This); hr = IWineD3DDevice_GetSwapChain(iface, 0, (IWineD3DSwapChain **) &swapchain); @@ -6835,6 +6836,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE } IWineD3DDevice_EnumResources(iface, reset_unload_resources, NULL); + LIST_FOR_EACH_ENTRY(shader, &This->shaders, IWineD3DBaseShaderImpl, baseShader.shader_list_entry) { + This->shader_backend->shader_destroy((IWineD3DBaseShader *) shader); + } if(pPresentationParameters->Windowed) { mode.Width = swapchain->orig_width;

1 0

Stefan Dösinger : wined3d: Unload all resources on Reset.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: c3c6c6f543cd80e30ff82f51611e50178599916d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3c6c6f543cd80e30ff82f516… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 8 22:34:43 2008 +0100 wined3d: Unload all resources on Reset. --- 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 3ec2c42..e5721d1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6766,6 +6766,13 @@ static void updateSurfaceDesc(IWineD3DSurfaceImpl *surface, WINED3DPRESENT_PARAM surface->resource.size = IWineD3DSurface_GetPitch((IWineD3DSurface *) surface) * surface->pow2Width; } +static HRESULT WINAPI reset_unload_resources(IWineD3DResource *resource, void *data) { + TRACE("Unloading resource %p\n", resource); + IWineD3DResource_UnLoad(resource); + IWineD3DResource_Release(resource); + return S_OK; +} + static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRESENT_PARAMETERS* pPresentationParameters) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; IWineD3DSwapChainImpl *swapchain; @@ -6824,7 +6831,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE if(pPresentationParameters->EnableAutoDepthStencil != swapchain->presentParms.EnableAutoDepthStencil) { ERR("What do do about a changed auto depth stencil parameter?\n"); } - TRACE("Checks done\n"); + + IWineD3DDevice_EnumResources(iface, reset_unload_resources, NULL); if(pPresentationParameters->Windowed) { mode.Width = swapchain->orig_width;

1 0

Stefan Dösinger : wined3d: Keep track of shaders.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: 09bf3d5aeaa27f0e1c6c0244e4237c3ab7d20757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09bf3d5aeaa27f0e1c6c0244e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 8 20:45:59 2008 +0100 wined3d: Keep track of shaders. --- dlls/wined3d/baseshader.c | 1 + dlls/wined3d/device.c | 2 ++ dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 0a0c10e..858bf7f 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1142,6 +1142,7 @@ ULONG WINAPI IWineD3DBaseShaderImpl_Release(IWineD3DBaseShader *iface) { shader_delete_constant_list(&This->baseShader.constantsF); shader_delete_constant_list(&This->baseShader.constantsB); shader_delete_constant_list(&This->baseShader.constantsI); + list_remove(&This->baseShader.shader_list_entry); HeapFree(GetProcessHeap(), 0, This); } return ref; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e5721d1..e0e3bf2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1883,6 +1883,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexShader(IWineD3DDevice *ifac IWineD3DVertexShader_Release(*ppVertexShader); return WINED3DERR_INVALIDCALL; } + list_add_head(&This->shaders, &object->baseShader.shader_list_entry); return WINED3D_OK; } @@ -1897,6 +1898,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreatePixelShader(IWineD3DDevice *iface hr = IWineD3DPixelShader_SetFunction(*ppPixelShader, pFunction); if (WINED3D_OK == hr) { TRACE("(%p) : Created Pixel shader %p\n", This, *ppPixelShader); + list_add_head(&This->shaders, &object->baseShader.shader_list_entry); } else { WARN("(%p) : Failed to create pixel shader\n", This); } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index aac3c7b..f1c7100 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2742,6 +2742,7 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, IWineD3D_AddRef(object->wineD3D); object->parent = parent; list_init(&object->resources); + list_init(&object->shaders); if(This->dxVersion == 7) { object->surface_alignment = 8; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 41c036d..7c95275 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -675,6 +675,7 @@ struct IWineD3DDeviceImpl UINT NumberOfSwapChains; struct list resources; /* a linked list to track resources created by the device */ + struct list shaders; /* a linked list to track shaders (pixel and vertex) */ /* Render Target Support */ IWineD3DSurface **render_targets; @@ -1970,6 +1971,7 @@ typedef struct IWineD3DBaseShaderClass /* Pointer to the parent device */ IWineD3DDevice *device; + struct list shader_list_entry; } IWineD3DBaseShaderClass;

1 0

Stefan Dösinger : wined3d: Implement VolumeTexture:: UnLoad.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: 8bb5d13fe2d01cd1c3486701e7f7404f1febabf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bb5d13fe2d01cd1c3486701e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 8 15:48:39 2008 +0100 wined3d: Implement VolumeTexture::UnLoad. --- dlls/wined3d/volumetexture.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index b2b3d2d..61c2626 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -136,7 +136,26 @@ static void WINAPI IWineD3DVolumeTextureImpl_PreLoad(IWineD3DVolumeTexture *ifac } static void WINAPI IWineD3DVolumeTextureImpl_UnLoad(IWineD3DVolumeTexture *iface) { - IWineD3DResourceImpl_UnLoad((IWineD3DResource *)iface); + unsigned int i; + IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + TRACE("(%p)\n", This); + + /* Unload all the surfaces and reset the texture name. If UnLoad was called on the + * surface before, this one will be a NOP and vice versa. Unloading an unloaded + * surface is fine + */ + for (i = 0; i < This->baseTexture.levels; i++) { + IWineD3DVolume_UnLoad(This->volumes[i]); + } + + if(This->baseTexture.textureName) { + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + ENTER_GL(); + glDeleteTextures(1, &This->baseTexture.textureName); + This->baseTexture.textureName = 0; + LEAVE_GL(); + } } static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeTextureImpl_GetType(IWineD3DVolumeTexture *iface) {

1 0

Stefan Dösinger : d3d9: Reject IDirect3DDevice9:: Reset with active default pool resources.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: 80953d62d7aff42b8516c48e1607efc6b0f96a8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=80953d62d7aff42b8516c48e1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 11 15:38:54 2008 +0100 d3d9: Reject IDirect3DDevice9::Reset with active default pool resources. --- dlls/d3d9/device.c | 97 ++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/device.c | 68 ++++++++++++++++++++++++--- dlls/wined3d/device.c | 22 ++++++++- include/wine/wined3d_interface.h | 6 ++ 4 files changed, 185 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80953d62d7aff42b8516c…

1 0

Stefan Dösinger : wined3d: Implement IWineD3DTexture:: UnLoad.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: 5d7b8dafb81e3f5397e31fb58cdaee9ecd256664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d7b8dafb81e3f5397e31fb58… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 8 15:33:24 2008 +0100 wined3d: Implement IWineD3DTexture::UnLoad. --- dlls/wined3d/texture.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5cac35c..eb16700 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -143,7 +143,27 @@ static void WINAPI IWineD3DTextureImpl_PreLoad(IWineD3DTexture *iface) { } static void WINAPI IWineD3DTextureImpl_UnLoad(IWineD3DTexture *iface) { - IWineD3DResourceImpl_UnLoad((IWineD3DResource *)iface); + unsigned int i; + IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + TRACE("(%p)\n", This); + + /* Unload all the surfaces and reset the texture name. If UnLoad was called on the + * surface before, this one will be a NOP and vice versa. Unloading an unloaded + * surface is fine + */ + for (i = 0; i < This->baseTexture.levels; i++) { + IWineD3DSurface_UnLoad(This->surfaces[i]); + IWineD3DSurface_SetGlTextureDesc(This->surfaces[i], 0, IWineD3DTexture_GetTextureDimensions(iface)); + } + + if(This->baseTexture.textureName) { + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + ENTER_GL(); + glDeleteTextures(1, &This->baseTexture.textureName); + This->baseTexture.textureName = 0; + LEAVE_GL(); + } } static WINED3DRESOURCETYPE WINAPI IWineD3DTextureImpl_GetType(IWineD3DTexture *iface) {

1 0

Stefan Dösinger : wined3d: Implement IWineD3DCubeTexture::UnLoad.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: 38a4f6339b75528334abb808c426555d0f29b9d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38a4f6339b75528334abb808c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 8 15:40:35 2008 +0100 wined3d: Implement IWineD3DCubeTexture::UnLoad. --- dlls/wined3d/cubetexture.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 8560ab0..6704b17 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -159,7 +159,29 @@ static void WINAPI IWineD3DCubeTextureImpl_PreLoad(IWineD3DCubeTexture *iface) { } static void WINAPI IWineD3DCubeTextureImpl_UnLoad(IWineD3DCubeTexture *iface) { - IWineD3DResourceImpl_UnLoad((IWineD3DResource *)iface); + unsigned int i, j; + IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + TRACE("(%p)\n", This); + + /* Unload all the surfaces and reset the texture name. If UnLoad was called on the + * surface before, this one will be a NOP and vice versa. Unloading an unloaded + * surface is fine + */ + for (i = 0; i < This->baseTexture.levels; i++) { + for (j = WINED3DCUBEMAP_FACE_POSITIVE_X; j <= WINED3DCUBEMAP_FACE_NEGATIVE_Z ; j++) { + IWineD3DSurface_UnLoad(This->surfaces[j][i]); + IWineD3DSurface_SetGlTextureDesc(This->surfaces[j][i], 0, IWineD3DTexture_GetTextureDimensions(iface)); + } + } + + if(This->baseTexture.textureName) { + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + ENTER_GL(); + glDeleteTextures(1, &This->baseTexture.textureName); + This->baseTexture.textureName = 0; + LEAVE_GL(); + } } static WINED3DRESOURCETYPE WINAPI IWineD3DCubeTextureImpl_GetType(IWineD3DCubeTexture *iface) {

1 0

Stefan Dösinger : wined3d: Implement IWineD3DIndexBuffer::UnLoad.
by Alexandre Julliard 14 Jan '08

14 Jan '08

Module: wine Branch: master Commit: 36729a874cd9d45138fa84a607d19388d470358c URL: http://source.winehq.org/git/wine.git/?a=commit;h=36729a874cd9d45138fa84a60… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 12 22:57:49 2008 +0100 wined3d: Implement IWineD3DIndexBuffer::UnLoad. --- dlls/wined3d/indexbuffer.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/indexbuffer.c b/dlls/wined3d/indexbuffer.c index b5d1597..372b834 100644 --- a/dlls/wined3d/indexbuffer.c +++ b/dlls/wined3d/indexbuffer.c @@ -111,7 +111,24 @@ static void WINAPI IWineD3DIndexBufferImpl_PreLoad(IWineD3DIndexBuffer *iface) { } static void WINAPI IWineD3DIndexBufferImpl_UnLoad(IWineD3DIndexBuffer *iface) { - IWineD3DResourceImpl_UnLoad((IWineD3DResource *)iface); + IWineD3DIndexBufferImpl *This = (IWineD3DIndexBufferImpl *) iface; + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + TRACE("(%p)\n", This); + + /* This is easy: The whole content is shadowed in This->resource.allocatedMemory, + * so we only have to destroy the vbo. Only do it if we have a vbo, which implies + * that vbos are supported. + * (TODO: Make a IWineD3DBuffer base class for index and vertex buffers and share + * this code. Also needed for D3D10) + */ + if(This->vbo) { + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + ENTER_GL(); + GL_EXTCALL(glDeleteBuffersARB(1, &This->vbo)); + checkGLcall("glDeleteBuffersARB"); + LEAVE_GL(); + This->vbo = 0; + } } static WINED3DRESOURCETYPE WINAPI IWineD3DIndexBufferImpl_GetType(IWineD3DIndexBuffer *iface) {

1 0