February 2016 - Wine-Commits

Piotr Caban : msvcp110: Add _Pad class stub.
by Alexandre Julliard Feb. 24, 2016

Feb. 24, 2016

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

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

Feb. 24, 2016

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

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

Feb. 24, 2016

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: Simplify FBO cleanup on resource destruction.
by Alexandre Julliard Feb. 24, 2016

Feb. 24, 2016

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: Retrieve FBO attachments from GL in context_check_fbo_status.
by Alexandre Julliard Feb. 24, 2016

Feb. 24, 2016

Module: wine Branch: master Commit: f11f6f681e923f9d47a0f7d0151e02cd750cd150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f11f6f681e923f9d47a0f7d01… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Feb 21 21:29:56 2016 +0000 wined3d: Retrieve FBO attachments from GL in context_check_fbo_status. 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 | 115 +++++++++++++++++++++++++++++++++-------- dlls/wined3d/utils.c | 29 +++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 123 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 442516a..3668195 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -243,6 +243,95 @@ static void context_attach_surface_fbo(struct wined3d_context *context, } } +static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, GLenum target, + GLenum attachment) +{ + GLint type, name, samples, width, height, old_texture, level, face, fmt, tex_target; + + gl_info->fbo_ops.glGetFramebufferAttachmentParameteriv(target, attachment, + GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME, &name); + gl_info->fbo_ops.glGetFramebufferAttachmentParameteriv(target, attachment, + GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, &type); + + if (type == GL_RENDERBUFFER) + { + gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, name); + gl_info->fbo_ops.glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_WIDTH, &width); + gl_info->fbo_ops.glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_HEIGHT, &height); + if (gl_info->limits.samples > 1) + gl_info->fbo_ops.glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_SAMPLES, &samples); + else + samples = 1; + gl_info->fbo_ops.glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_INTERNAL_FORMAT, &fmt); + FIXME(" %s: renderbuffer %d, %dx%d, %d samples, format %#x.\n", + debug_fboattachment(attachment), name, width, height, samples, fmt); + } + else if (type == GL_TEXTURE) + { + const char *tex_type_str; + + gl_info->fbo_ops.glGetFramebufferAttachmentParameteriv(target, attachment, + GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL, &level); + gl_info->fbo_ops.glGetFramebufferAttachmentParameteriv(target, attachment, + GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE, &face); + + if (face) + { + gl_info->gl_ops.gl.p_glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP, &old_texture); + + glBindTexture(GL_TEXTURE_CUBE_MAP, name); + glGetTexLevelParameteriv(face, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt); + glGetTexLevelParameteriv(face, level, GL_TEXTURE_WIDTH, &width); + glGetTexLevelParameteriv(face, level, GL_TEXTURE_HEIGHT, &height); + + tex_target = GL_TEXTURE_CUBE_MAP; + tex_type_str = "cube"; + } + else + { + gl_info->gl_ops.gl.p_glGetIntegerv(GL_TEXTURE_BINDING_2D, &old_texture); + while (gl_info->gl_ops.gl.p_glGetError()); + + glBindTexture(GL_TEXTURE_2D, name); + if (!gl_info->gl_ops.gl.p_glGetError()) + { + tex_target = GL_TEXTURE_2D; + tex_type_str = "2d"; + } + else + { + glBindTexture(GL_TEXTURE_2D, old_texture); + gl_info->gl_ops.gl.p_glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &old_texture); + + glBindTexture(GL_TEXTURE_RECTANGLE_ARB, name); + if (gl_info->gl_ops.gl.p_glGetError()) + { + glBindTexture(GL_TEXTURE_RECTANGLE_ARB, old_texture); + FIXME("Cannot find type of texture %d.\n", name); + return; + } + tex_target = GL_TEXTURE_RECTANGLE_ARB; + tex_type_str = "rectangle"; + } + + glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt); + glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_WIDTH, &width); + glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_HEIGHT, &height); + } + + FIXME(" %s: %s texture %d, %dx%d, format %#x.\n", debug_fboattachment(attachment), + tex_type_str, name, width, height, fmt); + + glBindTexture(tex_target, old_texture); + } + else if (type == GL_NONE) + { + FIXME("\t%s: NONE.\n", debug_fboattachment(attachment)); + } + else + ERR("\t%s: Unknown attachment %#x.\n", debug_fboattachment(attachment), type); +} + /* Context activation is done by the caller. */ void context_check_fbo_status(const struct wined3d_context *context, GLenum target) { @@ -258,7 +347,6 @@ void context_check_fbo_status(const struct wined3d_context *context, GLenum targ } else { - const struct wined3d_surface *attachment; unsigned int i; FIXME("FBO status %s (%#x)\n", debug_fbostatus(status), status); @@ -269,29 +357,12 @@ void context_check_fbo_status(const struct wined3d_context *context, GLenum targ return; } - FIXME("\tColor Location %s (%#x).\n", wined3d_debug_location(context->current_fbo->color_location), - context->current_fbo->color_location); - FIXME("\tDepth Stencil Location %s (%#x).\n", wined3d_debug_location(context->current_fbo->ds_location), - context->current_fbo->ds_location); + context_dump_fbo_attachment(gl_info, target, GL_DEPTH_ATTACHMENT); + context_dump_fbo_attachment(gl_info, target, GL_STENCIL_ATTACHMENT); - /* Dump the FBO attachments */ for (i = 0; i < gl_info->limits.buffers; ++i) - { - attachment = context->current_fbo->render_targets[i]; - if (attachment) - { - FIXME("\tColor attachment %d: (%p) %s %ux%u %u samples.\n", - i, attachment, debug_d3dformat(attachment->resource.format->id), - attachment->pow2Width, attachment->pow2Height, attachment->resource.multisample_type); - } - } - attachment = context->current_fbo->depth_stencil; - if (attachment) - { - FIXME("\tDepth attachment: (%p) %s %ux%u %u samples.\n", - attachment, debug_d3dformat(attachment->resource.format->id), - attachment->pow2Width, attachment->pow2Height, attachment->resource.multisample_type); - } + context_dump_fbo_attachment(gl_info, target, GL_COLOR_ATTACHMENT0 + i); + checkGLcall("Dump FBO attachments"); } } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 734b265..4e33f86 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3948,6 +3948,35 @@ const char *debug_d3dpool(enum wined3d_pool pool) } } +const char *debug_fboattachment(GLenum attachment) +{ + switch(attachment) + { +#define WINED3D_TO_STR(x) case x: return #x + WINED3D_TO_STR(GL_COLOR_ATTACHMENT0); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT1); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT2); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT3); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT4); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT5); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT6); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT7); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT8); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT9); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT10); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT11); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT12); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT13); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT14); + WINED3D_TO_STR(GL_COLOR_ATTACHMENT15); + WINED3D_TO_STR(GL_DEPTH_ATTACHMENT); + WINED3D_TO_STR(GL_STENCIL_ATTACHMENT); +#undef WINED3D_TO_STR + default: + return wine_dbg_sprintf("Unknown FBO attachment %#x", attachment); + } +} + const char *debug_fbostatus(GLenum status) { switch(status) { #define FBOSTATUS_TO_STR(u) case u: return #u diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4e3d779..324fabd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2969,6 +2969,7 @@ const char *debug_d3dtexturefiltertype(enum wined3d_texture_filter_type filter_t const char *debug_d3dtexturestate(enum wined3d_texture_stage_state state) DECLSPEC_HIDDEN; const char *debug_d3dtstype(enum wined3d_transform_state tstype) DECLSPEC_HIDDEN; const char *debug_d3dpool(enum wined3d_pool pool) DECLSPEC_HIDDEN; +const char *debug_fboattachment(GLenum attachment) DECLSPEC_HIDDEN; const char *debug_fbostatus(GLenum status) DECLSPEC_HIDDEN; const char *debug_glerror(GLenum error) DECLSPEC_HIDDEN; const char *debug_d3dtop(enum wined3d_texture_op d3dtop) DECLSPEC_HIDDEN;

1 0

Paul Gofman : wined3d: Bind default sampler object when setting sampler state with no texture.
by Alexandre Julliard Feb. 24, 2016

Feb. 24, 2016

Module: wine Branch: master Commit: 749d5a577b5c09f57ad062777f33be802e1373dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=749d5a577b5c09f57ad062777… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Sat Feb 20 17:00:55 2016 +0300 wined3d: Bind default sampler object when setting sampler state with no texture. When sampler state was applied and no stage texture was present in state, no glBindSampler was issued for the stage after dummy texture was bound, and previously bound sampler was still active. This could result in undefined behaviour, especially if previously bound sampler was a shadow sample (this caused warnings from Nvidia driver). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 58d2fed..3e08907 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3627,6 +3627,11 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state else { context_bind_texture(context, GL_NONE, 0); + if (gl_info->supported[ARB_SAMPLER_OBJECTS]) + { + GL_EXTCALL(glBindSampler(mapped_stage, 0)); + checkGLcall("glBindSampler"); + } } }

1 0

Charles Davis : d3d10core/tests: Silence absolute value warnings (Clang).
by Alexandre Julliard Feb. 24, 2016

Feb. 24, 2016

Module: wine Branch: master Commit: 65999e26b20b201a9780b145459266bc78b8fcbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=65999e26b20b201a9780b1454… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Fri Feb 19 15:50:34 2016 -0700 d3d10core/tests: Silence absolute value warnings (Clang). Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index e2c1683..60b243a 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -71,16 +71,16 @@ static BOOL compare_float(float f, float g, unsigned int ulps) static BOOL compare_color(DWORD c1, DWORD c2, BYTE max_diff) { - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) + if (abs((int)(c1 & 0xff) - (int)(c2 & 0xff)) > max_diff) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) + if (abs((int)(c1 & 0xff) - (int)(c2 & 0xff)) > max_diff) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) + if (abs((int)(c1 & 0xff) - (int)(c2 & 0xff)) > max_diff) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) + if (abs((int)(c1 & 0xff) - (int)(c2 & 0xff)) > max_diff) return FALSE; return TRUE; }

