September 2019 - Wine-devel

[PATCH 2/2] atlbase.h: Add AtlComModuleRevokeClassObjects declaration.
by Jacek Caban 24 Sep '19

24 Sep '19

From: Puetz Kevin A <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/atlbase.h | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH 1/2] winbase.h: Add GetFinalPathNameByHandle declaration.
by Jacek Caban 24 Sep '19

24 Sep '19

From: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/winbase.h | 3 +++ 1 file changed, 3 insertions(+)

1 0

[PATCH 2/2] ole32/tests: Add more initialization spies tests.
by Jacek Caban 24 Sep '19

24 Sep '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ole32/tests/compobj.c | 182 +++++++++++++++++++++++++++---------- 1 file changed, 134 insertions(+), 48 deletions(-)

2 1

[PATCH 5/5] wined3d: Handle typeless formats in surface_cpu_blt().
by Henri Verbeet 24 Sep '19

24 Sep '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b07d3cd77ea..5064fb917fe 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1654,6 +1654,14 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int context = context_acquire(device, NULL, 0); + src_format = src_texture->resource.format; + dst_format = dst_texture->resource.format; + + if (wined3d_format_is_typeless(src_format) && src_format->id == dst_format->typeless_id) + src_format = dst_format; + if (wined3d_format_is_typeless(dst_format) && dst_format->id == src_format->typeless_id) + dst_format = src_format; + dst_range.offset = 0; dst_range.size = dst_texture->sub_resources[dst_sub_resource_idx].size; if (src_texture == dst_texture && src_sub_resource_idx == dst_sub_resource_idx) @@ -1671,30 +1679,23 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int dst_texture->sub_resources[dst_sub_resource_idx].size, 0, WINED3D_MAP_READ | WINED3D_MAP_WRITE); src_map = dst_map; - src_format = dst_texture->resource.format; - dst_format = src_format; - dst_fmt_flags = dst_texture->resource.format_flags; - src_fmt_flags = dst_fmt_flags; } else { same_sub_resource = FALSE; - dst_format = dst_texture->resource.format; - dst_fmt_flags = dst_texture->resource.format_flags; - if (!(flags & WINED3D_BLT_RAW) && dst_texture->resource.format->id != src_texture->resource.format->id) + if (!(flags & WINED3D_BLT_RAW) && dst_format->id != src_format->id) { if (!(converted_texture = surface_convert_format(src_texture, src_sub_resource_idx, dst_format))) { - FIXME("Cannot convert %s to %s.\n", debug_d3dformat(src_texture->resource.format->id), - debug_d3dformat(dst_texture->resource.format->id)); + FIXME("Cannot convert %s to %s.\n", debug_d3dformat(src_format->id), + debug_d3dformat(dst_format->id)); context_release(context); return WINED3DERR_NOTAVAILABLE; } src_texture = converted_texture; src_sub_resource_idx = 0; + src_format = src_texture->resource.format; } - src_format = src_texture->resource.format; - src_fmt_flags = src_texture->resource.format_flags; map_binding = src_texture->resource.map_binding; texture_level = src_sub_resource_idx % src_texture->level_count; @@ -1715,6 +1716,8 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int dst_map.data = wined3d_context_map_bo_address(context, &dst_data, dst_texture->sub_resources[dst_sub_resource_idx].size, 0, WINED3D_MAP_WRITE); } + src_fmt_flags = src_format->flags[src_texture->resource.gl_type]; + dst_fmt_flags = dst_format->flags[dst_texture->resource.gl_type]; flags &= ~WINED3D_BLT_RAW; bpp = dst_format->byte_count; -- 2.11.0

1 0

[PATCH 4/5] wined3d: Make the adapter responsible for copying between buffer objects.
by Henri Verbeet 24 Sep '19

