February 2016 - Wine-commits

Stefan Dösinger : wined3d: Simplify FBO cleanup on resource destruction.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: 5dac6e49d83242bb4278a046803884a69d87a48e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dac6e49d83242bb4278a0468… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Feb 21 21:29:59 2016 +0000 wined3d: Simplify FBO cleanup on resource destruction. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 53 +++++++++++++++++------------------------- dlls/wined3d/resource.c | 3 --- dlls/wined3d/surface.c | 9 ++++++- dlls/wined3d/texture.c | 8 ++++--- dlls/wined3d/wined3d_private.h | 4 ++-- 5 files changed, 36 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 76d4a29..65a700b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -812,8 +812,8 @@ void context_free_timestamp_query(struct wined3d_timestamp_query *query) typedef void (context_fbo_entry_func_t)(struct wined3d_context *context, struct fbo_entry *entry); -static void context_enum_surface_fbo_entries(const struct wined3d_device *device, - const struct wined3d_surface *surface, context_fbo_entry_func_t *callback) +static void context_enum_fbo_entries(const struct wined3d_device *device, + GLuint name, BOOL rb_namespace, context_fbo_entry_func_t *callback) { UINT i; @@ -823,21 +823,14 @@ static void context_enum_surface_fbo_entries(const struct wined3d_device *device const struct wined3d_gl_info *gl_info = context->gl_info; struct fbo_entry *entry, *entry2; - if (context->current_rt == surface) context->current_rt = NULL; - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_list, struct fbo_entry, entry) { UINT j; - if (entry->d3d_depth_stencil == surface) - { - callback(context, entry); - continue; - } - - for (j = 0; j < gl_info->limits.buffers; ++j) + for (j = 0; j < gl_info->limits.buffers + 1; ++j) { - if (entry->d3d_render_targets[j] == surface) + if (entry->key.objects[j].object == name + && !(entry->key.rb_namespace & (1 << j)) == !rb_namespace) { callback(context, entry); break; @@ -856,13 +849,23 @@ static void context_queue_fbo_entry_destruction(struct wined3d_context *context, void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource, enum wined3d_resource_type type) { - if (!device->d3d_initialized) return; + UINT i; + struct wined3d_surface *surface; + + if (!device->d3d_initialized) + return; switch (type) { case WINED3D_RTYPE_SURFACE: - context_enum_surface_fbo_entries(device, surface_from_resource(resource), - context_queue_fbo_entry_destruction); + surface = surface_from_resource(resource); + + for (i = 0; i < device->context_count; ++i) + { + struct wined3d_context *context = device->contexts[i]; + if (context->current_rt == surface) + context->current_rt = NULL; + } break; default: @@ -870,24 +873,10 @@ void context_resource_released(const struct wined3d_device *device, } } -static void context_detach_fbo_entry(struct wined3d_context *context, struct fbo_entry *entry) -{ - entry->attached = FALSE; -} - -void context_resource_unloaded(const struct wined3d_device *device, - struct wined3d_resource *resource, enum wined3d_resource_type type) +void context_gl_resource_released(struct wined3d_device *device, + GLuint name, BOOL rb_namespace) { - switch (type) - { - case WINED3D_RTYPE_SURFACE: - context_enum_surface_fbo_entries(device, surface_from_resource(resource), - context_detach_fbo_entry); - break; - - default: - break; - } + context_enum_fbo_entries(device, name, rb_namespace, context_queue_fbo_entry_destruction); } void context_surface_update(struct wined3d_context *context, const struct wined3d_surface *surface) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index a4936cf..423d162 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -254,9 +254,6 @@ void resource_unload(struct wined3d_resource *resource) { if (resource->map_count) ERR("Resource %p is being unloaded while mapped.\n", resource); - - context_resource_unloaded(resource->device, - resource, resource->type); } DWORD CDECL wined3d_resource_set_priority(struct wined3d_resource *resource, DWORD priority) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 86cedb0..bd6be49 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -52,8 +52,9 @@ static void surface_cleanup(struct wined3d_surface *surface) struct wined3d_renderbuffer_entry *entry, *entry2; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; + struct wined3d_device *device = surface->resource.device; - context = context_acquire(surface->resource.device, NULL); + context = context_acquire(device, NULL); gl_info = context->gl_info; if (surface->pbo) @@ -65,18 +66,21 @@ static void surface_cleanup(struct wined3d_surface *surface) if (surface->rb_multisample) { TRACE("Deleting multisample renderbuffer %u.\n", surface->rb_multisample); + context_gl_resource_released(device, surface->rb_multisample, TRUE); gl_info->fbo_ops.glDeleteRenderbuffers(1, &surface->rb_multisample); } if (surface->rb_resolved) { TRACE("Deleting resolved renderbuffer %u.\n", surface->rb_resolved); + context_gl_resource_released(device, surface->rb_resolved, TRUE); gl_info->fbo_ops.glDeleteRenderbuffers(1, &surface->rb_resolved); } LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &surface->renderbuffers, struct wined3d_renderbuffer_entry, entry) { TRACE("Deleting renderbuffer %u.\n", entry->id); + context_gl_resource_released(device, entry->id, TRUE); gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id); HeapFree(GetProcessHeap(), 0, entry); } @@ -1159,6 +1163,7 @@ static void surface_unload(struct wined3d_resource *resource) */ LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &surface->renderbuffers, struct wined3d_renderbuffer_entry, entry) { + context_gl_resource_released(device, entry->id, TRUE); gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id); list_remove(&entry->entry); HeapFree(GetProcessHeap(), 0, entry); @@ -1168,11 +1173,13 @@ static void surface_unload(struct wined3d_resource *resource) if (surface->rb_multisample) { + context_gl_resource_released(device, surface->rb_multisample, TRUE); gl_info->fbo_ops.glDeleteRenderbuffers(1, &surface->rb_multisample); surface->rb_multisample = 0; } if (surface->rb_resolved) { + context_gl_resource_released(device, surface->rb_resolved, TRUE); gl_info->fbo_ops.glDeleteRenderbuffers(1, &surface->rb_resolved); surface->rb_resolved = 0; } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c3bae83..0533f99 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -75,8 +75,10 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc } /* A GL context is provided by the caller */ -static void gltexture_delete(const struct wined3d_gl_info *gl_info, struct gl_texture *tex) +static void gltexture_delete(struct wined3d_device *device, const struct wined3d_gl_info *gl_info, + struct gl_texture *tex) { + context_gl_resource_released(device, tex->name, FALSE); gl_info->gl_ops.gl.p_glDeleteTextures(1, &tex->name); tex->name = 0; } @@ -92,10 +94,10 @@ static void wined3d_texture_unload_gl_texture(struct wined3d_texture *texture) } if (texture->texture_rgb.name) - gltexture_delete(context->gl_info, &texture->texture_rgb); + gltexture_delete(device, context->gl_info, &texture->texture_rgb); if (texture->texture_srgb.name) - gltexture_delete(context->gl_info, &texture->texture_srgb); + gltexture_delete(device, context->gl_info, &texture->texture_srgb); if (context) context_release(context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index babe579..c8f004a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1508,12 +1508,12 @@ void context_free_event_query(struct wined3d_event_query *query) DECLSPEC_HIDDEN void context_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN; DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; +void context_gl_resource_released(struct wined3d_device *device, + GLuint name, BOOL rb_namespace) DECLSPEC_HIDDEN; void context_invalidate_state(struct wined3d_context *context, DWORD state_id) DECLSPEC_HIDDEN; void context_release(struct wined3d_context *context) DECLSPEC_HIDDEN; void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource, enum wined3d_resource_type type) DECLSPEC_HIDDEN; -void context_resource_unloaded(const struct wined3d_device *device, - struct wined3d_resource *resource, enum wined3d_resource_type type) DECLSPEC_HIDDEN; void context_restore(struct wined3d_context *context, struct wined3d_surface *restore) DECLSPEC_HIDDEN; BOOL context_set_current(struct wined3d_context *ctx) DECLSPEC_HIDDEN; void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : wined3d: Check multisampling compatibility before finding the FBO key.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: d04ca90bca9ed52da96f13334ca79defe663a7d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d04ca90bca9ed52da96f13334… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Feb 21 21:30:00 2016 +0000 wined3d: Check multisampling compatibility before finding the FBO key. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 29 +++++++++++------------------ dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 65a700b..d04a246 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -410,11 +410,8 @@ static struct fbo_entry *context_create_fbo_entry(const struct wined3d_context * entry = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(struct fbo_entry, key.objects[object_count])); - entry->d3d_render_targets = HeapAlloc(GetProcessHeap(), 0, - gl_info->limits.buffers * sizeof(*entry->d3d_render_targets)); memset(&entry->key, 0, FIELD_OFFSET(struct wined3d_fbo_entry_key, objects[object_count])); context_generate_fbo_key(context, &entry->key, render_targets, depth_stencil, color_location, ds_location); - memcpy(entry->d3d_render_targets, render_targets, sizeof(*entry->d3d_render_targets) * gl_info->limits.buffers); entry->d3d_depth_stencil = depth_stencil; entry->rt_mask = context_generate_rt_mask(GL_COLOR_ATTACHMENT0); entry->attached = FALSE; @@ -436,7 +433,6 @@ static void context_reuse_fbo_entry(struct wined3d_context *context, GLenum targ context_clean_fbo_attachments(gl_info, target); context_generate_fbo_key(context, &entry->key, render_targets, depth_stencil, color_location, ds_location); - memcpy(entry->d3d_render_targets, render_targets, sizeof(*entry->d3d_render_targets) * gl_info->limits.buffers); entry->d3d_depth_stencil = depth_stencil; entry->attached = FALSE; } @@ -451,7 +447,6 @@ static void context_destroy_fbo_entry(struct wined3d_context *context, struct fb } --context->fbo_entry_count; list_remove(&entry->entry); - HeapFree(GetProcessHeap(), 0, entry->d3d_render_targets); HeapFree(GetProcessHeap(), 0, entry); } @@ -473,6 +468,17 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, WARN("Depth stencil is smaller than the primary color buffer, disabling\n"); depth_stencil = NULL; } + else if (depth_stencil->resource.multisample_type + != render_targets[0]->resource.multisample_type + || depth_stencil->resource.multisample_quality + != render_targets[0]->resource.multisample_quality) + { + WARN("Color multisample type %u and quality %u, depth stencil has %u and %u, disabling ds buffer.\n", + render_targets[0]->resource.multisample_quality, + render_targets[0]->resource.multisample_type, + depth_stencil->resource.multisample_quality, depth_stencil->resource.multisample_type); + depth_stencil = NULL; + } else surface_set_compatible_renderbuffer(depth_stencil, render_targets[0]); } @@ -557,19 +563,6 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ entry->key.rb_namespace & (1 << (i + 1))); } - if (depth_stencil && entry->d3d_render_targets[0] - && (depth_stencil->resource.multisample_type - != entry->d3d_render_targets[0]->resource.multisample_type - || depth_stencil->resource.multisample_quality - != entry->d3d_render_targets[0]->resource.multisample_quality)) - { - WARN("Color multisample type %u and quality %u, depth stencil has %u and %u, disabling ds buffer.\n", - entry->d3d_render_targets[0]->resource.multisample_quality, - entry->d3d_render_targets[0]->resource.multisample_type, - depth_stencil->resource.multisample_quality, depth_stencil->resource.multisample_type); - depth_stencil = NULL; - } - if (depth_stencil) { DWORD format_flags = depth_stencil->container->resource.format_flags; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c8f004a..d7ea23d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2485,7 +2485,6 @@ struct wined3d_fbo_resource struct fbo_entry { struct list entry; - struct wined3d_surface **d3d_render_targets; struct wined3d_surface *d3d_depth_stencil; DWORD rt_mask; BOOL attached;

1 0

Stefan Dösinger : wined3d: Remove fbo_entry-> d3d_depth_stencil.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: 928cb58aa85080bfb652e84ef18615d972e39cc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=928cb58aa85080bfb652e84ef… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Feb 21 21:30:01 2016 +0000 wined3d: Remove fbo_entry->d3d_depth_stencil. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 56 ++++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 7 ++++-- 2 files changed, 34 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d04a246..b7b8648 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -103,15 +103,15 @@ static void context_destroy_fbo(struct wined3d_context *context, GLuint fbo) } static void context_attach_depth_stencil_rb(const struct wined3d_gl_info *gl_info, - GLenum fbo_target, DWORD format_flags, GLuint rb) + GLenum fbo_target, DWORD flags, GLuint rb) { - if (format_flags & WINED3DFMT_FLAG_DEPTH) + if (flags & WINED3D_FBO_ENTRY_FLAG_DEPTH) { gl_info->fbo_ops.glFramebufferRenderbuffer(fbo_target, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, rb); checkGLcall("glFramebufferRenderbuffer()"); } - if (format_flags & WINED3DFMT_FLAG_STENCIL) + if (flags & WINED3D_FBO_ENTRY_FLAG_STENCIL) { gl_info->fbo_ops.glFramebufferRenderbuffer(fbo_target, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, rb); checkGLcall("glFramebufferRenderbuffer()"); @@ -121,7 +121,7 @@ static void context_attach_depth_stencil_rb(const struct wined3d_gl_info *gl_inf /* Context activation is done by the caller. */ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, GLenum fbo_target, const struct wined3d_fbo_resource *resource, BOOL rb_namespace, - DWORD format_flags) + DWORD flags) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -132,18 +132,18 @@ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, if (rb_namespace) { context_attach_depth_stencil_rb(gl_info, fbo_target, - format_flags, resource->object); + flags, resource->object); } else { - if (format_flags & WINED3DFMT_FLAG_DEPTH) + if (flags & WINED3D_FBO_ENTRY_FLAG_DEPTH) { gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_DEPTH_ATTACHMENT, resource->target, resource->object, resource->level); checkGLcall("glFramebufferTexture2D()"); } - if (format_flags & WINED3DFMT_FLAG_STENCIL) + if (flags & WINED3D_FBO_ENTRY_FLAG_STENCIL) { gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_STENCIL_ATTACHMENT, resource->target, resource->object, resource->level); @@ -151,13 +151,13 @@ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, } } - if (!(format_flags & WINED3DFMT_FLAG_DEPTH)) + if (!(flags & WINED3D_FBO_ENTRY_FLAG_DEPTH)) { gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, 0, 0); checkGLcall("glFramebufferTexture2D()"); } - if (!(format_flags & WINED3DFMT_FLAG_STENCIL)) + if (!(flags & WINED3D_FBO_ENTRY_FLAG_STENCIL)) { gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_STENCIL_ATTACHMENT, GL_TEXTURE_2D, 0, 0); checkGLcall("glFramebufferTexture2D()"); @@ -412,9 +412,15 @@ static struct fbo_entry *context_create_fbo_entry(const struct wined3d_context * FIELD_OFFSET(struct fbo_entry, key.objects[object_count])); memset(&entry->key, 0, FIELD_OFFSET(struct wined3d_fbo_entry_key, objects[object_count])); context_generate_fbo_key(context, &entry->key, render_targets, depth_stencil, color_location, ds_location); - entry->d3d_depth_stencil = depth_stencil; + entry->flags = 0; + if (depth_stencil) + { + if (depth_stencil->container->resource.format_flags & WINED3DFMT_FLAG_DEPTH) + entry->flags |= WINED3D_FBO_ENTRY_FLAG_DEPTH; + if (depth_stencil->container->resource.format_flags & WINED3DFMT_FLAG_STENCIL) + entry->flags |= WINED3D_FBO_ENTRY_FLAG_STENCIL; + } entry->rt_mask = context_generate_rt_mask(GL_COLOR_ATTACHMENT0); - entry->attached = FALSE; gl_info->fbo_ops.glGenFramebuffers(1, &entry->id); checkGLcall("glGenFramebuffers()"); TRACE("Created FBO %u.\n", entry->id); @@ -433,8 +439,14 @@ static void context_reuse_fbo_entry(struct wined3d_context *context, GLenum targ context_clean_fbo_attachments(gl_info, target); context_generate_fbo_key(context, &entry->key, render_targets, depth_stencil, color_location, ds_location); - entry->d3d_depth_stencil = depth_stencil; - entry->attached = FALSE; + entry->flags = 0; + if (depth_stencil) + { + if (depth_stencil->container->resource.format_flags & WINED3DFMT_FLAG_DEPTH) + entry->flags |= WINED3D_FBO_ENTRY_FLAG_DEPTH; + if (depth_stencil->container->resource.format_flags & WINED3DFMT_FLAG_STENCIL) + entry->flags |= WINED3D_FBO_ENTRY_FLAG_STENCIL; + } } /* Context activation is done by the caller. */ @@ -544,9 +556,8 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i; GLuint read_binding, draw_binding; - struct wined3d_surface *depth_stencil = entry->d3d_depth_stencil; - if (entry->attached) + if (entry->flags & WINED3D_FBO_ENTRY_FLAG_ATTACHED) { context_bind_fbo(context, target, entry->id); return; @@ -563,17 +574,8 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ entry->key.rb_namespace & (1 << (i + 1))); } - if (depth_stencil) - { - DWORD format_flags = depth_stencil->container->resource.format_flags; - context_attach_depth_stencil_fbo(context, target, &entry->key.objects[0], - entry->key.rb_namespace & 0x1, format_flags); - } - else - { - static const struct wined3d_fbo_resource resource = {0}; - context_attach_depth_stencil_fbo(context, target, &resource, FALSE, 0); - } + context_attach_depth_stencil_fbo(context, target, &entry->key.objects[0], + entry->key.rb_namespace & 0x1, entry->flags); /* Set valid read and draw buffer bindings to satisfy pedantic pre-ES2_compatibility * GL contexts requirements. */ @@ -587,7 +589,7 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ context_bind_fbo(context, GL_READ_FRAMEBUFFER, read_binding); } - entry->attached = TRUE; + entry->flags |= WINED3D_FBO_ENTRY_FLAG_ATTACHED; } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d7ea23d..eef58a3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2482,12 +2482,15 @@ struct wined3d_fbo_resource GLuint level, target; }; +#define WINED3D_FBO_ENTRY_FLAG_ATTACHED 0x1 +#define WINED3D_FBO_ENTRY_FLAG_DEPTH 0x2 +#define WINED3D_FBO_ENTRY_FLAG_STENCIL 0x4 + struct fbo_entry { struct list entry; - struct wined3d_surface *d3d_depth_stencil; + DWORD flags; DWORD rt_mask; - BOOL attached; GLuint id; struct wined3d_fbo_entry_key {

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_swapchain_GetBackBuffer().
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: a81152df36d96754dd3ce81c6860079d1a90e489 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a81152df36d96754dd3ce81c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 23 18:21:58 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_swapchain_GetBackBuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/swapchain.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 91a22a3..b9343aa 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -152,7 +152,6 @@ static HRESULT WINAPI d3d9_swapchain_GetBackBuffer(IDirect3DSwapChain9Ex *iface, UINT backbuffer_idx, D3DBACKBUFFER_TYPE backbuffer_type, IDirect3DSurface9 **backbuffer) { struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); - struct wined3d_resource *wined3d_resource; struct wined3d_texture *wined3d_texture; struct d3d9_surface *surface_impl; HRESULT hr = D3D_OK; @@ -171,8 +170,7 @@ static HRESULT WINAPI d3d9_swapchain_GetBackBuffer(IDirect3DSwapChain9Ex *iface, wined3d_mutex_lock(); if ((wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, backbuffer_idx))) { - wined3d_resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); - surface_impl = wined3d_resource_get_parent(wined3d_resource); + surface_impl = wined3d_texture_get_sub_resource_parent(wined3d_texture, 0); *backbuffer = &surface_impl->IDirect3DSurface9_iface; IDirect3DSurface9_AddRef(*backbuffer); }

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_2d_LockRect().
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: 8e2efc65e7aea2afb84304b2c629b55d60f633cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e2efc65e7aea2afb84304b2c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 23 18:21:59 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_2d_LockRect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index be6fd9f..ccf85f1 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -340,7 +340,6 @@ static HRESULT WINAPI d3d9_texture_2d_LockRect(IDirect3DTexture9 *iface, UINT level, D3DLOCKED_RECT *locked_rect, const RECT *rect, DWORD flags) { struct d3d9_texture *texture = impl_from_IDirect3DTexture9(iface); - struct wined3d_resource *sub_resource; struct d3d9_surface *surface_impl; HRESULT hr; @@ -348,13 +347,10 @@ static HRESULT WINAPI d3d9_texture_2d_LockRect(IDirect3DTexture9 *iface, iface, level, locked_rect, rect, flags); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) + if (!(surface_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - { - surface_impl = wined3d_resource_get_parent(sub_resource); hr = IDirect3DSurface9_LockRect(&surface_impl->IDirect3DSurface9_iface, locked_rect, rect, flags); - } wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_2d_UnlockRect().
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: 75c3a08eb2684d3466a28bee7faf40a9ac9249e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c3a08eb2684d3466a28bee7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 23 18:22:00 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_2d_UnlockRect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index ccf85f1..762dcba 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -359,20 +359,16 @@ static HRESULT WINAPI d3d9_texture_2d_LockRect(IDirect3DTexture9 *iface, static HRESULT WINAPI d3d9_texture_2d_UnlockRect(IDirect3DTexture9 *iface, UINT level) { struct d3d9_texture *texture = impl_from_IDirect3DTexture9(iface); - struct wined3d_resource *sub_resource; struct d3d9_surface *surface_impl; HRESULT hr; TRACE("iface %p, level %u.\n", iface, level); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) + if (!(surface_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - { - surface_impl = wined3d_resource_get_parent(sub_resource); hr = IDirect3DSurface9_UnlockRect(&surface_impl->IDirect3DSurface9_iface); - } wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_2d_GetSurfaceLevel().
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: 92f1afc0453b51a6305b13724106caa1761994eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=92f1afc0453b51a6305b13724… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 23 18:22:01 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_2d_GetSurfaceLevel(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 762dcba..8856538 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -316,19 +316,17 @@ static HRESULT WINAPI d3d9_texture_2d_GetSurfaceLevel(IDirect3DTexture9 *iface, UINT level, IDirect3DSurface9 **surface) { struct d3d9_texture *texture = impl_from_IDirect3DTexture9(iface); - struct wined3d_resource *sub_resource; struct d3d9_surface *surface_impl; TRACE("iface %p, level %u, surface %p.\n", iface, level, surface); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) + if (!(surface_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, level))) { wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; } - surface_impl = wined3d_resource_get_parent(sub_resource); *surface = &surface_impl->IDirect3DSurface9_iface; IDirect3DSurface9_AddRef(*surface); wined3d_mutex_unlock();

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_parent in d3d9_texture_cube_LockRect ().
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: a020fe383e1051546b5b10e792b73c0d4741ca0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a020fe383e1051546b5b10e79… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 23 18:22:02 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_parent in d3d9_texture_cube_LockRect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 8856538..523ad92 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -754,7 +754,6 @@ static HRESULT WINAPI d3d9_texture_cube_LockRect(IDirect3DCubeTexture9 *iface, DWORD flags) { struct d3d9_texture *texture = impl_from_IDirect3DCubeTexture9(iface); - struct wined3d_resource *sub_resource; struct d3d9_surface *surface_impl; UINT sub_resource_idx; HRESULT hr; @@ -764,13 +763,10 @@ static HRESULT WINAPI d3d9_texture_cube_LockRect(IDirect3DCubeTexture9 *iface, wined3d_mutex_lock(); sub_resource_idx = wined3d_texture_get_level_count(texture->wined3d_texture) * face + level; - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) + if (!(surface_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, sub_resource_idx))) hr = D3DERR_INVALIDCALL; else - { - surface_impl = wined3d_resource_get_parent(sub_resource); hr = IDirect3DSurface9_LockRect(&surface_impl->IDirect3DSurface9_iface, locked_rect, rect, flags); - } wined3d_mutex_unlock(); return hr;

1 0

Piotr Caban : msvcp120: Add _Thrd_start implementation.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: fb7af057a16ce9d01a358dc0adaf9935d581b9aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb7af057a16ce9d01a358dc0a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 23 13:13:07 2016 +0100 msvcp120: Add _Thrd_start implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp90/misc.c | 35 +++++++++++++++++++++++++++++++++-- 4 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index ae11097..52d292c 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3864,7 +3864,7 @@ @ cdecl _Thrd_join(ptr long) @ cdecl _Thrd_lt(ptr ptr) @ cdecl _Thrd_sleep(ptr) -@ stub _Thrd_start +@ cdecl _Thrd_start(ptr ptr ptr) @ cdecl _Thrd_yield() @ cdecl _Tolower(long ptr) @ cdecl _Toupper(long ptr) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index e78d5ea..c70939b 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3811,7 +3811,7 @@ @ cdecl _Thrd_join(ptr long) @ cdecl _Thrd_lt(ptr ptr) @ cdecl _Thrd_sleep(ptr) -@ stub _Thrd_start +@ cdecl _Thrd_start(ptr ptr ptr) @ cdecl _Thrd_yield() @ cdecl _Tolower(long ptr) @ cdecl _Toupper(long ptr) diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 0330d53..6b6e24c 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3811,7 +3811,7 @@ @ cdecl _Thrd_join(ptr long) msvcp120._Thrd_join @ cdecl _Thrd_lt(ptr ptr) msvcp120._Thrd_lt @ cdecl _Thrd_sleep(ptr) msvcp120._Thrd_sleep -@ stub _Thrd_start +@ cdecl _Thrd_start(ptr ptr ptr) msvcp120._Thrd_start @ cdecl _Thrd_yield() msvcp120._Thrd_yield @ cdecl _Tolower(long ptr) msvcp120._Tolower @ cdecl _Toupper(long ptr) msvcp120._Toupper diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index b2adc72..a9efe0a 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -872,10 +872,41 @@ int __cdecl _Thrd_join(_Thrd_t thr, int *code) return 0; } +int __cdecl _Thrd_start(_Thrd_t *thr, LPTHREAD_START_ROUTINE proc, void *arg) +{ + TRACE("(%p %p %p)\n", thr, proc, arg); + thr->hnd = CreateThread(NULL, 0, proc, arg, 0, &thr->id); + return thr->hnd ? 0 : _THRD_ERROR; +} + +typedef struct +{ + _Thrd_start_t proc; + void *arg; +} thread_proc_arg; + +static DWORD WINAPI thread_proc_wrapper(void *arg) +{ + thread_proc_arg wrapped_arg = *((thread_proc_arg*)arg); + free(arg); + return wrapped_arg.proc(wrapped_arg.arg); +} + int __cdecl _Thrd_create(_Thrd_t *thr, _Thrd_start_t proc, void *arg) { + thread_proc_arg *wrapped_arg; + int ret; + TRACE("(%p %p %p)\n", thr, proc, arg); - thr->hnd = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)proc, arg, 0, &thr->id); - return !thr->hnd; + + wrapped_arg = malloc(sizeof(*wrapped_arg)); + if(!wrapped_arg) + return _THRD_ERROR; /* TODO: probably different error should be returned here */ + + wrapped_arg->proc = proc; + wrapped_arg->arg = arg; + ret = _Thrd_start(thr, thread_proc_wrapper, wrapped_arg); + if(ret) free(wrapped_arg); + return ret; } #endif

1 0

Piotr Caban : msvcp110: Add _Pad class stub.
by Alexandre Julliard 24 Feb '16

24 Feb '16

Module: wine Branch: master Commit: c97cb06f895d7792dd4cab585a5b3b2d7e6145a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c97cb06f895d7792dd4cab585… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 23 13:13:13 2016 +0100 msvcp110: Add _Pad class stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 38 ++++----- dlls/msvcp120/msvcp120.spec | 38 ++++----- dlls/msvcp120_app/msvcp120_app.spec | 38 ++++----- dlls/msvcp90/misc.c | 152 +++++++++++++++++++++++++++--------- 4 files changed, 173 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c97cb06f895d7792dd4ca…

1 0