1 0

Nikolay Sivov : dwrite: Handle font data initialization failure when building collections.
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

Module: wine Branch: master Commit: 7276d5fac1417dd81344db45b3af904f8f2c7d77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7276d5fac1417dd81344db45b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 23 17:47:14 2016 +0300 dwrite: Handle font data initialization failure when building collections. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 05b5f55..c0e0e43 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -387,7 +387,8 @@ static void release_font_data(struct dwrite_font_data *data) if (data->info_strings[i]) IDWriteLocalizedStrings_Release(data->info_strings[i]); } - IDWriteLocalizedStrings_Release(data->names); + if (data->names) + IDWriteLocalizedStrings_Release(data->names); IDWriteFontFile_Release(data->file); IDWriteFactory2_Release(data->factory); @@ -3147,8 +3148,11 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat /* alloc and init new font data structure */ hr = init_font_data(factory, file, face_type, i, &family_name, &font_data); - if (FAILED(hr)) + if (FAILED(hr)) { + /* move to next one */ + hr = S_OK; continue; + } fontstrings_get_en_string(family_name, familyW, sizeof(familyW)/sizeof(WCHAR));

1 0

Charles Davis : winecoreaudio.drv: Don' t print 32-bit values as long integers (Clang).
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

Module: wine Branch: master Commit: 4a00695db677efd7856e7ab59360d18a95555057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a00695db677efd7856e7ab59… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Feb 22 16:23:42 2016 -0700 winecoreaudio.drv: Don't print 32-bit values as long integers (Clang). Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/mmdevdrv.c | 64 +++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a00695db677efd7856e7…

1 0

Hans Leidekker : webservices: Implement WsGetNamespaceFromPrefix.
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

Module: wine Branch: master Commit: 3609e3f47f04ec01dc874f1188f9f94a7c051d74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3609e3f47f04ec01dc874f118… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 23 13:11:55 2016 +0100 webservices: Implement WsGetNamespaceFromPrefix. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 61 +++++++++++++ dlls/webservices/tests/reader.c | 179 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 2 + 4 files changed, 243 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3609e3f47f04ec01dc874…

1 0