March 2018 - Wine-Devel - list.winehq.org

[PATCH 4/5] wined3d: Pass a texture and sub-resource index to surface_load_drawable().
by Henri Verbeet March 6, 2018

March 6, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 10 +++++----- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 24d1f59..1824a98 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2106,12 +2106,11 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res } /* Context activation is done by the caller. */ -BOOL surface_load_drawable(struct wined3d_surface *surface, - struct wined3d_context *context) +BOOL texture2d_load_drawable(struct wined3d_texture *texture, + unsigned int sub_resource_idx, struct wined3d_context *context) { - unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); - struct wined3d_texture *texture = surface->container; struct wined3d_surface *restore_rt = NULL; + struct wined3d_surface *surface; struct wined3d_device *device; unsigned int level; RECT r; @@ -2127,11 +2126,12 @@ BOOL surface_load_drawable(struct wined3d_surface *surface, if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && wined3d_resource_is_offscreen(&texture->resource)) { - ERR("Trying to load offscreen surface into WINED3D_LOCATION_DRAWABLE.\n"); + ERR("Trying to load offscreen texture into WINED3D_LOCATION_DRAWABLE.\n"); return FALSE; } device = texture->resource.device; + surface = texture->sub_resources[sub_resource_idx].u.surface; restore_rt = context_get_rt_surface(context); if (restore_rt != surface) context = context_acquire(device, texture, sub_resource_idx); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0368550..9add4a3 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1806,7 +1806,7 @@ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned in return texture2d_load_sysmem(texture, sub_resource_idx, context, location); case WINED3D_LOCATION_DRAWABLE: - return surface_load_drawable(surface, context); + return texture2d_load_drawable(texture, sub_resource_idx, context); case WINED3D_LOCATION_RB_RESOLVED: case WINED3D_LOCATION_RB_MULTISAMPLE: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d07c81d..44c0ab4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3233,6 +3233,8 @@ static inline unsigned int wined3d_texture_get_level_pow2_height(const struct wi return max(1, texture->pow2_height >> level); } +BOOL texture2d_load_drawable(struct wined3d_texture *texture, unsigned int sub_resource_idx, + struct wined3d_context *context) DECLSPEC_HIDDEN; BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; @@ -3339,8 +3341,6 @@ static inline struct wined3d_texture_sub_resource *surface_get_sub_resource(stru HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const struct wined3d_blt_fx *blt_fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; -BOOL surface_load_drawable(struct wined3d_surface *surface, - struct wined3d_context *context) DECLSPEC_HIDDEN; void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; BOOL surface_load_renderbuffer(struct wined3d_surface *surface, -- 2.1.4

1 0

[PATCH 3/5] wined3d: Pass a texture and sub-resource index to surface_load_sysmem().
by Henri Verbeet March 6, 2018

March 6, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 16 +++++++--------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 5 +++-- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 23d7ae7..24d1f59 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2060,12 +2060,10 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE } /* Context activation is done by the caller. */ -BOOL surface_load_sysmem(struct wined3d_surface *surface, +BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD dst_location) { - unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_texture *texture = surface->container; struct wined3d_texture_sub_resource *sub_resource; sub_resource = &texture->sub_resources[sub_resource_idx]; @@ -2075,7 +2073,7 @@ BOOL surface_load_sysmem(struct wined3d_surface *surface, if (is_multisample_location(texture, WINED3D_LOCATION_TEXTURE_RGB)) { wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_RB_RESOLVED); - read_from_framebuffer(surface, context, WINED3D_LOCATION_RB_RESOLVED, dst_location); + read_from_framebuffer(sub_resource->u.surface, context, WINED3D_LOCATION_RB_RESOLVED, dst_location); return TRUE; } else @@ -2083,12 +2081,12 @@ BOOL surface_load_sysmem(struct wined3d_surface *surface, if (sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED)) wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); - /* Download the surface to system memory. */ + /* Download the sub-resource to system memory. */ if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) { wined3d_texture_bind_and_dirtify(texture, context, !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB)); - surface_download_data(surface, gl_info, dst_location); + surface_download_data(sub_resource->u.surface, gl_info, dst_location); ++texture->download_count; return TRUE; @@ -2098,12 +2096,12 @@ BOOL surface_load_sysmem(struct wined3d_surface *surface, if (!(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) && (sub_resource->locations & WINED3D_LOCATION_DRAWABLE)) { - read_from_framebuffer(surface, context, texture->resource.draw_binding, dst_location); + read_from_framebuffer(sub_resource->u.surface, context, texture->resource.draw_binding, dst_location); return TRUE; } - FIXME("Can't load surface %p with location flags %s into sysmem.\n", - surface, wined3d_debug_location(sub_resource->locations)); + FIXME("Can't load texture %p, %u with location flags %s into sysmem.\n", + texture, sub_resource_idx, wined3d_debug_location(sub_resource->locations)); return FALSE; } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 72aee66..0368550 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1803,7 +1803,7 @@ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned in case WINED3D_LOCATION_USER_MEMORY: case WINED3D_LOCATION_SYSMEM: case WINED3D_LOCATION_BUFFER: - return surface_load_sysmem(surface, context, location); + return texture2d_load_sysmem(texture, sub_resource_idx, context, location); case WINED3D_LOCATION_DRAWABLE: return surface_load_drawable(surface, context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 33bbd53..d07c81d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3233,6 +3233,9 @@ static inline unsigned int wined3d_texture_get_level_pow2_height(const struct wi return max(1, texture->pow2_height >> level); } +BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_resource_idx, + struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; + void wined3d_texture_apply_sampler_desc(struct wined3d_texture *texture, const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_texture_bind(struct wined3d_texture *texture, @@ -3342,8 +3345,6 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; BOOL surface_load_renderbuffer(struct wined3d_surface *surface, struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; -BOOL surface_load_sysmem(struct wined3d_surface *surface, - struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; BOOL surface_load_texture(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, -- 2.1.4

1 0

[PATCH 2/5] wined3d: Merge surface_load_location() into texture2d_load_location().
by Henri Verbeet March 6, 2018

March 6, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 40 +++++----------------------------------- dlls/wined3d/texture.c | 31 ++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 10 ++++++++-- 3 files changed, 43 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5a2bf52..23d7ae7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2060,7 +2060,7 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE } /* Context activation is done by the caller. */ -static BOOL surface_load_sysmem(struct wined3d_surface *surface, +BOOL surface_load_sysmem(struct wined3d_surface *surface, struct wined3d_context *context, DWORD dst_location) { unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); @@ -2108,7 +2108,7 @@ static BOOL surface_load_sysmem(struct wined3d_surface *surface, } /* Context activation is done by the caller. */ -static BOOL surface_load_drawable(struct wined3d_surface *surface, +BOOL surface_load_drawable(struct wined3d_surface *surface, struct wined3d_context *context) { unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); @@ -2155,7 +2155,7 @@ static BOOL surface_load_drawable(struct wined3d_surface *surface, return TRUE; } -static BOOL surface_load_texture(struct wined3d_surface *surface, +BOOL surface_load_texture(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { unsigned int width, height, level, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch; @@ -2326,8 +2326,8 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, } /* Context activation is done by the caller. */ -static BOOL surface_load_renderbuffer(struct wined3d_surface *surface, struct wined3d_context *context, - DWORD dst_location) +BOOL surface_load_renderbuffer(struct wined3d_surface *surface, + struct wined3d_context *context, DWORD dst_location) { struct wined3d_texture *texture = surface->container; unsigned int level = surface_get_sub_resource_idx(surface) % texture->level_count; @@ -2359,36 +2359,6 @@ static BOOL surface_load_renderbuffer(struct wined3d_surface *surface, struct wi return TRUE; } -/* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ -BOOL surface_load_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) -{ - TRACE("surface %p, location %s.\n", surface, wined3d_debug_location(location)); - - switch (location) - { - case WINED3D_LOCATION_USER_MEMORY: - case WINED3D_LOCATION_SYSMEM: - case WINED3D_LOCATION_BUFFER: - return surface_load_sysmem(surface, context, location); - - case WINED3D_LOCATION_DRAWABLE: - return surface_load_drawable(surface, context); - - case WINED3D_LOCATION_RB_RESOLVED: - case WINED3D_LOCATION_RB_MULTISAMPLE: - return surface_load_renderbuffer(surface, context, location); - - case WINED3D_LOCATION_TEXTURE_RGB: - case WINED3D_LOCATION_TEXTURE_SRGB: - return surface_load_texture(surface, context, - location == WINED3D_LOCATION_TEXTURE_SRGB); - - default: - ERR("Don't know how to handle location %#x.\n", location); - return FALSE; - } -} - /* Context activation is done by the caller. */ static void fbo_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_context *context) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8c03331..72aee66 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1788,10 +1788,39 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int texture->resource.format, &src_rect, row_pitch, &dst_point, FALSE, data); } +/* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) { - return surface_load_location(texture->sub_resources[sub_resource_idx].u.surface, context, location); + struct wined3d_surface *surface; + + TRACE("texture %p, sub_resource_idx %u, context %p, location %s.\n", + texture, sub_resource_idx, context, wined3d_debug_location(location)); + + surface = texture->sub_resources[sub_resource_idx].u.surface; + switch (location) + { + case WINED3D_LOCATION_USER_MEMORY: + case WINED3D_LOCATION_SYSMEM: + case WINED3D_LOCATION_BUFFER: + return surface_load_sysmem(surface, context, location); + + case WINED3D_LOCATION_DRAWABLE: + return surface_load_drawable(surface, context); + + case WINED3D_LOCATION_RB_RESOLVED: + case WINED3D_LOCATION_RB_MULTISAMPLE: + return surface_load_renderbuffer(surface, context, location); + + case WINED3D_LOCATION_TEXTURE_RGB: + case WINED3D_LOCATION_TEXTURE_SRGB: + return surface_load_texture(surface, context, + location == WINED3D_LOCATION_TEXTURE_SRGB); + + default: + ERR("Don't know how to handle location %#x.\n", location); + return FALSE; + } } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d92193d..33bbd53 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3336,10 +3336,16 @@ static inline struct wined3d_texture_sub_resource *surface_get_sub_resource(stru HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const struct wined3d_blt_fx *blt_fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; +BOOL surface_load_drawable(struct wined3d_surface *surface, + struct wined3d_context *context) DECLSPEC_HIDDEN; void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; -BOOL surface_load_location(struct wined3d_surface *surface, - struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; +BOOL surface_load_renderbuffer(struct wined3d_surface *surface, + struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; +BOOL surface_load_sysmem(struct wined3d_surface *surface, + struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; +BOOL surface_load_texture(struct wined3d_surface *surface, + struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, unsigned int src_pitch, const POINT *dst_point, BOOL srgb, -- 2.1.4

1 0

[PATCH 1/5] wined3d: Store the EXT_fbo "renderbuffers" list in the texture instead of the surface.
by Henri Verbeet March 6, 2018

March 6, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 23 +++---- dlls/wined3d/surface.c | 84 ------------------------ dlls/wined3d/texture.c | 146 +++++++++++++++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 10 +-- 4 files changed, 125 insertions(+), 138 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c9efad0..60bf52b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -445,19 +445,15 @@ static inline void context_set_fbo_key_for_render_target(const struct wined3d_co } texture = wined3d_texture_from_resource(resource); - if (resource->type == WINED3D_RTYPE_TEXTURE_2D) + if (texture->current_renderbuffer) { - struct wined3d_surface *surface = texture->sub_resources[sub_resource_idx].u.surface; - - if (surface->current_renderbuffer) - { - key->objects[idx].object = surface->current_renderbuffer->id; - key->objects[idx].target = 0; - key->objects[idx].level = key->objects[idx].layer = 0; - key->rb_namespace |= 1 << idx; - return; - } + key->objects[idx].object = texture->current_renderbuffer->id; + key->objects[idx].target = 0; + key->objects[idx].level = key->objects[idx].layer = 0; + key->rb_namespace |= 1 << idx; + return; } + key->objects[idx].target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); key->objects[idx].level = sub_resource_idx % texture->level_count; key->objects[idx].layer = sub_resource_idx / texture->level_count; @@ -604,10 +600,7 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, } else if (depth_stencil->resource->type == WINED3D_RTYPE_TEXTURE_2D) { - struct wined3d_surface *surface; - - surface = ds_texture->sub_resources[depth_stencil->sub_resource_idx].u.surface; - surface_set_compatible_renderbuffer(surface, &render_targets[0]); + wined3d_texture_set_compatible_renderbuffer(ds_texture, ds_level, &render_targets[0]); } } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8d6712b..5a2bf52 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -975,90 +975,6 @@ static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, return WINED3D_OK; } -/* In D3D the depth stencil dimensions have to be greater than or equal to the - * render target dimensions. With FBOs, the dimensions have to be an exact match. */ -/* TODO: We should synchronize the renderbuffer's content with the texture's content. */ -/* Context activation is done by the caller. */ -void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_rendertarget_info *rt) -{ - unsigned int sub_resource_idx, width, height, level; - struct wined3d_renderbuffer_entry *entry; - const struct wined3d_texture *texture; - const struct wined3d_gl_info *gl_info; - unsigned int src_width, src_height; - GLuint renderbuffer = 0; - - texture = surface->container; - gl_info = &texture->resource.device->adapter->gl_info; - sub_resource_idx = surface_get_sub_resource_idx(surface); - level = sub_resource_idx % texture->level_count; - - if (rt && rt->resource->format->id != WINED3DFMT_NULL) - { - struct wined3d_texture *rt_texture; - unsigned int rt_level; - - if (rt->resource->type == WINED3D_RTYPE_BUFFER) - { - FIXME("Unsupported resource type %s.\n", debug_d3dresourcetype(rt->resource->type)); - return; - } - rt_texture = wined3d_texture_from_resource(rt->resource); - rt_level = rt->sub_resource_idx % rt_texture->level_count; - - width = wined3d_texture_get_level_pow2_width(rt_texture, rt_level); - height = wined3d_texture_get_level_pow2_height(rt_texture, rt_level); - } - else - { - width = wined3d_texture_get_level_pow2_width(texture, level); - height = wined3d_texture_get_level_pow2_height(texture, level); - } - - src_width = wined3d_texture_get_level_pow2_width(texture, level); - src_height = wined3d_texture_get_level_pow2_height(texture, level); - - /* A depth stencil smaller than the render target is not valid */ - if (width > src_width || height > src_height) return; - - /* Remove any renderbuffer set if the sizes match */ - if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] - || (width == src_width && height == src_height)) - { - surface->current_renderbuffer = NULL; - return; - } - - /* Look if we've already got a renderbuffer of the correct dimensions */ - LIST_FOR_EACH_ENTRY(entry, &surface->renderbuffers, struct wined3d_renderbuffer_entry, entry) - { - if (entry->width == width && entry->height == height) - { - renderbuffer = entry->id; - surface->current_renderbuffer = entry; - break; - } - } - - if (!renderbuffer) - { - gl_info->fbo_ops.glGenRenderbuffers(1, &renderbuffer); - gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer); - gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, - texture->resource.format->glInternal, width, height); - - entry = heap_alloc(sizeof(*entry)); - entry->width = width; - entry->height = height; - entry->id = renderbuffer; - list_add_head(&surface->renderbuffers, &entry->entry); - - surface->current_renderbuffer = entry; - } - - checkGLcall("set_compatible_renderbuffer"); -} - /* See also float_16_to_32() in wined3d_private.h */ static inline unsigned short float_32_to_16(const float *in) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0c0e434..8c03331 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -418,6 +418,8 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->flags |= WINED3D_TEXTURE_GENERATE_MIPMAPS; } + list_init(&texture->renderbuffers); + return WINED3D_OK; } @@ -654,8 +656,9 @@ 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_renderbuffer_entry *entry, *entry2; + const struct wined3d_gl_info *gl_info = NULL; struct wined3d_context *context = NULL; - const struct wined3d_gl_info *gl_info; GLuint buffer_object; unsigned int i; @@ -678,6 +681,21 @@ static void wined3d_texture_cleanup(struct wined3d_texture *texture) GL_EXTCALL(glDeleteBuffers(1, &buffer_object)); } + + if (!context && !list_empty(&texture->renderbuffers)) + { + context = context_acquire(device, NULL, 0); + gl_info = context->gl_info; + } + + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &texture->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); + heap_free(entry); + } + if (context) context_release(context); @@ -1233,6 +1251,89 @@ HRESULT CDECL wined3d_texture_set_color_key(struct wined3d_texture *texture, return WINED3D_OK; } +/* In D3D the depth stencil dimensions have to be greater than or equal to the + * render target dimensions. With FBOs, the dimensions have to be an exact match. */ +/* TODO: We should synchronize the renderbuffer's content with the texture's content. */ +/* Context activation is done by the caller. */ +void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture, + unsigned int level, const struct wined3d_rendertarget_info *rt) +{ + struct wined3d_renderbuffer_entry *entry; + const struct wined3d_gl_info *gl_info; + unsigned int src_width, src_height; + unsigned int width, height; + GLuint renderbuffer = 0; + + gl_info = &texture->resource.device->adapter->gl_info; + if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT]) + return; + + if (rt && rt->resource->format->id != WINED3DFMT_NULL) + { + struct wined3d_texture *rt_texture; + unsigned int rt_level; + + if (rt->resource->type == WINED3D_RTYPE_BUFFER) + { + FIXME("Unsupported resource type %s.\n", debug_d3dresourcetype(rt->resource->type)); + return; + } + rt_texture = wined3d_texture_from_resource(rt->resource); + rt_level = rt->sub_resource_idx % rt_texture->level_count; + + width = wined3d_texture_get_level_pow2_width(rt_texture, rt_level); + height = wined3d_texture_get_level_pow2_height(rt_texture, rt_level); + } + else + { + width = wined3d_texture_get_level_pow2_width(texture, level); + height = wined3d_texture_get_level_pow2_height(texture, level); + } + + src_width = wined3d_texture_get_level_pow2_width(texture, level); + src_height = wined3d_texture_get_level_pow2_height(texture, level); + + /* A depth stencil smaller than the render target is not valid */ + if (width > src_width || height > src_height) + return; + + /* Remove any renderbuffer set if the sizes match */ + if (width == src_width && height == src_height) + { + texture->current_renderbuffer = NULL; + return; + } + + /* Look if we've already got a renderbuffer of the correct dimensions */ + LIST_FOR_EACH_ENTRY(entry, &texture->renderbuffers, struct wined3d_renderbuffer_entry, entry) + { + if (entry->width == width && entry->height == height) + { + renderbuffer = entry->id; + texture->current_renderbuffer = entry; + break; + } + } + + if (!renderbuffer) + { + gl_info->fbo_ops.glGenRenderbuffers(1, &renderbuffer); + gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer); + gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, + texture->resource.format->glInternal, width, height); + + entry = heap_alloc(sizeof(*entry)); + entry->width = width; + entry->height = height; + entry->id = renderbuffer; + list_add_head(&texture->renderbuffers, &entry->entry); + + texture->current_renderbuffer = entry; + } + + checkGLcall("set_compatible_renderbuffer"); +} + static void texture2d_create_dc(void *object) { struct wined3d_surface *surface = object; @@ -1738,10 +1839,7 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi static void texture2d_cleanup_sub_resources(struct wined3d_texture *texture) { unsigned int sub_count = texture->level_count * texture->layer_count; - struct wined3d_device *device = texture->resource.device; struct wined3d_texture_sub_resource *sub_resource; - struct wined3d_renderbuffer_entry *entry, *entry2; - const struct wined3d_gl_info *gl_info = NULL; struct wined3d_context *context = NULL; struct wined3d_surface *surface; unsigned int i; @@ -1754,20 +1852,6 @@ static void texture2d_cleanup_sub_resources(struct wined3d_texture *texture) TRACE("surface %p.\n", surface); - if (!context && !list_empty(&surface->renderbuffers)) - { - context = context_acquire(device, NULL, 0); - gl_info = context->gl_info; - } - - 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); - heap_free(entry); - } - if (surface->dc) texture2d_destroy_dc(surface); } @@ -1813,6 +1897,7 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) { struct wined3d_texture *texture = texture_from_resource(resource); UINT sub_count = texture->level_count * texture->layer_count; + struct wined3d_renderbuffer_entry *entry, *entry2; struct wined3d_device *device = resource->device; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; @@ -1847,23 +1932,17 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) if (sub_resource->buffer_object) wined3d_texture_remove_buffer_object(texture, i, context->gl_info); + } - if (resource->type == WINED3D_RTYPE_TEXTURE_2D) - { - struct wined3d_surface *surface = sub_resource->u.surface; - struct wined3d_renderbuffer_entry *entry, *entry2; - - 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); - heap_free(entry); - } - list_init(&surface->renderbuffers); - surface->current_renderbuffer = NULL; - } + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &texture->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); + heap_free(entry); } + list_init(&texture->renderbuffers); + texture->current_renderbuffer = NULL; context_release(context); @@ -2247,7 +2326,6 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 surface->container = texture; surface->texture_level = i; surface->texture_layer = j; - list_init(&surface->renderbuffers); sub_resource = &texture->sub_resources[idx]; sub_resource->locations = WINED3D_LOCATION_DISCARDED; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a78055a..d92193d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3154,6 +3154,9 @@ struct wined3d_texture RECT dst_rect; } *overlay_info; + struct list renderbuffers; + const struct wined3d_renderbuffer_entry *current_renderbuffer; + struct wined3d_texture_sub_resource { void *parent; @@ -3251,6 +3254,8 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; +void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture, + unsigned int level, const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN; void wined3d_texture_set_map_binding(struct wined3d_texture *texture, DWORD map_binding) DECLSPEC_HIDDEN; void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; @@ -3316,9 +3321,6 @@ struct wined3d_surface /* For GetDC */ HBITMAP bitmap; HDC dc; - - struct list renderbuffers; - const struct wined3d_renderbuffer_entry *current_renderbuffer; }; static inline unsigned int surface_get_sub_resource_idx(const struct wined3d_surface *surface) @@ -3338,8 +3340,6 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; BOOL surface_load_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; -void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, - const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN; void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, unsigned int src_pitch, const POINT *dst_point, BOOL srgb, -- 2.1.4

