wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Jacek Caban : user32: Use proper window as dialog owner.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: 0d7116b968edae3f5912112bda436df8924911fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d7116b968edae3f5912112bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 2 15:04:24 2016 +0100 user32: Use proper window as dialog owner. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 74 +++++++++++++++++++--------------------------------- 1 file changed, 27 insertions(+), 47 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index f3c8289..180ab3d 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -104,43 +104,6 @@ const struct builtin_class_descr DIALOG_builtin_class = /*********************************************************************** - * DIALOG_EnableOwner - * - * Helper function for modal dialogs to enable again the - * owner of the dialog box. - */ -static void DIALOG_EnableOwner( HWND hOwner ) -{ - /* Owner must be a top-level window */ - if (hOwner) - hOwner = GetAncestor( hOwner, GA_ROOT ); - if (!hOwner) return; - EnableWindow( hOwner, TRUE ); -} - - -/*********************************************************************** - * DIALOG_DisableOwner - * - * Helper function for modal dialogs to disable the - * owner of the dialog box. Returns TRUE if owner was enabled. - */ -static BOOL DIALOG_DisableOwner( HWND hOwner ) -{ - /* Owner must be a top-level window */ - if (hOwner) - hOwner = GetAncestor( hOwner, GA_ROOT ); - if (!hOwner) return FALSE; - if (IsWindowEnabled( hOwner )) - { - EnableWindow( hOwner, FALSE ); - return TRUE; - } - else - return FALSE; -} - -/*********************************************************************** * DIALOG_GetControl32 * * Return the class and text of the control pointed to by ptr, @@ -491,7 +454,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, DLG_TEMPLATE template; DIALOGINFO * dlgInfo; DWORD units = GetDialogBaseUnits(); - BOOL ownerEnabled = TRUE; + HWND disabled_owner = NULL; HMENU hMenu = 0; HFONT hUserFont = 0; UINT flags = 0; @@ -621,10 +584,27 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, } } - if (modal) + if (modal && owner) { - ownerEnabled = DIALOG_DisableOwner( owner ); - if (ownerEnabled) flags |= DF_OWNERENABLED; + HWND parent; + disabled_owner = owner; + /* + * Owner needs to be top level window. We need to duplicate the logic from server, + * because we need to disable it before creating dialog window. + */ + while ((GetWindowLongW( disabled_owner, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) == WS_CHILD) + { + parent = GetParent( disabled_owner ); + if (!parent || parent == GetDesktopWindow()) break; + disabled_owner = parent; + } + if (IsWindowEnabled( disabled_owner )) + { + flags |= DF_OWNERENABLED; + EnableWindow( disabled_owner, FALSE ); + } + else + disabled_owner = NULL; } if (unicode) @@ -665,7 +645,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, { if (hUserFont) DeleteObject( hUserFont ); if (hMenu) DestroyMenu( hMenu ); - if (modal && (flags & DF_OWNERENABLED)) DIALOG_EnableOwner(owner); + if (disabled_owner) EnableWindow( disabled_owner, TRUE ); return 0; } @@ -721,7 +701,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, } return hwnd; } - if (modal && ownerEnabled) DIALOG_EnableOwner(owner); + if (disabled_owner) EnableWindow( disabled_owner, TRUE ); if( IsWindow(hwnd) ) DestroyWindow( hwnd ); return 0; } @@ -794,9 +774,9 @@ INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) DIALOGINFO * dlgInfo; MSG msg; INT retval; - HWND ownerMsg = GetAncestor( owner, GA_ROOT ); BOOL bFirstEmpty; + owner = GetWindow( hwnd, GW_OWNER ); if (!(dlgInfo = DIALOG_get_info( hwnd, FALSE ))) return -1; bFirstEmpty = TRUE; @@ -815,7 +795,7 @@ INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) if (!(GetWindowLongW( hwnd, GWL_STYLE ) & DS_NOIDLEMSG)) { /* No message present -> send ENTERIDLE and wait */ - SendMessageW( ownerMsg, WM_ENTERIDLE, MSGF_DIALOGBOX, (LPARAM)hwnd ); + SendMessageW( owner, WM_ENTERIDLE, MSGF_DIALOGBOX, (LPARAM)hwnd ); } GetMessageW( &msg, 0, 0, 0 ); } @@ -842,7 +822,7 @@ INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) } } } - if (dlgInfo->flags & DF_OWNERENABLED) DIALOG_EnableOwner( owner ); + if (dlgInfo->flags & DF_OWNERENABLED) EnableWindow( owner, TRUE ); retval = dlgInfo->idResult; DestroyWindow( hwnd ); return retval; @@ -936,7 +916,7 @@ BOOL WINAPI EndDialog( HWND hwnd, INT_PTR retval ) owner = GetWindow( hwnd, GW_OWNER ); if (owner) - DIALOG_EnableOwner( owner ); + EnableWindow( owner, TRUE ); /* Windows sets the focus to the dialog itself in EndDialog */