24 Sep '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 15 +++++++++++++++ dlls/wined3d/adapter_vk.c | 19 +++++++++++++++++++ dlls/wined3d/buffer.c | 5 ++--- dlls/wined3d/directx.c | 14 ++++++++++++++ dlls/wined3d/wined3d_private.h | 11 +++++++++++ 5 files changed, 61 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index e161f7261b5..ed1022030bc 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4611,6 +4611,20 @@ static void adapter_gl_unmap_bo_address(struct wined3d_context *context, const s wined3d_context_gl_unmap_bo_address(context_gl, data, binding, range_count, ranges); } +static void adapter_gl_copy_bo_address(struct wined3d_context *context, + const struct wined3d_bo_address *dst, uint32_t dst_bind_flags, + const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size) +{ + struct wined3d_context_gl *context_gl; + GLenum dst_binding, src_binding; + + context_gl = wined3d_context_gl(context); + dst_binding = wined3d_buffer_gl_binding_from_bind_flags(context_gl->gl_info, dst_bind_flags); + src_binding = wined3d_buffer_gl_binding_from_bind_flags(context_gl->gl_info, src_bind_flags); + + wined3d_context_gl_copy_bo_address(context_gl, dst, dst_binding, src, src_binding, size); +} + static HRESULT adapter_gl_create_swapchain(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain) { @@ -5095,6 +5109,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = adapter_gl_uninit_3d, adapter_gl_map_bo_address, adapter_gl_unmap_bo_address, + adapter_gl_copy_bo_address, adapter_gl_create_swapchain, adapter_gl_destroy_swapchain, adapter_gl_create_buffer, diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 0d83cf7582c..21163a20949 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -490,6 +490,24 @@ static void adapter_vk_unmap_bo_address(struct wined3d_context *context, const s ERR("Unsupported buffer object %#lx.\n", data->buffer_object); } +static void adapter_vk_copy_bo_address(struct wined3d_context *context, + const struct wined3d_bo_address *dst, uint32_t dst_bind_flags, + const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size) +{ + struct wined3d_map_range range; + void *dst_ptr, *src_ptr; + + src_ptr = adapter_vk_map_bo_address(context, src, size, src_bind_flags, WINED3D_MAP_READ); + dst_ptr = adapter_vk_map_bo_address(context, dst, size, dst_bind_flags, WINED3D_MAP_WRITE); + + memcpy(dst_ptr, src_ptr, size); + + range.offset = 0; + range.size = size; + adapter_vk_unmap_bo_address(context, dst, dst_bind_flags, 1, &range); + adapter_vk_unmap_bo_address(context, src, src_bind_flags, 0, NULL); +} + static HRESULT adapter_vk_create_swapchain(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain) { @@ -821,6 +839,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = adapter_vk_uninit_3d, adapter_vk_map_bo_address, adapter_vk_unmap_bo_address, + adapter_vk_copy_bo_address, adapter_vk_create_swapchain, adapter_vk_destroy_swapchain, adapter_vk_create_buffer, diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b8f985e8e4c..18a0d721178 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1188,9 +1188,8 @@ void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_off src.addr += src_offset; context = context_acquire(dst_buffer->resource.device, NULL, 0); - wined3d_context_gl_copy_bo_address(wined3d_context_gl(context), - &dst, wined3d_buffer_gl(dst_buffer)->buffer_type_hint, - &src, wined3d_buffer_gl(src_buffer)->buffer_type_hint, size); + wined3d_context_copy_bo_address(context, &dst, dst_buffer->resource.bind_flags, + &src, src_buffer->resource.bind_flags, size); context_release(context); wined3d_buffer_invalidate_range(dst_buffer, ~dst_location, dst_offset, size); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 24fab8491a1..92d4766bc57 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2372,6 +2372,19 @@ static void adapter_no3d_unmap_bo_address(struct wined3d_context *context, const ERR("Unsupported buffer object %#lx.\n", data->buffer_object); } +static void adapter_no3d_copy_bo_address(struct wined3d_context *context, + const struct wined3d_bo_address *dst, uint32_t dst_bind_flags, + const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size) +{ + if (dst->buffer_object) + ERR("Unsupported dst buffer object %#lx.\n", dst->buffer_object); + if (src->buffer_object) + ERR("Unsupported src buffer object %#lx.\n", src->buffer_object); + if (dst->buffer_object || src->buffer_object) + return; + memcpy(dst->addr, src->addr, size); +} + static HRESULT adapter_no3d_create_swapchain(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain) { @@ -2626,6 +2639,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = adapter_no3d_uninit_3d, adapter_no3d_map_bo_address, adapter_no3d_unmap_bo_address, + adapter_no3d_copy_bo_address, adapter_no3d_create_swapchain, adapter_no3d_destroy_swapchain, adapter_no3d_create_buffer, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 648e3f0dee0..5ce23f85f6b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2821,6 +2821,9 @@ struct wined3d_adapter_ops const struct wined3d_bo_address *data, size_t size, uint32_t bind_flags, uint32_t map_flags); void (*adapter_unmap_bo_address)(struct wined3d_context *context, const struct wined3d_bo_address *data, uint32_t bind_flags, unsigned int range_count, const struct wined3d_map_range *ranges); + void (*adapter_copy_bo_address)(struct wined3d_context *context, + const struct wined3d_bo_address *dst, uint32_t dst_bind_flags, + const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size); HRESULT (*adapter_create_swapchain)(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain); void (*adapter_destroy_swapchain)(struct wined3d_swapchain *swapchain); @@ -5267,6 +5270,14 @@ static inline void wined3d_context_unmap_bo_address(struct wined3d_context *cont context->device->adapter->adapter_ops->adapter_unmap_bo_address(context, data, bind_flags, range_count, ranges); } +static inline void wined3d_context_copy_bo_address(struct wined3d_context *context, + const struct wined3d_bo_address *dst, uint32_t dst_bind_flags, + const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size) +{ + context->device->adapter->adapter_ops->adapter_copy_bo_address(context, + dst, dst_bind_flags, src, src_bind_flags, size); +} + /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL" -- 2.11.0