1 0

[PATCH 5/5] taskschd/tests: Add more tests for actions.
by Dmitry Timoshkov March 6, 2018

March 6, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/taskschd/tests/scheduler.c | 55 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index c60fd1d9d7..80bc1c9034 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1304,6 +1304,8 @@ static void test_daily_trigger(ITrigger *trigger) static void create_action(ITaskDefinition *taskdef) { static WCHAR task1_exe[] = { 't','a','s','k','1','.','e','x','e',0 }; + static WCHAR workdir[] = { 'w','o','r','k','d','i','r',0 }; + static WCHAR args[] = { 'a','r','g','u','m','e','n','s',0 }; HRESULT hr; IActionCollection *actions; IAction *action; @@ -1311,6 +1313,9 @@ static void create_action(ITaskDefinition *taskdef) TASK_ACTION_TYPE type; BSTR path; + hr = ITaskDefinition_get_Actions(taskdef, NULL); + ok(hr == E_POINTER, "got %#x\n", hr); + hr = ITaskDefinition_get_Actions(taskdef, &actions); ok(hr == S_OK, "get_Actions error %#x\n", hr); @@ -1325,11 +1330,17 @@ static void create_action(ITaskDefinition *taskdef) ok(hr == S_OK, "get_Type error %#x\n", hr); ok(type == TASK_ACTION_EXEC, "got %u\n", type ); + hr = IExecAction_get_Path(exec_action, NULL); + ok(hr == E_POINTER, "got %#x\n", hr); + path = (BSTR)0xdeadbeef; hr = IExecAction_get_Path(exec_action, &path); ok(hr == S_OK, "get_Path error %#x\n", hr); ok(path == NULL, "path not set\n"); + hr = IExecAction_put_Path(exec_action, NULL); + ok(hr == S_OK, "put_Path error %#x\n", hr); + hr = IExecAction_put_Path(exec_action, task1_exe); ok(hr == S_OK, "put_Path error %#x\n", hr); @@ -1337,7 +1348,49 @@ static void create_action(ITaskDefinition *taskdef) hr = IExecAction_get_Path(exec_action, &path); ok(hr == S_OK, "get_Path error %#x\n", hr); ok(path != NULL, "path not set\n"); - ok(!lstrcmpW(path, task1_exe), "wrong path\n" ); + ok(!lstrcmpW(path, task1_exe), "got %s\n", wine_dbgstr_w(path)); + SysFreeString(path); + + hr = IExecAction_get_WorkingDirectory(exec_action, NULL); + ok(hr == E_POINTER, "got %#x\n", hr); + + path = (BSTR)0xdeadbeef; + hr = IExecAction_get_WorkingDirectory(exec_action, &path); + ok(hr == S_OK, "get_WorkingDirectory error %#x\n", hr); + ok(path == NULL, "workdir not set\n"); + + hr = IExecAction_put_WorkingDirectory(exec_action, NULL); + ok(hr == S_OK, "put_WorkingDirectory error %#x\n", hr); + + hr = IExecAction_put_WorkingDirectory(exec_action, workdir); + ok(hr == S_OK, "put_WorkingDirectory error %#x\n", hr); + + path = NULL; + hr = IExecAction_get_WorkingDirectory(exec_action, &path); + ok(hr == S_OK, "get_WorkingDirectory error %#x\n", hr); + ok(path != NULL, "workdir not set\n"); + ok(!lstrcmpW(path, workdir), "got %s\n", wine_dbgstr_w(path)); + SysFreeString(path); + + hr = IExecAction_get_Arguments(exec_action, NULL); + ok(hr == E_POINTER, "got %#x\n", hr); + + path = (BSTR)0xdeadbeef; + hr = IExecAction_get_Arguments(exec_action, &path); + ok(hr == S_OK, "get_Arguments error %#x\n", hr); + ok(path == NULL, "args not set\n"); + + hr = IExecAction_put_Arguments(exec_action, NULL); + ok(hr == S_OK, "put_Arguments error %#x\n", hr); + + hr = IExecAction_put_Arguments(exec_action, args); + ok(hr == S_OK, "put_WorkingDirectory error %#x\n", hr); + + path = NULL; + hr = IExecAction_get_Arguments(exec_action, &path); + ok(hr == S_OK, "get_Arguments error %#x\n", hr); + ok(path != NULL, "args not set\n"); + ok(!lstrcmpW(path, args), "got %s\n", wine_dbgstr_w(path)); SysFreeString(path); IExecAction_Release(exec_action); -- 2.16.2

1 0

[PATCH 4/5] taskschd: Implement IExecAction::get_Arguments.
by Dmitry Timoshkov March 6, 2018

March 6, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/taskschd/task.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index a4cc3be898..1b6a7015ee 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1810,8 +1810,16 @@ static HRESULT WINAPI ExecAction_put_Path(IExecAction *iface, BSTR path) static HRESULT WINAPI ExecAction_get_Arguments(IExecAction *iface, BSTR *arguments) { - FIXME("%p,%p: stub\n", iface, arguments); - return E_NOTIMPL; + ExecAction *action = impl_from_IExecAction(iface); + + TRACE("%p,%p\n", iface, arguments); + + if (!arguments) return E_POINTER; + + if (!action->args) *arguments = NULL; + else if (!(*arguments = SysAllocString(action->args))) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI ExecAction_put_Arguments(IExecAction *iface, BSTR arguments) -- 2.16.2

1 0

[PATCH 3/5] taskschd: Implement IExecAction::put_Arguments.
by Dmitry Timoshkov March 6, 2018

March 6, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/taskschd/task.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 2b0283e9fe..a4cc3be898 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1678,6 +1678,7 @@ typedef struct LONG ref; WCHAR *path; WCHAR *directory; + WCHAR *args; } ExecAction; static inline ExecAction *impl_from_IExecAction(IExecAction *iface) @@ -1701,6 +1702,7 @@ static ULONG WINAPI ExecAction_Release(IExecAction *iface) TRACE("destroying %p\n", iface); heap_free(action->path); heap_free(action->directory); + heap_free(action->args); heap_free(action); } @@ -1814,7 +1816,15 @@ static HRESULT WINAPI ExecAction_get_Arguments(IExecAction *iface, BSTR *argumen static HRESULT WINAPI ExecAction_put_Arguments(IExecAction *iface, BSTR arguments) { - FIXME("%p,%s: stub\n", iface, debugstr_w(arguments)); + ExecAction *action = impl_from_IExecAction(iface); + WCHAR *str = NULL; + + TRACE("%p,%s\n", iface, debugstr_w(arguments)); + + if (arguments && !(str = heap_strdupW((arguments)))) return E_OUTOFMEMORY; + heap_free(action->args); + action->args = str; + return S_OK; } @@ -1877,6 +1887,7 @@ static HRESULT ExecAction_create(IExecAction **obj) action->ref = 1; action->path = NULL; action->directory = NULL; + action->args = NULL; *obj = &action->IExecAction_iface; -- 2.16.2

1 0

[PATCH 2/5] taskschd: Implement IExecAction::get_WorkingDirectory.
by Dmitry Timoshkov March 6, 2018

March 6, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/taskschd/task.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index f7ea0131f7..2b0283e9fe 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1820,8 +1820,16 @@ static HRESULT WINAPI ExecAction_put_Arguments(IExecAction *iface, BSTR argument static HRESULT WINAPI ExecAction_get_WorkingDirectory(IExecAction *iface, BSTR *directory) { - FIXME("%p,%p: stub\n", iface, directory); - return E_NOTIMPL; + ExecAction *action = impl_from_IExecAction(iface); + + TRACE("%p,%p\n", iface, directory); + + if (!directory) return E_POINTER; + + if (!action->directory) *directory = NULL; + else if (!(*directory = SysAllocString(action->directory))) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI ExecAction_put_WorkingDirectory(IExecAction *iface, BSTR directory) -- 2.16.2

1 0

[PATCH 1/5] taskschd: Implement IExecAction::put_WorkingDirectory.
by Dmitry Timoshkov March 6, 2018

March 6, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/taskschd/task.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index a8b819c360..f7ea0131f7 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1677,6 +1677,7 @@ typedef struct IExecAction IExecAction_iface; LONG ref; WCHAR *path; + WCHAR *directory; } ExecAction; static inline ExecAction *impl_from_IExecAction(IExecAction *iface) @@ -1699,6 +1700,7 @@ static ULONG WINAPI ExecAction_Release(IExecAction *iface) { TRACE("destroying %p\n", iface); heap_free(action->path); + heap_free(action->directory); heap_free(action); } @@ -1824,8 +1826,16 @@ static HRESULT WINAPI ExecAction_get_WorkingDirectory(IExecAction *iface, BSTR * static HRESULT WINAPI ExecAction_put_WorkingDirectory(IExecAction *iface, BSTR directory) { - FIXME("%p,%s: stub\n", iface, debugstr_w(directory)); - return E_NOTIMPL; + ExecAction *action = impl_from_IExecAction(iface); + WCHAR *str = NULL; + + TRACE("%p,%s\n", iface, debugstr_w(directory)); + + if (directory && !(str = heap_strdupW((directory)))) return E_OUTOFMEMORY; + heap_free(action->directory); + action->directory = str; + + return S_OK; } static const IExecActionVtbl Action_vtbl = @@ -1858,6 +1868,7 @@ static HRESULT ExecAction_create(IExecAction **obj) action->IExecAction_iface.lpVtbl = &Action_vtbl; action->ref = 1; action->path = NULL; + action->directory = NULL; *obj = &action->IExecAction_iface; -- 2.16.2

1 0

[PATCH] ntdll: Implement NtCreateThreadEx.
by Alistair Leslie-Hughes March 6, 2018

March 6, 2018

From: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 17 +++++++++++++++++ include/winternl.h | 7 +++++++ 3 files changed, 25 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 6e996a5..b63e335 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -152,6 +152,7 @@ @ stdcall NtCreateSemaphore(ptr long ptr long long) @ stdcall NtCreateSymbolicLinkObject(ptr long ptr ptr) @ stub NtCreateThread +@ stdcall NtCreateThreadEx(ptr long ptr long ptr ptr long long long long ptr) @ stdcall NtCreateTimer(ptr long ptr long) @ stub NtCreateToken # @ stub NtCreateWaitablePort diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 9ec94d6..35e23d2 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -525,6 +525,23 @@ static void start_thread( struct startup_info *info ) /*********************************************************************** + * NtCreateThreadEx (NTDLL.@) + */ +NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle_ptr, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + HANDLE process, LPTHREAD_START_ROUTINE start, void *param, + ULONG flags, ULONG zero_bits, ULONG stack_commit, + ULONG stack_reserve, void *attribute_list ) +{ + FIXME( "%p, %x, %p, %p, %p, %p, %x, %x, %x, %x, %p semi-stub!\n", handle_ptr, access, attr, + process, start, param, flags, zero_bits, stack_commit, stack_reserve, attribute_list ); + + return RtlCreateUserThread( process, NULL, flags & THREAD_CREATE_FLAGS_CREATE_SUSPENDED, + NULL, stack_reserve, stack_commit, (PRTL_THREAD_START_ROUTINE)start, + param, handle_ptr, NULL ); +} + + +/*********************************************************************** * RtlCreateUserThread (NTDLL.@) */ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR *descr, diff --git a/include/winternl.h b/include/winternl.h index 6733977..98bf201 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2200,6 +2200,13 @@ typedef struct _SYSTEM_MODULE_INFORMATION SYSTEM_MODULE Modules[1]; /* FIXME: should be Modules[0] */ } SYSTEM_MODULE_INFORMATION, *PSYSTEM_MODULE_INFORMATION; +#define THREAD_CREATE_FLAGS_CREATE_SUSPENDED 0x00000001 +#define THREAD_CREATE_FLAGS_SKIP_THREAD_ATTACH 0x00000002 +#define THREAD_CREATE_FLAGS_HIDE_FROM_DEBUGGER 0x00000004 +#define THREAD_CREATE_FLAGS_HAS_SECURITY_DESCRIPTOR 0x00000010 +#define THREAD_CREATE_FLAGS_ACCESS_CHECK_IN_TARGET 0x00000020 +#define THREAD_CREATE_FLAGS_INITIAL_THREAD 0x00000080 + /*********************************************************************** * Function declarations */ -- 1.9.1

1 0