1 0

Stefan Dösinger : wined3d: Merge surface_remove_pbo() and wined3d_volume_free_pbo().
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: 5141c082caabd0f18698fe611b57e885adf25fe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5141c082caabd0f18698fe611… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 2 19:24:21 2016 +0100 wined3d: Merge surface_remove_pbo() and wined3d_volume_free_pbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 19 +------------------ dlls/wined3d/texture.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/volume.c | 22 ---------------------- dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 30 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3cd3782..469a493 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -996,19 +996,6 @@ static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, DW return WINED3D_OK; } -/* Context activation is done by the caller. */ -static void surface_remove_pbo(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) -{ - GLuint *buffer_object; - - buffer_object = &surface->container->sub_resources[surface_get_sub_resource_idx(surface)].buffer_object; - GL_EXTCALL(glDeleteBuffers(1, buffer_object)); - checkGLcall("glDeleteBuffers(1, buffer_object)"); - - *buffer_object = 0; - surface_invalidate_location(surface, WINED3D_LOCATION_BUFFER); -} - static ULONG surface_resource_incref(struct wined3d_resource *resource) { struct wined3d_surface *surface = surface_from_resource(resource); @@ -1071,10 +1058,6 @@ static void surface_unload(struct wined3d_resource *resource) surface_invalidate_location(surface, ~surface->resource.map_binding); } - /* Destroy PBOs, but load them into real sysmem before */ - if (surface->container->sub_resources[surface_get_sub_resource_idx(surface)].buffer_object) - surface_remove_pbo(surface, gl_info); - /* Destroy fbo render buffers. This is needed for implicit render targets, for * all application-created targets the application has to release the surface * before calling _Reset @@ -3681,7 +3664,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, surface_prepare_map_memory(surface); surface_load_location(surface, context, surface->resource.map_binding); - surface_remove_pbo(surface, gl_info); + wined3d_texture_remove_buffer_object(texture, surface_get_sub_resource_idx(surface), gl_info); } surface_get_memory(surface, &data, surface->locations); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 9846f07..90a3978 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -74,6 +74,23 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc return WINED3D_OK; } +/* Context activation is done by the caller. */ +void wined3d_texture_remove_buffer_object(struct wined3d_texture *texture, + unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info) +{ + GLuint *buffer_object; + + buffer_object = &texture->sub_resources[sub_resource_idx].buffer_object; + GL_EXTCALL(glDeleteBuffers(1, buffer_object)); + checkGLcall("glDeleteBuffers"); + texture->texture_ops->texture_sub_resource_invalidate_location( + texture->sub_resources[sub_resource_idx].resource, WINED3D_LOCATION_BUFFER); + *buffer_object = 0; + + TRACE("Deleted buffer object %u for texture %p, sub-resource %u.\n", + *buffer_object, texture, sub_resource_idx); +} + /* A GL context is provided by the caller */ static void gltexture_delete(struct wined3d_device *device, const struct wined3d_gl_info *gl_info, struct gl_texture *tex) @@ -979,6 +996,7 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) { struct wined3d_texture *texture = wined3d_texture_from_resource(resource); UINT sub_count = texture->level_count * texture->layer_count; + struct wined3d_context *context = NULL; UINT i; TRACE("texture %p.\n", texture); @@ -988,7 +1006,16 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) struct wined3d_resource *sub_resource = texture->sub_resources[i].resource; sub_resource->resource_ops->resource_unload(sub_resource); + + if (texture->sub_resources[i].buffer_object) + { + if (!context) + context = context_acquire(texture->resource.device, NULL); + wined3d_texture_remove_buffer_object(texture, i, context->gl_info); + } } + if (context) + context_release(context); wined3d_texture_force_reload(texture); wined3d_texture_unload_gl_texture(texture); diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index fcadd39..2d88af6 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -362,19 +362,6 @@ void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context * srgb_mode ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB); } -static void wined3d_volume_free_pbo(struct wined3d_volume *volume) -{ - GLuint *buffer_object = &volume->container->sub_resources[volume->texture_level].buffer_object; - struct wined3d_context *context = context_acquire(volume->resource.device, NULL); - const struct wined3d_gl_info *gl_info = context->gl_info; - - TRACE("Deleting PBO %u belonging to volume %p.\n", *buffer_object, volume); - GL_EXTCALL(glDeleteBuffers(1, buffer_object)); - checkGLcall("glDeleteBuffers"); - *buffer_object = 0; - context_release(context); -} - void wined3d_volume_cleanup(struct wined3d_volume *volume) { TRACE("volume %p.\n", volume); @@ -407,15 +394,6 @@ static void volume_unload(struct wined3d_resource *resource) wined3d_volume_invalidate_location(volume, ~WINED3D_LOCATION_DISCARDED); } - if (volume->container->sub_resources[volume->texture_level].buffer_object) - { - /* Should not happen because only dynamic default pool volumes - * have a buffer, and those are not evicted by device_evit_managed_resources - * and must be freed before a non-ex device reset. */ - ERR("Unloading a volume with a buffer\n"); - wined3d_volume_free_pbo(volume); - } - /* The texture name is managed by the container. */ resource_unload(resource); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 28121b7..da36985 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2424,6 +2424,8 @@ void wined3d_texture_prepare_buffer_object(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; +void wined3d_texture_remove_buffer_object(struct wined3d_texture *texture, + unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void wined3d_texture_set_dirty(struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : wined3d: Merge surface_prepare_buffer() and wined3d_volume_prepare_pbo().
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: 87143e60ed5708b976754da872f7643ce0982172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87143e60ed5708b976754da87… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 2 19:24:20 2016 +0100 wined3d: Merge surface_prepare_buffer() and wined3d_volume_prepare_pbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 44 ++++++++---------------------------------- dlls/wined3d/texture.c | 21 ++++++++++++++++++++ dlls/wined3d/volume.c | 20 +------------------ dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 32 insertions(+), 55 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 208c254..3cd3782 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -489,40 +489,6 @@ static void surface_get_memory(const struct wined3d_surface *surface, struct win data->buffer_object = 0; } -static void surface_prepare_buffer(struct wined3d_surface *surface) -{ - struct wined3d_context *context; - GLuint *buffer_object; - GLenum error; - const struct wined3d_gl_info *gl_info; - - buffer_object = &surface->container->sub_resources[surface_get_sub_resource_idx(surface)].buffer_object; - if (*buffer_object) - return; - - context = context_acquire(surface->resource.device, NULL); - gl_info = context->gl_info; - - GL_EXTCALL(glGenBuffers(1, buffer_object)); - error = gl_info->gl_ops.gl.p_glGetError(); - if (!*buffer_object || error != GL_NO_ERROR) - ERR("Failed to create a PBO with error %s (%#x).\n", debug_glerror(error), error); - - TRACE("Binding PBO %u.\n", *buffer_object); - - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, *buffer_object)); - checkGLcall("glBindBuffer"); - - GL_EXTCALL(glBufferData(GL_PIXEL_UNPACK_BUFFER, surface->resource.size + 4, - NULL, GL_STREAM_DRAW)); - checkGLcall("glBufferData"); - - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); - checkGLcall("glBindBuffer"); - - context_release(context); -} - static void surface_prepare_system_memory(struct wined3d_surface *surface) { TRACE("surface %p.\n", surface); @@ -541,6 +507,9 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) void surface_prepare_map_memory(struct wined3d_surface *surface) { + struct wined3d_texture *texture = surface->container; + struct wined3d_context *context; + switch (surface->resource.map_binding) { case WINED3D_LOCATION_SYSMEM: @@ -548,7 +517,7 @@ void surface_prepare_map_memory(struct wined3d_surface *surface) break; case WINED3D_LOCATION_USER_MEMORY: - if (!surface->container->user_memory) + if (!texture->user_memory) ERR("Map binding is set to WINED3D_LOCATION_USER_MEMORY but surface->user_memory is NULL.\n"); break; @@ -558,7 +527,10 @@ void surface_prepare_map_memory(struct wined3d_surface *surface) break; case WINED3D_LOCATION_BUFFER: - surface_prepare_buffer(surface); + context = context_acquire(texture->resource.device, NULL); + wined3d_texture_prepare_buffer_object(texture, + surface_get_sub_resource_idx(surface), context->gl_info); + context_release(context); break; default: diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a8e9194..9846f07 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -690,6 +690,27 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT return wined3d_surface_update_desc(surface, gl_info); } +/* Context activation is done by the caller. */ +void wined3d_texture_prepare_buffer_object(struct wined3d_texture *texture, + unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info) +{ + GLuint *buffer_object; + + buffer_object = &texture->sub_resources[sub_resource_idx].buffer_object; + if (*buffer_object) + return; + + GL_EXTCALL(glGenBuffers(1, buffer_object)); + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, *buffer_object)); + GL_EXTCALL(glBufferData(GL_PIXEL_UNPACK_BUFFER, + texture->sub_resources[sub_resource_idx].resource->size, NULL, GL_STREAM_DRAW)); + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("Create buffer object"); + + TRACE("Created buffer object %u for texture %p, sub-resource %u.\n", + *buffer_object, texture, sub_resource_idx); +} + void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) { DWORD alloc_flag = srgb ? WINED3D_TEXTURE_SRGB_ALLOCATED : WINED3D_TEXTURE_RGB_ALLOCATED; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index ef0d69b..fcadd39 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -362,24 +362,6 @@ void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context * srgb_mode ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB); } -/* Context activation is done by the caller. */ -static void wined3d_volume_prepare_pbo(struct wined3d_volume *volume, struct wined3d_context *context) -{ - GLuint *buffer_object = &volume->container->sub_resources[volume->texture_level].buffer_object; - const struct wined3d_gl_info *gl_info = context->gl_info; - - if (*buffer_object) - return; - - GL_EXTCALL(glGenBuffers(1, buffer_object)); - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, *buffer_object)); - GL_EXTCALL(glBufferData(GL_PIXEL_UNPACK_BUFFER, volume->resource.size, NULL, GL_STREAM_DRAW)); - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); - checkGLcall("Create PBO"); - - TRACE("Created PBO %u for volume %p.\n", *buffer_object, volume); -} - static void wined3d_volume_free_pbo(struct wined3d_volume *volume) { GLuint *buffer_object = &volume->container->sub_resources[volume->texture_level].buffer_object; @@ -506,7 +488,7 @@ HRESULT wined3d_volume_map(struct wined3d_volume *volume, context = context_acquire(device, NULL); gl_info = context->gl_info; - wined3d_volume_prepare_pbo(volume, context); + wined3d_texture_prepare_buffer_object(texture, volume->texture_level, gl_info); if (flags & WINED3D_MAP_DISCARD) wined3d_volume_validate_location(volume, WINED3D_LOCATION_BUFFER); else diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 468ff11..28121b7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2420,6 +2420,8 @@ struct wined3d_resource *wined3d_texture_get_sub_resource(const struct wined3d_t UINT sub_resource_idx) DECLSPEC_HIDDEN; void wined3d_texture_load(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; +void wined3d_texture_prepare_buffer_object(struct wined3d_texture *texture, + unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_set_dirty(struct wined3d_texture *texture) DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : wined3d: Cleanup sub-resource buffer objects in wined3d_texture_cleanup().
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: 45fa5b6471093db4f97f90b661d1f89d56aa48e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45fa5b6471093db4f97f90b66… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 2 19:24:19 2016 +0100 wined3d: Cleanup sub-resource buffer objects in wined3d_texture_cleanup(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 11 +---------- dlls/wined3d/texture.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/volume.c | 3 --- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 994756d..208c254 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -48,13 +48,10 @@ static unsigned int surface_get_sub_resource_idx(const struct wined3d_surface *s void wined3d_surface_cleanup(struct wined3d_surface *surface) { struct wined3d_surface *overlay, *cur; - GLuint buffer_object; TRACE("surface %p.\n", surface); - buffer_object = surface->container->sub_resources[surface_get_sub_resource_idx(surface)].buffer_object; - if (buffer_object || surface->rb_multisample - || surface->rb_resolved || !list_empty(&surface->renderbuffers)) + if (surface->rb_multisample || surface->rb_resolved || !list_empty(&surface->renderbuffers)) { struct wined3d_renderbuffer_entry *entry, *entry2; const struct wined3d_gl_info *gl_info; @@ -64,12 +61,6 @@ void wined3d_surface_cleanup(struct wined3d_surface *surface) context = context_acquire(device, NULL); gl_info = context->gl_info; - if (buffer_object) - { - TRACE("Deleting buffer object %u.\n", buffer_object); - GL_EXTCALL(glDeleteBuffers(1, &buffer_object)); - } - if (surface->rb_multisample) { TRACE("Deleting multisample renderbuffer %u.\n", surface->rb_multisample); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index cb2b310..a8e9194 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -108,8 +108,35 @@ static void wined3d_texture_unload_gl_texture(struct wined3d_texture *texture) static void wined3d_texture_cleanup(struct wined3d_texture *texture) { + unsigned int sub_count = texture->level_count * texture->layer_count; + struct wined3d_device *device = texture->resource.device; + struct wined3d_context *context = NULL; + const struct wined3d_gl_info *gl_info; + GLuint buffer_object; + unsigned int i; + TRACE("texture %p.\n", texture); + for (i = 0; i < sub_count; ++i) + { + if (!(buffer_object = texture->sub_resources[i].buffer_object)) + continue; + + TRACE("Deleting buffer object %u.\n", buffer_object); + + /* We may not be able to get a context in wined3d_texture_cleanup() in + * general, but if a buffer object was previously created we can. */ + if (!context) + { + context = context_acquire(device, NULL); + gl_info = context->gl_info; + } + + GL_EXTCALL(glDeleteBuffers(1, &buffer_object)); + } + if (context) + context_release(context); + texture->texture_ops->texture_cleanup_sub_resources(texture); wined3d_texture_unload_gl_texture(texture); resource_cleanup(&texture->resource); diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 3782642..ef0d69b 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -397,9 +397,6 @@ void wined3d_volume_cleanup(struct wined3d_volume *volume) { TRACE("volume %p.\n", volume); - if (volume->container->sub_resources[volume->texture_level].buffer_object) - wined3d_volume_free_pbo(volume); - resource_cleanup(&volume->resource); }

1 0

Henri Verbeet : wined3d: Store surface/ volume buffer objects in the sub-resource structure.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: fbe27375370c426c781ba50841ef93ea6ff44502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe27375370c426c781ba5084… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:24:18 2016 +0100 wined3d: Store surface/volume buffer objects in the sub-resource structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 52 +++++++++++++++++++++------------ dlls/wined3d/texture.c | 4 +-- dlls/wined3d/volume.c | 65 +++++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 6 ++-- 4 files changed, 76 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fbe27375370c426c781ba…

1 0

Henri Verbeet : wined3d: Avoid volume_from_resource() in texture3d_prepare_texture().
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: 09c862b6a23c35c2157842f1f7a1fa9a8d17da1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=09c862b6a23c35c2157842f1f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:24:17 2016 +0100 wined3d: Avoid volume_from_resource() in texture3d_prepare_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index af1c1de..01f54a9 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1207,7 +1207,7 @@ static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wi for (i = 0; i < sub_count; ++i) { - struct wined3d_volume *volume = volume_from_resource(texture->sub_resources[i].resource); + struct wined3d_volume *volume = texture->sub_resources[i].u.volume; GL_EXTCALL(glTexImage3D(GL_TEXTURE_3D, volume->texture_level, srgb ? format->glGammaInternal : format->glInternal,

1 0

Henri Verbeet : wined3d: Avoid surface_from_resource() in swapchain_gl_frontbuffer_updated().
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: c059191e0fe795e4643e56bb2ab806c9ce994055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c059191e0fe795e4643e56bb2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:24:16 2016 +0100 wined3d: Avoid surface_from_resource() in swapchain_gl_frontbuffer_updated(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 9b8d04c..299a47a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -652,7 +652,7 @@ static void swapchain_gl_frontbuffer_updated(struct wined3d_swapchain *swapchain struct wined3d_surface *surface; struct wined3d_context *context; - surface = surface_from_resource(swapchain->front_buffer->sub_resources[0].resource); + surface = swapchain->front_buffer->sub_resources[0].u.surface; context = context_acquire(swapchain->device, surface); surface_load_location(surface, context, surface->container->resource.draw_binding); context_release(context);

1 0

Henri Verbeet : wined3d: Avoid surface_from_resource() in texture2d_prepare_texture().
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: b309b831deb81f47b22f0c25a5fc0a1db6759d6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b309b831deb81f47b22f0c25a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:24:15 2016 +0100 wined3d: Avoid surface_from_resource() in texture2d_prepare_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 651318c..af1c1de 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -868,7 +868,7 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi for (i = 0; i < sub_count; ++i) { - struct wined3d_surface *surface = surface_from_resource(texture->sub_resources[i].resource); + struct wined3d_surface *surface = texture->sub_resources[i].u.surface; GLsizei height = surface->pow2Height; GLsizei width = surface->pow2Width;

1 0

Henri Verbeet : wined3d: Avoid surface_from_resource() in wined3d_texture_update_desc().
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: aad8f74cc8b6cf382026bbaf2f929d240f2d326f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aad8f74cc8b6cf382026bbaf2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:24:14 2016 +0100 wined3d: Avoid surface_from_resource() in wined3d_texture_update_desc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a664155..651318c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -631,7 +631,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT return WINED3DERR_INVALIDCALL; } - surface = surface_from_resource(texture->sub_resources[0].resource); + surface = texture->sub_resources[0].u.surface; if (surface->resource.map_count || (surface->flags & SFLAG_DCINUSE)) { WARN("Surface is mapped or the DC is in use.\n");

1 0

Henri Verbeet : wined3d: Use a single allocation for texture sub-resource objects.
by Alexandre Julliard 03 Mar '16

03 Mar '16

Module: wine Branch: master Commit: e3e5dcd2cd548bed34cc193383da96c1898fee2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3e5dcd2cd548bed34cc19338… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 2 19:24:13 2016 +0100 wined3d: Use a single allocation for texture sub-resource objects. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 57 +----------------- dlls/wined3d/texture.c | 130 ++++++++++++++++++++++++++++++----------- dlls/wined3d/volume.c | 47 +-------------- dlls/wined3d/wined3d_private.h | 25 ++++---- 4 files changed, 117 insertions(+), 142 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e3e5dcd2cd548bed34cc1…

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
73
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 March 2016