1 0

[PATCH 3/5] wined3d: Make the adapter responsible for clearing UAVs.
by Henri Verbeet 24 Sep '19

24 Sep '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 10 ++++++++++ dlls/wined3d/adapter_vk.c | 7 +++++++ dlls/wined3d/cs.c | 2 +- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/view.c | 15 +++++++-------- dlls/wined3d/wined3d_private.h | 6 ++++-- 6 files changed, 36 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 03799b6aa84..e161f7261b5 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5073,6 +5073,15 @@ static void adapter_gl_flush_context(struct wined3d_context *context) context_gl->gl_info->gl_ops.gl.p_glFlush(); } +void adapter_gl_clear_uav(struct wined3d_context *context, + struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) +{ + TRACE("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value)); + + wined3d_unordered_access_view_gl_clear_uint(wined3d_unordered_access_view_gl(view), + clear_value, wined3d_context_gl(context)); +} + static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = { adapter_gl_destroy, @@ -5103,6 +5112,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = adapter_gl_create_query, adapter_gl_destroy_query, adapter_gl_flush_context, + adapter_gl_clear_uav, }; static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_gl, uint32_t wined3d_creation_flags) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 91a81b47e63..0d83cf7582c 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -802,6 +802,12 @@ static void adapter_vk_flush_context(struct wined3d_context *context) TRACE("context %p.\n", context); } +void adapter_vk_clear_uav(struct wined3d_context *context, + struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) +{ + FIXME("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value)); +} + static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = { adapter_vk_destroy, @@ -832,6 +838,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = adapter_vk_create_query, adapter_vk_destroy_query, adapter_vk_flush_context, + adapter_vk_clear_uav, }; static unsigned int wined3d_get_wine_vk_version(void) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 044d586b29b..ec17b59d714 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2424,7 +2424,7 @@ static void wined3d_cs_exec_clear_unordered_access_view(struct wined3d_cs *cs, c struct wined3d_context *context; context = context_acquire(cs->device, NULL, 0); - wined3d_unordered_access_view_clear_uint(view, &op->clear_value, context); + cs->device->adapter->adapter_ops->adapter_clear_uav(context, view, &op->clear_value); context_release(context); wined3d_resource_release(view->resource); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2c3d2787bc8..24fab8491a1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2607,6 +2607,12 @@ static void adapter_no3d_flush_context(struct wined3d_context *context) TRACE("context %p.\n", context); } +void adapter_no3d_clear_uav(struct wined3d_context *context, + struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) +{ + ERR("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value)); +} + static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = { adapter_no3d_destroy, @@ -2637,6 +2643,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = adapter_no3d_create_query, adapter_no3d_destroy_query, adapter_no3d_flush_context, + adapter_no3d_clear_uav, }; static void wined3d_adapter_no3d_init_d3d_info(struct wined3d_adapter *adapter, unsigned int wined3d_creation_flags) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 0b4c296f170..f7bb18934fa 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -995,17 +995,16 @@ void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_ wined3d_view_invalidate_location(view->resource, &view->desc, location); } -void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_view *view, - const struct wined3d_uvec4 *clear_value, struct wined3d_context *context) +void wined3d_unordered_access_view_gl_clear_uint(struct wined3d_unordered_access_view_gl *view_gl, + const struct wined3d_uvec4 *clear_value, struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context_gl->gl_info; const struct wined3d_format_gl *format; struct wined3d_buffer_gl *buffer_gl; struct wined3d_resource *resource; unsigned int offset, size; - resource = view->resource; + resource = view_gl->v.resource; if (resource->type != WINED3D_RTYPE_BUFFER) { FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); @@ -1018,7 +1017,7 @@ void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_vi return; } - format = wined3d_format_gl(view->format); + format = wined3d_format_gl(view_gl->v.format); if (format->f.id != WINED3DFMT_R32_UINT && format->f.id != WINED3DFMT_R32_SINT && format->f.id != WINED3DFMT_R32G32B32A32_UINT && format->f.id != WINED3DFMT_R32G32B32A32_SINT) @@ -1028,10 +1027,10 @@ void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_vi } buffer_gl = wined3d_buffer_gl(buffer_from_resource(resource)); - wined3d_buffer_load_location(&buffer_gl->b, context, WINED3D_LOCATION_BUFFER); - wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_BUFFER); + wined3d_buffer_load_location(&buffer_gl->b, &context_gl->c, WINED3D_LOCATION_BUFFER); + wined3d_unordered_access_view_invalidate_location(&view_gl->v, ~WINED3D_LOCATION_BUFFER); - get_buffer_view_range(&buffer_gl->b, &view->desc, &format->f, &offset, &size); + get_buffer_view_range(&buffer_gl->b, &view_gl->v.desc, &format->f, &offset, &size); wined3d_context_gl_bind_bo(context_gl, buffer_gl->buffer_type_hint, buffer_gl->b.buffer_object); GL_EXTCALL(glClearBufferSubData(buffer_gl->buffer_type_hint, format->internal, offset, size, format->format, format->type, clear_value)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 15a272db17d..648e3f0dee0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2851,6 +2851,8 @@ struct wined3d_adapter_ops void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query); void (*adapter_destroy_query)(struct wined3d_query *query); void (*adapter_flush_context)(struct wined3d_context *context); + void (*adapter_clear_uav)(struct wined3d_context *context, + struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value); }; /* The adapter structure */ @@ -4377,8 +4379,6 @@ struct wined3d_unordered_access_view }; void wined3d_unordered_access_view_cleanup(struct wined3d_unordered_access_view *view) DECLSPEC_HIDDEN; -void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_view *view, - const struct wined3d_uvec4 *clear_value, struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_view *view, struct wined3d_buffer *buffer, unsigned int offset, struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_access_view *view, @@ -4399,6 +4399,8 @@ static inline struct wined3d_unordered_access_view_gl *wined3d_unordered_access_ return CONTAINING_RECORD(view, struct wined3d_unordered_access_view_gl, v); } +void wined3d_unordered_access_view_gl_clear_uint(struct wined3d_unordered_access_view_gl *view_gl, + const struct wined3d_uvec4 *clear_value, struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; HRESULT wined3d_unordered_access_view_gl_init(struct wined3d_unordered_access_view_gl *view_gl, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 2/5] wined3d: Merge wined3d_buffer_gl_unmap() and buffer_resource_sub_resource_unmap().
by Henri Verbeet 24 Sep '19

