wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_add_dirty_rect().
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: 42375518bacef23d791375f17d7817cbb942eca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42375518bacef23d791375f17… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 26 21:33:04 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_add_dirty_rect(). --- dlls/wined3d/cubetexture.c | 4 ++-- dlls/wined3d/surface.c | 38 +++++++++++++++++++------------------- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index c11e32b..23b4554 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -396,12 +396,12 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_AddDirtyRect(IWineD3DCubeTexture * WINED3DCUBEMAP_FACES face, const RECT *dirty_rect) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; - IWineD3DSurface *surface; + IWineD3DSurfaceImpl *surface; TRACE("iface %p, face %u, dirty_rect %s.\n", iface, face, wine_dbgstr_rect(dirty_rect)); - if (!(surface = (IWineD3DSurface *)basetexture_get_sub_resource(texture, face, 0))) + if (!(surface = (IWineD3DSurfaceImpl *)basetexture_get_sub_resource(texture, face, 0))) { WARN("Failed to get sub-resource.\n"); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d5df8e2..fcdfec8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -446,7 +446,7 @@ HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, } /* Mark the texture as dirty so that it gets loaded first time around. */ - surface_add_dirty_rect((IWineD3DSurface *)surface, NULL); + surface_add_dirty_rect(surface, NULL); list_init(&surface->renderbuffers); TRACE("surface %p, memory %p, size %u\n", surface, surface->resource.allocatedMemory, surface->resource.size); @@ -953,35 +953,35 @@ GLenum surface_get_gl_buffer(IWineD3DSurfaceImpl *surface) } /* Slightly inefficient way to handle multiple dirty rects but it works :) */ -void surface_add_dirty_rect(IWineD3DSurface *iface, const RECT *dirty_rect) +void surface_add_dirty_rect(IWineD3DSurfaceImpl *surface, const RECT *dirty_rect) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; IWineD3DBaseTexture *baseTexture = NULL; - if (!(This->Flags & SFLAG_INSYSMEM) && (This->Flags & SFLAG_INTEXTURE)) - IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL /* no partial locking for textures yet */); + TRACE("surface %p, dirty_rect %s.\n", surface, wine_dbgstr_rect(dirty_rect)); - IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, TRUE); + if (!(surface->Flags & SFLAG_INSYSMEM) && (surface->Flags & SFLAG_INTEXTURE)) + /* No partial locking for textures yet. */ + IWineD3DSurface_LoadLocation((IWineD3DSurface *)surface, SFLAG_INSYSMEM, NULL); + + IWineD3DSurface_ModifyLocation((IWineD3DSurface *)surface, SFLAG_INSYSMEM, TRUE); if (dirty_rect) { - This->dirtyRect.left = min(This->dirtyRect.left, dirty_rect->left); - This->dirtyRect.top = min(This->dirtyRect.top, dirty_rect->top); - This->dirtyRect.right = max(This->dirtyRect.right, dirty_rect->right); - This->dirtyRect.bottom = max(This->dirtyRect.bottom, dirty_rect->bottom); + surface->dirtyRect.left = min(surface->dirtyRect.left, dirty_rect->left); + surface->dirtyRect.top = min(surface->dirtyRect.top, dirty_rect->top); + surface->dirtyRect.right = max(surface->dirtyRect.right, dirty_rect->right); + surface->dirtyRect.bottom = max(surface->dirtyRect.bottom, dirty_rect->bottom); } else { - This->dirtyRect.left = 0; - This->dirtyRect.top = 0; - This->dirtyRect.right = This->currentDesc.Width; - This->dirtyRect.bottom = This->currentDesc.Height; + surface->dirtyRect.left = 0; + surface->dirtyRect.top = 0; + surface->dirtyRect.right = surface->currentDesc.Width; + surface->dirtyRect.bottom = surface->currentDesc.Height; } - TRACE("(%p) : Dirty: yes, Rect:(%d, %d, %d, %d)\n", This, This->dirtyRect.left, - This->dirtyRect.top, This->dirtyRect.right, This->dirtyRect.bottom); - /* if the container is a basetexture then mark it dirty. */ - if (SUCCEEDED(IWineD3DSurface_GetContainer(iface, &IID_IWineD3DBaseTexture, (void **)&baseTexture))) + if (SUCCEEDED(IWineD3DSurface_GetContainer((IWineD3DSurface *)surface, + &IID_IWineD3DBaseTexture, (void **)&baseTexture))) { TRACE("Passing to container\n"); IWineD3DBaseTexture_SetDirty(baseTexture, TRUE); @@ -1767,7 +1767,7 @@ lock_end: * Dirtify on lock * as seen in msdn docs */ - surface_add_dirty_rect(iface, pRect); + surface_add_dirty_rect(This, pRect); /** Dirtify Container if needed */ if (SUCCEEDED(IWineD3DSurface_GetContainer(iface, &IID_IWineD3DBaseTexture, (void **)&pBaseTexture))) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0de3f06..258dea2 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -408,11 +408,11 @@ static HRESULT WINAPI IWineD3DTextureImpl_UnlockRect(IWineD3DTexture *iface, UIN static HRESULT WINAPI IWineD3DTextureImpl_AddDirtyRect(IWineD3DTexture *iface, const RECT *dirty_rect) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; - IWineD3DSurface *surface; + IWineD3DSurfaceImpl *surface; TRACE("iface %p, dirty_rect %s.\n", iface, wine_dbgstr_rect(dirty_rect)); - if (!(surface = (IWineD3DSurface *)basetexture_get_sub_resource(texture, 0, 0))) + if (!(surface = (IWineD3DSurfaceImpl *)basetexture_get_sub_resource(texture, 0, 0))) { WARN("Failed to get sub-resource.\n"); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e8f8d6a..70ecb22 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2673,7 +2673,7 @@ void state_fogstartend(DWORD state, IWineD3DStateBlockImpl *stateblock, void state_fog_fragpart(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) DECLSPEC_HIDDEN; -void surface_add_dirty_rect(IWineD3DSurface *iface, const RECT *dirty_rect) DECLSPEC_HIDDEN; +void surface_add_dirty_rect(IWineD3DSurfaceImpl *surface, const RECT *dirty_rect) DECLSPEC_HIDDEN; GLenum surface_get_gl_buffer(IWineD3DSurfaceImpl *surface) DECLSPEC_HIDDEN; void surface_load_ds_location(IWineD3DSurfaceImpl *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_set_texture_target() .
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: f78d85ffe15ddaa73a4da4857f01065a0a733a07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f78d85ffe15ddaa73a4da4857… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 26 21:33:03 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_set_texture_target(). --- dlls/wined3d/cubetexture.c | 4 ++-- dlls/wined3d/surface.c | 18 ++++++++---------- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 44f6196..c11e32b 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -126,7 +126,7 @@ static void cubetexture_cleanup(IWineD3DCubeTextureImpl *This) * surface doesn't try and release it. */ surface_set_texture_name(surface, 0, TRUE); surface_set_texture_name(surface, 0, FALSE); - surface_set_texture_target((IWineD3DSurface *)surface, 0); + surface_set_texture_target(surface, 0); IWineD3DSurface_SetContainer((IWineD3DSurface *)surface, NULL); IWineD3DSurface_Release((IWineD3DSurface *)surface); } @@ -559,7 +559,7 @@ HRESULT cubetexture_init(IWineD3DCubeTextureImpl *texture, UINT edge_length, UIN } IWineD3DSurface_SetContainer(surface, (IWineD3DBase *)texture); - surface_set_texture_target(surface, cube_targets[j]); + surface_set_texture_target((IWineD3DSurfaceImpl *)surface, cube_targets[j]); texture->baseTexture.sub_resources[idx] = (IWineD3DResourceImpl *)surface; TRACE("Created surface level %u @ %p.\n", i, surface); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index efe5030..d5df8e2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -499,25 +499,23 @@ void surface_set_texture_name(IWineD3DSurfaceImpl *surface, GLuint new_name, BOO surface_force_reload(surface); } -void surface_set_texture_target(IWineD3DSurface *iface, GLenum target) +void surface_set_texture_target(IWineD3DSurfaceImpl *surface, GLenum target) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - - TRACE("(%p) : setting target %#x\n", This, target); + TRACE("surface %p, target %#x.\n", surface, target); - if (This->texture_target != target) + if (surface->texture_target != target) { if (target == GL_TEXTURE_RECTANGLE_ARB) { - This->Flags &= ~SFLAG_NORMCOORD; + surface->Flags &= ~SFLAG_NORMCOORD; } - else if (This->texture_target == GL_TEXTURE_RECTANGLE_ARB) + else if (surface->texture_target == GL_TEXTURE_RECTANGLE_ARB) { - This->Flags |= SFLAG_NORMCOORD; + surface->Flags |= SFLAG_NORMCOORD; } } - This->texture_target = target; - surface_force_reload(This); + surface->texture_target = target; + surface_force_reload(surface); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 35d5e61..0de3f06 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -118,7 +118,7 @@ static void texture_cleanup(IWineD3DTextureImpl *This) * surface doesn't try and release it */ surface_set_texture_name(surface, 0, TRUE); surface_set_texture_name(surface, 0, FALSE); - surface_set_texture_target((IWineD3DSurface *)surface, 0); + surface_set_texture_target(surface, 0); IWineD3DSurface_SetContainer((IWineD3DSurface *)surface, NULL); IWineD3DSurface_Release((IWineD3DSurface *)surface); } @@ -612,7 +612,7 @@ HRESULT texture_init(IWineD3DTextureImpl *texture, UINT width, UINT height, UINT } IWineD3DSurface_SetContainer(surface, (IWineD3DBase *)texture); - surface_set_texture_target(surface, texture->target); + surface_set_texture_target((IWineD3DSurfaceImpl *)surface, texture->target); texture->baseTexture.sub_resources[i] = (IWineD3DResourceImpl *)surface; TRACE("Created surface level %u @ %p.\n", i, surface); /* Calculate the next mipmap level. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6ada851..e8f8d6a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2681,7 +2681,7 @@ void surface_modify_ds_location(IWineD3DSurfaceImpl *surface, DWORD location) DE void surface_set_compatible_renderbuffer(IWineD3DSurfaceImpl *surface, unsigned int width, unsigned int height) DECLSPEC_HIDDEN; void surface_set_texture_name(IWineD3DSurfaceImpl *surface, GLuint name, BOOL srgb_name) DECLSPEC_HIDDEN; -void surface_set_texture_target(IWineD3DSurface *iface, GLenum target) DECLSPEC_HIDDEN; +void surface_set_texture_target(IWineD3DSurfaceImpl *surface, GLenum target) DECLSPEC_HIDDEN; BOOL getColorBits(const struct wined3d_format_desc *format_desc, short *redSize, short *greenSize, short *blueSize, short *alphaSize, short *totalSize) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_set_texture_name().
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: 294d9dae8f8de26c00d38d4a2e457fe47dc7e4f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=294d9dae8f8de26c00d38d4a2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 26 21:33:02 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_set_texture_name(). --- dlls/wined3d/cubetexture.c | 14 +++++++------- dlls/wined3d/surface.c | 17 ++++++++--------- dlls/wined3d/texture.c | 14 +++++++------- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index e2865b2..44f6196 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -118,7 +118,7 @@ static void cubetexture_cleanup(IWineD3DCubeTextureImpl *This) for (i = 0; i < sub_count; ++i) { - IWineD3DSurface *surface = (IWineD3DSurface *)This->baseTexture.sub_resources[i]; + IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)This->baseTexture.sub_resources[i]; if (surface) { @@ -126,9 +126,9 @@ static void cubetexture_cleanup(IWineD3DCubeTextureImpl *This) * surface doesn't try and release it. */ surface_set_texture_name(surface, 0, TRUE); surface_set_texture_name(surface, 0, FALSE); - surface_set_texture_target(surface, 0); - IWineD3DSurface_SetContainer(surface, NULL); - IWineD3DSurface_Release(surface); + surface_set_texture_target((IWineD3DSurface *)surface, 0); + IWineD3DSurface_SetContainer((IWineD3DSurface *)surface, NULL); + IWineD3DSurface_Release((IWineD3DSurface *)surface); } } basetexture_cleanup((IWineD3DBaseTexture *)This); @@ -216,9 +216,9 @@ static void WINAPI IWineD3DCubeTextureImpl_UnLoad(IWineD3DCubeTexture *iface) for (i = 0; i < sub_count; ++i) { - IWineD3DSurface *surface = (IWineD3DSurface *)This->baseTexture.sub_resources[i]; + IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)This->baseTexture.sub_resources[i]; - IWineD3DSurface_UnLoad(surface); + IWineD3DSurface_UnLoad((IWineD3DSurface *)surface); surface_set_texture_name(surface, 0, TRUE); surface_set_texture_name(surface, 0, FALSE); } @@ -287,7 +287,7 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_BindTexture(IWineD3DCubeTexture *i for (i = 0; i < sub_count; ++i) { - IWineD3DSurface *surface = (IWineD3DSurface *)This->baseTexture.sub_resources[i]; + IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)This->baseTexture.sub_resources[i]; if (This->baseTexture.is_srgb) surface_set_texture_name(surface, This->baseTexture.texture_srgb.name, TRUE); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bba6ad9..efe5030 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -468,36 +468,35 @@ static void surface_force_reload(IWineD3DSurfaceImpl *surface) surface->Flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED); } -void surface_set_texture_name(IWineD3DSurface *iface, GLuint new_name, BOOL srgb) +void surface_set_texture_name(IWineD3DSurfaceImpl *surface, GLuint new_name, BOOL srgb) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; GLuint *name; DWORD flag; + TRACE("surface %p, new_name %u, srgb %#x.\n", surface, new_name, srgb); + if(srgb) { - name = &This->texture_name_srgb; + name = &surface->texture_name_srgb; flag = SFLAG_INSRGBTEX; } else { - name = &This->texture_name; + name = &surface->texture_name; flag = SFLAG_INTEXTURE; } - TRACE("(%p) : setting texture name %u\n", This, new_name); - if (!*name && new_name) { /* FIXME: We shouldn't need to remove SFLAG_INTEXTURE if the * surface has no texture name yet. See if we can get rid of this. */ - if (This->Flags & flag) + if (surface->Flags & flag) ERR("Surface has SFLAG_INTEXTURE set, but no texture name\n"); - IWineD3DSurface_ModifyLocation(iface, flag, FALSE); + IWineD3DSurface_ModifyLocation((IWineD3DSurface *)surface, flag, FALSE); } *name = new_name; - surface_force_reload(This); + surface_force_reload(surface); } void surface_set_texture_target(IWineD3DSurface *iface, GLenum target) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index bcbcfa9..35d5e61 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -111,16 +111,16 @@ static void texture_cleanup(IWineD3DTextureImpl *This) for (i = 0; i < This->baseTexture.level_count; ++i) { - IWineD3DSurface *surface = (IWineD3DSurface *)This->baseTexture.sub_resources[i]; + IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)This->baseTexture.sub_resources[i]; if (surface) { /* Clean out the texture name we gave to the surface so that the * surface doesn't try and release it */ surface_set_texture_name(surface, 0, TRUE); surface_set_texture_name(surface, 0, FALSE); - surface_set_texture_target(surface, 0); - IWineD3DSurface_SetContainer(surface, NULL); - IWineD3DSurface_Release(surface); + surface_set_texture_target((IWineD3DSurface *)surface, 0); + IWineD3DSurface_SetContainer((IWineD3DSurface *)surface, NULL); + IWineD3DSurface_Release((IWineD3DSurface *)surface); } } @@ -208,8 +208,8 @@ static void WINAPI IWineD3DTextureImpl_UnLoad(IWineD3DTexture *iface) { */ for (i = 0; i < This->baseTexture.level_count; ++i) { - IWineD3DSurface *surface = (IWineD3DSurface *)This->baseTexture.sub_resources[i]; - IWineD3DSurface_UnLoad(surface); + IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)This->baseTexture.sub_resources[i]; + IWineD3DSurface_UnLoad((IWineD3DSurface *)surface); surface_set_texture_name(surface, 0, FALSE); /* Delete rgb name */ surface_set_texture_name(surface, 0, TRUE); /* delete srgb name */ } @@ -282,7 +282,7 @@ static HRESULT WINAPI IWineD3DTextureImpl_BindTexture(IWineD3DTexture *iface, BO for (i = 0; i < This->baseTexture.level_count; ++i) { - IWineD3DSurface *surface = (IWineD3DSurface *)This->baseTexture.sub_resources[i]; + IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)This->baseTexture.sub_resources[i]; surface_set_texture_name(surface, gl_tex->name, This->baseTexture.is_srgb); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 27bc6aa..6ada851 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2680,7 +2680,7 @@ void surface_load_ds_location(IWineD3DSurfaceImpl *surface, void surface_modify_ds_location(IWineD3DSurfaceImpl *surface, DWORD location) DECLSPEC_HIDDEN; void surface_set_compatible_renderbuffer(IWineD3DSurfaceImpl *surface, unsigned int width, unsigned int height) DECLSPEC_HIDDEN; -void surface_set_texture_name(IWineD3DSurface *iface, GLuint name, BOOL srgb_name) DECLSPEC_HIDDEN; +void surface_set_texture_name(IWineD3DSurfaceImpl *surface, GLuint name, BOOL srgb_name) DECLSPEC_HIDDEN; void surface_set_texture_target(IWineD3DSurface *iface, GLenum target) DECLSPEC_HIDDEN; BOOL getColorBits(const struct wined3d_format_desc *format_desc,

1 0

Henri Verbeet : wined3d: Store back buffer surfaces as IWineD3DSurfaceImpl pointers in the swapchain .
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: d977e91b11bd8f2bf3ae6fe7a899ee7e2db4ca7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d977e91b11bd8f2bf3ae6fe7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 26 21:33:01 2010 +0200 wined3d: Store back buffer surfaces as IWineD3DSurfaceImpl pointers in the swapchain. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 36 +++++++++++++------------ dlls/wined3d/surface.c | 8 +++--- dlls/wined3d/swapchain.c | 57 +++++++++++++++++++++------------------- dlls/wined3d/swapchain_base.c | 5 ++- dlls/wined3d/swapchain_gdi.c | 17 +++++++----- dlls/wined3d/wined3d_private.h | 2 +- 7 files changed, 68 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d977e91b11bd8f2bf3ae6…

1 0

Henri Verbeet : wined3d: Store the front buffer surface as an IWineD3DSurfaceImpl pointer in the swapchain .
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: 62acb2fdbc41e16e3bb74c8653b04a0812aac6a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62acb2fdbc41e16e3bb74c865… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 26 21:33:00 2010 +0200 wined3d: Store the front buffer surface as an IWineD3DSurfaceImpl pointer in the swapchain. --- dlls/wined3d/arb_program_shader.c | 4 +- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 27 ++++++++++++----------- dlls/wined3d/surface.c | 15 ++++++------- dlls/wined3d/surface_gdi.c | 6 ++-- dlls/wined3d/swapchain.c | 42 +++++++++++++++++++----------------- dlls/wined3d/swapchain_base.c | 2 +- dlls/wined3d/swapchain_gdi.c | 11 +++++---- dlls/wined3d/wined3d_private.h | 2 +- 9 files changed, 57 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=62acb2fdbc41e16e3bb74…

1 0

Roderick Colenbrander : wgl: Make context not current before deleting it.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: ab788c7c39f086cedd3cb5acfcaecc827f3aec59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab788c7c39f086cedd3cb5acf… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Apr 26 15:49:57 2010 +0200 wgl: Make context not current before deleting it. --- dlls/opengl32/tests/opengl.c | 5 +++++ dlls/winex11.drv/opengl.c | 4 ++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index a59f8d2..ab55e0b 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -552,6 +552,11 @@ static void test_deletecontext(HDC hdc) res = wglDeleteContext(hglrc); ok(res == TRUE, "wglDeleteContext failed\n"); + + /* WGL makes a context not current when deleting it. This differs from GLX behavior where + * deletion takes place when the thread becomes not current. */ + hglrc = wglGetCurrentContext(); + ok(hglrc == NULL, "A WGL context is active while none was expected\n"); } static void test_make_current_read(HDC hdc) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index ccd9050..d8f8d0a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1783,6 +1783,10 @@ BOOL CDECL X11DRV_wglDeleteContext(HGLRC hglrc) return FALSE; } + /* WGL makes a context not current if it is active before deletion. GLX waits until the context is not current. */ + if (ctx == NtCurrentTeb()->glContext) + wglMakeCurrent(ctx->hdc, NULL); + if (ctx->ctx) { wine_tsx11_lock();

1 0

Roderick Colenbrander : wgl: Improve wglDeleteContext threading behavior.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: b86787e57c6b12e1d6e9f04f45e4bcbc0e1fc99c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b86787e57c6b12e1d6e9f04f4… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Apr 26 15:49:56 2010 +0200 wgl: Improve wglDeleteContext threading behavior. --- dlls/opengl32/tests/opengl.c | 56 +++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/opengl.c | 62 +++++++++++++++++++++++++++++------------ 2 files changed, 100 insertions(+), 18 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index d0eb24f..a59f8d2 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -499,6 +499,61 @@ static void test_acceleration(HDC hdc) } } +struct wgl_thread_param +{ + HANDLE test_finished; + HGLRC hglrc; + BOOL hglrc_deleted; +}; + +static DWORD WINAPI wgl_thread(void *param) +{ + struct wgl_thread_param *p = param; + + p->hglrc_deleted = wglDeleteContext(p->hglrc); + SetEvent(p->test_finished); + + return 0; +} + +static void test_deletecontext(HDC hdc) +{ + struct wgl_thread_param thread_params; + HGLRC hglrc = wglCreateContext(hdc); + HANDLE thread_handle; + DWORD res, tid; + + if(!hglrc) + { + skip("wglCreateContext failed!\n"); + return; + } + + res = wglMakeCurrent(hdc, hglrc); + if(!res) + { + skip("wglMakeCurrent failed!\n"); + return; + } + + /* WGL doesn't allow you to delete a context from a different thread than the one in which it is current. + * This differs from GLX which does allow it but it delays actual deletion until the context becomes not current. + */ + thread_params.hglrc = hglrc; + thread_params.test_finished = CreateEvent(NULL, FALSE, FALSE, NULL); + thread_handle = CreateThread(NULL, 0, wgl_thread, &thread_params, 0, &tid); + ok(!!thread_handle, "Failed to create thread, last error %#x.\n", GetLastError()); + if(thread_handle) + { + WaitForSingleObject(thread_handle, INFINITE); + ok(thread_params.hglrc_deleted == FALSE, "Attempt to delete WGL context from another thread passed but should fail!\n"); + } + CloseHandle(thread_params.test_finished); + + res = wglDeleteContext(hglrc); + ok(res == TRUE, "wglDeleteContext failed\n"); +} + static void test_make_current_read(HDC hdc) { int res; @@ -802,6 +857,7 @@ START_TEST(opengl) return; } + test_deletecontext(hdc); test_makecurrent(hdc); test_setpixelformat(hdc); test_sharelists(hdc); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index cf22f95..ccd9050 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -113,6 +113,7 @@ typedef struct wine_glcontext { BOOL do_escape; BOOL has_been_current; BOOL sharing; + DWORD tid; BOOL gl3_context; XVisualInfo *vis; WineGLPixelFormat *fmt; @@ -1763,29 +1764,33 @@ HGLRC CDECL X11DRV_wglCreateContext(X11DRV_PDEVICE *physDev) BOOL CDECL X11DRV_wglDeleteContext(HGLRC hglrc) { Wine_GLContext *ctx = (Wine_GLContext *) hglrc; - BOOL ret = TRUE; TRACE("(%p)\n", hglrc); if (!has_opengl()) return 0; - wine_tsx11_lock(); - /* A game (Half Life not to name it) deletes twice the same context, - * so make sure it is valid first */ - if (is_valid_context( ctx )) - { - if (ctx->ctx) pglXDestroyContext(gdi_display, ctx->ctx); - free_context(ctx); - } - else + if (!is_valid_context(ctx)) { WARN("Error deleting context !\n"); SetLastError(ERROR_INVALID_HANDLE); - ret = FALSE; + return FALSE; } - wine_tsx11_unlock(); - return ret; + /* WGL doesn't allow deletion of a context which is current in another thread */ + if (ctx->tid != 0 && ctx->tid != GetCurrentThreadId()) + { + TRACE("Cannot delete context=%p because it is current in another thread.\n", ctx); + return FALSE; + } + + if (ctx->ctx) + { + wine_tsx11_lock(); + pglXDestroyContext(gdi_display, ctx->ctx); + wine_tsx11_unlock(); + } + + return TRUE; } /** @@ -1857,16 +1862,26 @@ BOOL CDECL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { if (!has_opengl()) return FALSE; wine_tsx11_lock(); - if (hglrc == NULL) { + if (hglrc == NULL) + { + Wine_GLContext *prev_ctx = NtCurrentTeb()->glContext; + if (prev_ctx) prev_ctx->tid = 0; + ret = pglXMakeCurrent(gdi_display, None, NULL); NtCurrentTeb()->glContext = NULL; - } else if (ctx->fmt->iPixelFormat != physDev->current_pf) { + } + else if (ctx->fmt->iPixelFormat != physDev->current_pf) + { WARN( "mismatched pixel format hdc %p %u ctx %p %u\n", hdc, physDev->current_pf, ctx, ctx->fmt->iPixelFormat ); SetLastError( ERROR_INVALID_PIXEL_FORMAT ); ret = FALSE; - } else { + } + else + { Drawable drawable = get_glxdrawable(physDev); + Wine_GLContext *prev_ctx = NtCurrentTeb()->glContext; + if (prev_ctx) prev_ctx->tid = 0; /* The describe lines below are for debugging purposes only */ if (TRACE_ON(wgl)) { @@ -1881,6 +1896,7 @@ BOOL CDECL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { if(ret) { ctx->has_been_current = TRUE; + ctx->tid = GetCurrentThreadId(); ctx->hdc = hdc; ctx->read_hdc = hdc; ctx->drawables[0] = drawable; @@ -1913,18 +1929,28 @@ BOOL CDECL X11DRV_wglMakeContextCurrentARB(X11DRV_PDEVICE* pDrawDev, X11DRV_PDEV if (!has_opengl()) return 0; wine_tsx11_lock(); - if (hglrc == NULL) { + if (hglrc == NULL) + { + Wine_GLContext *prev_ctx = NtCurrentTeb()->glContext; + if (prev_ctx) prev_ctx->tid = 0; + ret = pglXMakeCurrent(gdi_display, None, NULL); NtCurrentTeb()->glContext = NULL; - } else { + } + else + { if (NULL == pglXMakeContextCurrent) { ret = FALSE; } else { + Wine_GLContext *prev_ctx = NtCurrentTeb()->glContext; Wine_GLContext *ctx = (Wine_GLContext *) hglrc; Drawable d_draw = get_glxdrawable(pDrawDev); Drawable d_read = get_glxdrawable(pReadDev); + if (prev_ctx) prev_ctx->tid = 0; + ctx->has_been_current = TRUE; + ctx->tid = GetCurrentThreadId(); ctx->hdc = pDrawDev->hdc; ctx->read_hdc = pReadDev->hdc; ctx->drawables[0] = d_draw;

1 0

Alexandre Julliard : user32: Only call the driver DestroyCursorIcon entry point for valid handles.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: bfc4c710491d025fcf52e9a0e4c2b177a96bcf7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfc4c710491d025fcf52e9a0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 14:44:00 2010 -0500 user32: Only call the driver DestroyCursorIcon entry point for valid handles. --- dlls/user32/cursoricon.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 0d74276..27d3040 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -172,6 +172,7 @@ static BOOL free_icon_handle( HICON handle ) ULONG_PTR param = obj->param; HeapFree( GetProcessHeap(), 0, obj ); if (wow_handlers.free_icon_param && param) wow_handlers.free_icon_param( param ); + USER_Driver->pDestroyCursorIcon( handle ); return TRUE; } return FALSE; @@ -1561,10 +1562,7 @@ BOOL WINAPI DestroyIcon( HICON hIcon ) TRACE_(icon)("%p\n", hIcon ); if (CURSORICON_DelSharedIcon( hIcon ) == -1) - { - USER_Driver->pDestroyCursorIcon( hIcon ); free_icon_handle( hIcon ); - } return TRUE; }

1 0

André Hentschel : winetest: Propose to run 64-bit winetest instead of just try it.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: tools Branch: master Commit: 8a4eb8c7fa4f1e67464f67e73e51df5b0db3ef39 URL: http://source.winehq.org/git/tools.git/?a=commit;h=8a4eb8c7fa4f1e67464f67e7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 23 14:24:16 2010 +0200 winetest: Propose to run 64-bit winetest instead of just try it. --- winetest/build-index | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 21f35fd..4e2f42f 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -269,7 +269,7 @@ print OUT <<"EOF"; </table></div> <div class="navbar"> To run the tests on your Windows machine, download the <a href="/builds/winetest-latest.exe">latest winetest.exe</a> build. -If you have a 64-bit Windows OS, you can also try the <a href="/builds/winetest64-latest.exe">64-bit winetest</a>. +If you have a 64-bit Windows OS, you can also run the <a href="/builds/winetest64-latest.exe">64-bit winetest</a>. </div> </body></html> EOF

1 0

Alexandre Julliard : patches: Display the result of the testbot run for patches that have one.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: tools Branch: master Commit: 5545f2c06b85c21a7a0cf9c7fad3821c23e698f9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=5545f2c06b85c21a7a0cf9c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 27 11:31:41 2010 -0500 patches: Display the result of the testbot run for patches that have one. --- patches/index.cgi | 23 +++++++++++++++++++++-- patches/patches.css | 4 +++- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/patches/index.cgi b/patches/index.cgi index 54da3ff..4c8ce49 100755 --- a/patches/index.cgi +++ b/patches/index.cgi @@ -97,7 +97,8 @@ print "<div class=\"main\">\n"; print "<table class=\"main\"><tr><th class=\"id\">ID</th>", "<th class=\"status\">Status</th>", "<th class=\"author\">Author</th>", - "<th class=\"subject\">Subject</th></tr>\n"; + "<th class=\"subject\">Subject</th>", + "<th class=\"status\">Testbot</th></tr>\n"; opendir DIR, $dir; foreach my $file (readdir DIR) @@ -127,6 +128,15 @@ foreach my $file (readdir DIR) $patch{"order"} = <ORDER>; close ORDER; } + $patch{"testbot"} = ""; + if (-f "$dir/$file.testbot") + { + $patch{"testbot"} = "OK"; + } + if (-f "$dir/$file.testfail") + { + $patch{"testbot"} = "Failed"; + } $patches{$file} = \%patch; } closedir DIR; @@ -138,8 +148,17 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k printf "<tr class=\"%s %s\"><td class=\"id\">%s</td><td class=\"status\"><a href=\"#legend\">%s</a></td><td class=\"author\">%s</td>", $row & 1 ? "odd" : "even", $patch->{"status"}, $file, $status_descr{$patch->{"status"}} || $patch->{"status"}, escapeHTML($patch->{"author"}); - printf "<td class=\"subject\"><a href=\"data/$file\">%s</a></td></tr>\n", + printf "<td class=\"subject\"><a href=\"data/$file\">%s</a></td>", escapeHTML($patch->{"subject"}); + if ($patch->{"testbot"} eq "Failed") + { + print "<td class=\"testbot botfail\"><a href=\"data/$file.testfail\">Failed</a></td>"; + } + else + { + printf "<td class=\"testbot\">%s</td>", $patch->{"testbot"}; + } + print "</tr>\n"; $row++; } print "</table></div>\n"; diff --git a/patches/patches.css b/patches/patches.css index c763c98..b1224f5 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -41,12 +41,13 @@ table.legend ul { margin: 2px 0; } tr.even { background-color: #fff8f8; } tr.odd { background-color: #f8e8e8; } -.id, .status { text-align: center; } +.id, .status, .testbot { text-align: center; } .id, .status, .author { white-space: nowrap; padding: 0 3px; } .nil, .nil :link, .nil :visited { color: blue; font-weight: bold; } .pending, .pending :link, .pending :visited { color: blue; } .committed, .committed :link, .committed :visited { color: green; } +.testbot, .testbot :link, .testbot :visited { color: green; } .depend, .depend :link, .depend :visited { color: #e08000; } .superseded, .superseded :link, .superseded :visited { color: #e08000; } .testcase, .testcase :link, .testcase :visited { color: #e08000; } @@ -58,3 +59,4 @@ tr.odd { background-color: #f8e8e8; } .rejected, .rejected :link, .rejected :visited { color: red; } .split, .split :link, .split :visited { color: red; } .testfail, .testfail :link, .testfail :visited { color: red; } +.botfail, .botfail :link, .botfail :visited { color: red; }

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2010