24 Sep '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 91 ++++++++++++++++++++++++--------------------------- 1 file changed, 43 insertions(+), 48 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9566d1c4409..b8f985e8e4c 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1104,64 +1104,71 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc return WINED3D_OK; } -static void wined3d_buffer_gl_unmap(struct wined3d_buffer_gl *buffer_gl) +static HRESULT buffer_resource_sub_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx) { - ULONG i; + struct wined3d_buffer *buffer = buffer_from_resource(resource); + unsigned int range_count = buffer->modified_areas; + struct wined3d_device *device = resource->device; + struct wined3d_context *context; + struct wined3d_bo_address addr; + + TRACE("resource %p, sub_resource_idx %u.\n", resource, sub_resource_idx); - TRACE("buffer_gl %p.\n", buffer_gl); + if (sub_resource_idx) + { + WARN("Invalid sub_resource_idx %u.\n", sub_resource_idx); + return E_INVALIDARG; + } - /* In the case that the number of Unmap calls > the - * number of Map calls, d3d returns always D3D_OK. - * This is also needed to prevent Map from returning garbage on - * the next call (this will happen if the lock_count is < 0). */ - if (!buffer_gl->b.resource.map_count) + if (!resource->map_count) { WARN("Unmap called without a previous map call.\n"); - return; + return WINED3D_OK; } - if (--buffer_gl->b.resource.map_count) + if (--resource->map_count) { - /* Delay loading the buffer until everything is unlocked */ + /* Delay loading the buffer until everything is unmapped. */ TRACE("Ignoring unmap.\n"); - return; + return WINED3D_OK; } - if (buffer_gl->b.map_ptr) + if (!buffer->map_ptr) + return WINED3D_OK; + + context = context_acquire(device, NULL, 0); + + if (buffer->flags & WINED3D_BUFFER_APPLESYNC) { - struct wined3d_device *device = buffer_gl->b.resource.device; - unsigned int range_count = buffer_gl->b.modified_areas; - const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; - struct wined3d_context *context; - struct wined3d_bo_address addr; + const struct wined3d_gl_info *gl_info; + struct wined3d_buffer_gl *buffer_gl; + unsigned int i; - context = context_acquire(device, NULL, 0); + buffer_gl = wined3d_buffer_gl(buffer); context_gl = wined3d_context_gl(context); gl_info = context_gl->gl_info; - if (buffer_gl->b.flags & WINED3D_BUFFER_APPLESYNC) + wined3d_buffer_gl_bind(buffer_gl, context_gl); + for (i = 0; i < range_count; ++i) { - wined3d_buffer_gl_bind(buffer_gl, context_gl); - for (i = 0; i < range_count; ++i) - { - GL_EXTCALL(glFlushMappedBufferRangeAPPLE(buffer_gl->buffer_type_hint, - buffer_gl->b.maps[i].offset, buffer_gl->b.maps[i].size)); - checkGLcall("glFlushMappedBufferRangeAPPLE"); - } - range_count = 0; + GL_EXTCALL(glFlushMappedBufferRangeAPPLE(buffer_gl->buffer_type_hint, + buffer->maps[i].offset, buffer->maps[i].size)); + checkGLcall("glFlushMappedBufferRangeAPPLE"); } + range_count = 0; + } - addr.buffer_object = buffer_gl->b.buffer_object; - addr.addr = 0; - wined3d_context_unmap_bo_address(context, &addr, - buffer_gl->b.resource.bind_flags, range_count, buffer_gl->b.maps); + addr.buffer_object = buffer->buffer_object; + addr.addr = 0; + wined3d_context_unmap_bo_address(context, &addr, resource->bind_flags, range_count, buffer->maps); - context_release(context); + context_release(context); - buffer_clear_dirty_areas(&buffer_gl->b); - buffer_gl->b.map_ptr = NULL; - } + buffer_clear_dirty_areas(buffer); + buffer->map_ptr = NULL; + + return WINED3D_OK; } void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, @@ -1249,18 +1256,6 @@ static void buffer_resource_preload(struct wined3d_resource *resource) context_release(context); } -static HRESULT buffer_resource_sub_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx) -{ - if (sub_resource_idx) - { - WARN("Invalid sub_resource_idx %u.\n", sub_resource_idx); - return E_INVALIDARG; - } - - wined3d_buffer_gl_unmap(wined3d_buffer_gl(buffer_from_resource(resource))); - return WINED3D_OK; -} - static const struct wined3d_resource_ops buffer_resource_ops = { buffer_resource_incref, -- 2.11.0

1 0

[PATCH 1/5] wined3d: Merge wined3d_buffer_gl_map() and buffer_resource_sub_resource_map().
by Henri Verbeet 24 Sep '19

24 Sep '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 129 ++++++++++++++++++++++++-------------------------- 1 file changed, 61 insertions(+), 68 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b8c5117f89e..9566d1c4409 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -964,19 +964,40 @@ struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffe return &buffer->resource; } -static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, - unsigned int offset, unsigned int size, BYTE **data, DWORD flags) +static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, + struct wined3d_map_desc *map_desc, const struct wined3d_box *box, uint32_t flags) { - struct wined3d_device *device = buffer_gl->b.resource.device; + struct wined3d_buffer *buffer = buffer_from_resource(resource); + struct wined3d_device *device = resource->device; struct wined3d_context *context; + unsigned int offset, size; + uint8_t *base; LONG count; - BYTE *base; - TRACE("buffer_gl %p, offset %u, size %u, data %p, flags %#x.\n", buffer_gl, offset, size, data, flags); + TRACE("resource %p, sub_resource_idx %u, map_desc %p, box %s, flags %#x.\n", + resource, sub_resource_idx, map_desc, debug_box(box), flags); + + if (sub_resource_idx) + { + WARN("Invalid sub_resource_idx %u.\n", sub_resource_idx); + return E_INVALIDARG; + } + + if (box) + { + offset = box->left; + size = box->right - box->left; + } + else + { + offset = size = 0; + } + + map_desc->row_pitch = map_desc->slice_pitch = resource->size; - count = ++buffer_gl->b.resource.map_count; + count = ++resource->map_count; - if (buffer_gl->b.buffer_object) + if (buffer->buffer_object) { unsigned int dirty_offset = offset, dirty_size = size; struct wined3d_bo_address addr; @@ -992,36 +1013,36 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, } if (((flags & WINED3D_MAP_WRITE) && !(flags & (WINED3D_MAP_NOOVERWRITE | WINED3D_MAP_DISCARD))) - || (!(flags & WINED3D_MAP_WRITE) && (buffer_gl->b.locations & WINED3D_LOCATION_SYSMEM)) - || buffer_gl->b.flags & WINED3D_BUFFER_PIN_SYSMEM) + || (!(flags & WINED3D_MAP_WRITE) && (buffer->locations & WINED3D_LOCATION_SYSMEM)) + || buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) { - if (!(buffer_gl->b.locations & WINED3D_LOCATION_SYSMEM)) + if (!(buffer->locations & WINED3D_LOCATION_SYSMEM)) { context = context_acquire(device, NULL, 0); - wined3d_buffer_load_location(&buffer_gl->b, context, WINED3D_LOCATION_SYSMEM); + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); context_release(context); } if (flags & WINED3D_MAP_WRITE) - wined3d_buffer_invalidate_range(&buffer_gl->b, WINED3D_LOCATION_BUFFER, dirty_offset, dirty_size); + wined3d_buffer_invalidate_range(buffer, WINED3D_LOCATION_BUFFER, dirty_offset, dirty_size); } else { context = context_acquire(device, NULL, 0); if (flags & WINED3D_MAP_DISCARD) - wined3d_buffer_validate_location(&buffer_gl->b, WINED3D_LOCATION_BUFFER); + wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); else - wined3d_buffer_load_location(&buffer_gl->b, context, WINED3D_LOCATION_BUFFER); + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); if (flags & WINED3D_MAP_WRITE) { - wined3d_buffer_invalidate_location(&buffer_gl->b, WINED3D_LOCATION_SYSMEM); - buffer_invalidate_bo_range(&buffer_gl->b, dirty_offset, dirty_size); + wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_SYSMEM); + buffer_invalidate_bo_range(buffer, dirty_offset, dirty_size); } - if ((flags & WINED3D_MAP_DISCARD) && buffer_gl->b.resource.heap_memory) - wined3d_buffer_evict_sysmem(&buffer_gl->b); + if ((flags & WINED3D_MAP_DISCARD) && resource->heap_memory) + wined3d_buffer_evict_sysmem(buffer); if (count == 1) { @@ -1032,40 +1053,39 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, * buffer. The r600g driver only does this when the buffer is * currently in use, while the proprietary NVIDIA driver * appears to do this unconditionally. */ - if (buffer_gl->b.flags & WINED3D_BUFFER_DISCARD) + if (buffer->flags & WINED3D_BUFFER_DISCARD) flags &= ~WINED3D_MAP_DISCARD; - if (buffer_gl->b.flags & WINED3D_BUFFER_APPLESYNC) - wined3d_buffer_gl_sync_apple(buffer_gl, flags, wined3d_context_gl(context)); + if (buffer->flags & WINED3D_BUFFER_APPLESYNC) + wined3d_buffer_gl_sync_apple(wined3d_buffer_gl(buffer), flags, wined3d_context_gl(context)); - addr.buffer_object = buffer_gl->b.buffer_object; + addr.buffer_object = buffer->buffer_object; addr.addr = 0; - buffer_gl->b.map_ptr = wined3d_context_map_bo_address(context, &addr, - buffer_gl->b.resource.size, buffer_gl->b.resource.bind_flags, flags); + buffer->map_ptr = wined3d_context_map_bo_address(context, + &addr, resource->size, resource->bind_flags, flags); - if (((DWORD_PTR)buffer_gl->b.map_ptr) & (RESOURCE_ALIGNMENT - 1)) + if (((DWORD_PTR)buffer->map_ptr) & (RESOURCE_ALIGNMENT - 1)) { - WARN("Pointer %p is not %u byte aligned.\n", buffer_gl->b.map_ptr, RESOURCE_ALIGNMENT); + WARN("Pointer %p is not %u byte aligned.\n", buffer->map_ptr, RESOURCE_ALIGNMENT); - wined3d_context_unmap_bo_address(context, &addr, buffer_gl->b.resource.bind_flags, 0, NULL); - buffer_gl->b.map_ptr = NULL; + wined3d_context_unmap_bo_address(context, &addr, resource->bind_flags, 0, NULL); + buffer->map_ptr = NULL; - if (buffer_gl->b.resource.usage & WINED3DUSAGE_DYNAMIC) + if (resource->usage & WINED3DUSAGE_DYNAMIC) { - /* The extra copy is more expensive than not using VBOs at - * all on the Nvidia Linux driver, which is the only driver - * that returns unaligned pointers. - */ + /* The extra copy is more expensive than not using VBOs + * at all on the NVIDIA Linux driver, which is the + * only driver that returns unaligned pointers. */ TRACE("Dynamic buffer, dropping VBO.\n"); - wined3d_buffer_drop_bo(&buffer_gl->b); + wined3d_buffer_drop_bo(buffer); } else { TRACE("Falling back to doublebuffered operation.\n"); - wined3d_buffer_load_location(&buffer_gl->b, context, WINED3D_LOCATION_SYSMEM); - buffer_gl->b.flags |= WINED3D_BUFFER_PIN_SYSMEM; + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); + buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; } - TRACE("New pointer is %p.\n", buffer_gl->b.resource.heap_memory); + TRACE("New pointer is %p.\n", resource->heap_memory); } } @@ -1073,14 +1093,13 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, } if (flags & WINED3D_MAP_DISCARD) - buffer_gl->b.flags |= WINED3D_BUFFER_DISCARD; + buffer->flags |= WINED3D_BUFFER_DISCARD; } - base = buffer_gl->b.map_ptr ? buffer_gl->b.map_ptr : buffer_gl->b.resource.heap_memory; - *data = base + offset; + base = buffer->map_ptr ? buffer->map_ptr : resource->heap_memory; + map_desc->data = base + offset; - TRACE("Returning memory at %p (base %p, offset %u).\n", *data, base, offset); - /* TODO: check Flags compatibility with buffer->currentDesc.Usage (see MSDN) */ + TRACE("Returning memory at %p (base %p, offset %u).\n", map_desc->data, base, offset); return WINED3D_OK; } @@ -1230,32 +1249,6 @@ static void buffer_resource_preload(struct wined3d_resource *resource) context_release(context); } -static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, - struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) -{ - struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer_from_resource(resource)); - UINT offset, size; - - if (sub_resource_idx) - { - WARN("Invalid sub_resource_idx %u.\n", sub_resource_idx); - return E_INVALIDARG; - } - - if (box) - { - offset = box->left; - size = box->right - box->left; - } - else - { - offset = size = 0; - } - - map_desc->row_pitch = map_desc->slice_pitch = resource->size; - return wined3d_buffer_gl_map(buffer_gl, offset, size, (BYTE **)&map_desc->data, flags); -} - static HRESULT buffer_resource_sub_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx) { if (sub_resource_idx) -- 2.11.0

1 0

[PATCH 2/2] mountmgr.sys: Always add all user-defined ports.
by Piotr Caban 24 Sep '19

24 Sep '19

Makes it possible to define non-consecutive COM ports. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/mountmgr.sys/device.c | 67 +++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 30 deletions(-)

1 0

[PATCH 1/2] mountmgr.sys: Null terminate serial_search_paths and parallel_search_paths tables.
by Piotr Caban 24 Sep '19

24 Sep '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/mountmgr.sys/device.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)

1 0