August 2019 - Wine-devel - list.winehq.org

[PATCH 1/5] include: Add NTSTATUS severity macros.
by Zebediah Figura 07 Aug '19

07 Aug '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/ntdef.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/ntdef.h b/include/ntdef.h index 83ecffd608..014102ac74 100644 --- a/include/ntdef.h +++ b/include/ntdef.h @@ -43,4 +43,9 @@ typedef enum _WAIT_TYPE { } #endif +#define NT_SUCCESS(status) (((NTSTATUS)(status)) >= 0) +#define NT_INFORMATION(status) ((((NTSTATUS)(status)) & 0xc0000000) == 0x40000000) +#define NT_WARNING(status) ((((NTSTATUS)(status)) & 0xc0000000) == 0x80000000) +#define NT_ERROR(status) ((((NTSTATUS)(status)) & 0xc0000000) == 0xc0000000) + #endif /* _NTDEF_ */ -- 2.22.0

2 8

[PATCH 5/5] wined3d: Download buffer ranges through buffer ops.
by Henri Verbeet 07 Aug '19

07 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 33 ++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index a2908bf41c0..65eff2171e1 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -628,9 +628,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); - const struct wined3d_gl_info *gl_info = context_gl->gl_info; + struct wined3d_map_range range; TRACE("buffer %p, context %p, location %s.\n", buffer, context, wined3d_debug_location(location)); @@ -664,10 +662,10 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, switch (location) { case WINED3D_LOCATION_SYSMEM: - wined3d_buffer_gl_bind(buffer_gl, context_gl); - GL_EXTCALL(glGetBufferSubData(buffer_gl->buffer_type_hint, 0, buffer->resource.size, - buffer->resource.heap_memory)); - checkGLcall("buffer download"); + range.offset = 0; + range.size = buffer->resource.size; + buffer->buffer_ops->buffer_download_ranges(buffer, context, + buffer->resource.heap_memory, 0, 1, &range); break; case WINED3D_LOCATION_BUFFER: @@ -1463,9 +1461,30 @@ static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer *buffer, struc checkGLcall("buffer upload"); } +/* Context activation is done by the caller. */ +static void wined3d_buffer_gl_download_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, + void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) +{ + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); + const struct wined3d_gl_info *gl_info = context_gl->gl_info; + const struct wined3d_map_range *range; + + wined3d_buffer_gl_bind(buffer_gl, context_gl); + + while (range_count--) + { + range = &ranges[range_count]; + GL_EXTCALL(glGetBufferSubData(buffer_gl->buffer_type_hint, + range->offset, range->size, (BYTE *)data + range->offset - data_offset)); + } + checkGLcall("buffer download"); +} + static const struct wined3d_buffer_ops wined3d_buffer_gl_ops = { wined3d_buffer_gl_upload_ranges, + wined3d_buffer_gl_download_ranges, }; HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8dbf255949e..173f1691c86 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4047,6 +4047,8 @@ struct wined3d_buffer_ops { void (*buffer_upload_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges); + void (*buffer_download_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, void *data, + unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges); }; struct wined3d_buffer -- 2.11.0

1 0

[PATCH 4/5] wined3d: Upload buffer ranges through buffer ops.
by Henri Verbeet 07 Aug '19

07 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 59 +++++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 7 +++++ 2 files changed, 40 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2a4725e0341..a2908bf41c0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -535,25 +535,6 @@ ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) return refcount; } -/* Context activation is done by the caller. */ -static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context, - const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) -{ - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - const struct wined3d_map_range *range; - - wined3d_buffer_gl_bind(buffer_gl, context_gl); - - while (range_count--) - { - range = &ranges[range_count]; - GL_EXTCALL(glBufferSubData(buffer_gl->buffer_type_hint, - range->offset, range->size, (BYTE *)data + range->offset - data_offset)); - } - checkGLcall("glBufferSubData"); -} - static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined3d_context *context) { unsigned int i, j, range_idx, start, end, vertex_count; @@ -605,8 +586,8 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined } } - wined3d_buffer_gl_upload_ranges(wined3d_buffer_gl(buffer), - context, data, 0, buffer->modified_areas, buffer->maps); + buffer->buffer_ops->buffer_upload_ranges(buffer, context, + data, 0, buffer->modified_areas, buffer->maps); heap_free(data); } @@ -691,8 +672,8 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, case WINED3D_LOCATION_BUFFER: if (!buffer->conversion_map) - wined3d_buffer_gl_upload_ranges(buffer_gl, context, buffer->resource.heap_memory, - 0, buffer->modified_areas, buffer->maps); + buffer->buffer_ops->buffer_upload_ranges(buffer, context, + buffer->resource.heap_memory, 0, buffer->modified_areas, buffer->maps); else buffer_conversion_upload(buffer, context); break; @@ -1250,7 +1231,7 @@ void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_co range.size = buffer->resource.size; } - wined3d_buffer_gl_upload_ranges(wined3d_buffer_gl(buffer), context, data, range.offset, 1, &range); + buffer->buffer_ops->buffer_upload_ranges(buffer, context, data, range.offset, 1, &range); } static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, @@ -1366,7 +1347,7 @@ static GLenum buffer_type_hint_from_bind_flags(const struct wined3d_gl_info *gl_ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, - void *parent, const struct wined3d_parent_ops *parent_ops) + void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_buffer_ops *buffer_ops) { const struct wined3d_format *format = wined3d_get_format(device->adapter, WINED3DFMT_UNKNOWN, desc->bind_flags); const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; @@ -1399,6 +1380,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d WARN("Failed to initialize resource, hr %#x.\n", hr); return hr; } + buffer->buffer_ops = buffer_ops; buffer->structure_byte_stride = desc->structure_byte_stride; buffer->locations = data ? WINED3D_LOCATION_DISCARDED : WINED3D_LOCATION_SYSMEM; @@ -1461,6 +1443,31 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d return WINED3D_OK; } +/* Context activation is done by the caller. */ +static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, + const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) +{ + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); + const struct wined3d_gl_info *gl_info = context_gl->gl_info; + const struct wined3d_map_range *range; + + wined3d_buffer_gl_bind(buffer_gl, context_gl); + + while (range_count--) + { + range = &ranges[range_count]; + GL_EXTCALL(glBufferSubData(buffer_gl->buffer_type_hint, + range->offset, range->size, (BYTE *)data + range->offset - data_offset)); + } + checkGLcall("buffer upload"); +} + +static const struct wined3d_buffer_ops wined3d_buffer_gl_ops = +{ + wined3d_buffer_gl_upload_ranges, +}; + HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer) @@ -1480,7 +1487,7 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct object->buffer_type_hint = buffer_type_hint_from_bind_flags(gl_info, desc->bind_flags); - if (FAILED(hr = wined3d_buffer_init(&object->b, device, desc, data, parent, parent_ops))) + if (FAILED(hr = wined3d_buffer_init(&object->b, device, desc, data, parent, parent_ops, &wined3d_buffer_gl_ops))) { WARN("Failed to initialize buffer, hr %#x.\n", hr); heap_free(object); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 00ed6dc7c58..8dbf255949e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4043,9 +4043,16 @@ struct wined3d_map_range UINT size; }; +struct wined3d_buffer_ops +{ + void (*buffer_upload_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, + unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges); +}; + struct wined3d_buffer { struct wined3d_resource resource; + const struct wined3d_buffer_ops *buffer_ops; unsigned int structure_byte_stride; DWORD flags; -- 2.11.0

1 0

[PATCH 3/5] wined3d: Setup and tear down the shader backend for the Vulkan adapter.
by Henri Verbeet 07 Aug '19

07 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 50f173f6314..cdb5c977f5d 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -413,9 +413,18 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) return hr; } + if (FAILED(hr = device->shader_backend->shader_alloc_private(device, + device->adapter->vertex_pipe, device->adapter->fragment_pipe))) + { + ERR("Failed to allocate shader private data, hr %#x.\n", hr); + wined3d_context_vk_cleanup(context_vk); + return hr; + } + if (!device_context_add(device, &context_vk->c)) { ERR("Failed to add the newly created context to the context list.\n"); + device->shader_backend->shader_free_private(device, NULL); wined3d_context_vk_cleanup(context_vk); return E_FAIL; } @@ -426,6 +435,7 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) { ERR("Failed to create CPU blitter.\n"); device_context_remove(device, &context_vk->c); + device->shader_backend->shader_free_private(device, NULL); wined3d_context_vk_cleanup(context_vk); return E_FAIL; } @@ -436,13 +446,20 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) static void adapter_vk_uninit_3d(struct wined3d_device *device) { struct wined3d_context_vk *context_vk; + struct wined3d_shader *shader; TRACE("device %p.\n", device); + LIST_FOR_EACH_ENTRY(shader, &device->shaders, struct wined3d_shader, shader_list_entry) + { + device->shader_backend->shader_destroy(shader); + } + device->blitter->ops->blitter_destroy(device->blitter, NULL); context_vk = &wined3d_device_vk(device)->context_vk; device_context_remove(device, &context_vk->c); + device->shader_backend->shader_free_private(device, NULL); wined3d_context_vk_cleanup(context_vk); } -- 2.11.0

1 0

[PATCH 2/5] wined3d: Introduce a structure for Vulkan context information.
by Henri Verbeet 07 Aug '19

07 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 35 +++++++++-------------------------- dlls/wined3d/context.c | 9 +++++++-- dlls/wined3d/wined3d_private.h | 25 ++++++++++++++++++++++++- 3 files changed, 40 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index a3098475595..50f173f6314 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -24,23 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); -struct wined3d_device_vk -{ - struct wined3d_device d; - - struct wined3d_context context_vk; - - VkDevice vk_device; - VkQueue vk_queue; - - struct wined3d_vk_info vk_info; -}; - -static inline struct wined3d_device_vk *wined3d_device_vk(struct wined3d_device *device) -{ - return CONTAINING_RECORD(device, struct wined3d_device_vk, d); -} - static inline const struct wined3d_adapter_vk *wined3d_adapter_vk_const(const struct wined3d_adapter *adapter) { return CONTAINING_RECORD(adapter, struct wined3d_adapter_vk, a); @@ -300,7 +283,7 @@ struct wined3d_context *adapter_vk_acquire_context(struct wined3d_device *device if (!device->context_count) return NULL; - return &wined3d_device_vk(device)->context_vk; + return &wined3d_device_vk(device)->context_vk.c; } void adapter_vk_release_context(struct wined3d_context *context) @@ -416,8 +399,8 @@ static BOOL adapter_vk_check_format(const struct wined3d_adapter *adapter, static HRESULT adapter_vk_init_3d(struct wined3d_device *device) { + struct wined3d_context_vk *context_vk; struct wined3d_device_vk *device_vk; - struct wined3d_context *context_vk; HRESULT hr; TRACE("device %p.\n", device); @@ -430,10 +413,10 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) return hr; } - if (!device_context_add(device, context_vk)) + if (!device_context_add(device, &context_vk->c)) { ERR("Failed to add the newly created context to the context list.\n"); - wined3d_context_cleanup(context_vk); + wined3d_context_vk_cleanup(context_vk); return E_FAIL; } @@ -442,8 +425,8 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) if (!(device_vk->d.blitter = wined3d_cpu_blitter_create())) { ERR("Failed to create CPU blitter.\n"); - device_context_remove(device, context_vk); - wined3d_context_cleanup(context_vk); + device_context_remove(device, &context_vk->c); + wined3d_context_vk_cleanup(context_vk); return E_FAIL; } @@ -452,15 +435,15 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) static void adapter_vk_uninit_3d(struct wined3d_device *device) { - struct wined3d_context *context_vk; + struct wined3d_context_vk *context_vk; TRACE("device %p.\n", device); device->blitter->ops->blitter_destroy(device->blitter, NULL); context_vk = &wined3d_device_vk(device)->context_vk; - device_context_remove(device, context_vk); - wined3d_context_cleanup(context_vk); + device_context_remove(device, &context_vk->c); + wined3d_context_vk_cleanup(context_vk); } static HRESULT adapter_vk_create_swapchain(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2509d90fd4d..8a6cd5c889a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1493,6 +1493,11 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) wined3d_context_cleanup(&context_gl->c); } +void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) +{ + wined3d_context_cleanup(&context_vk->c); +} + DWORD context_get_tls_idx(void) { return wined3d_context_tls_idx; @@ -2295,11 +2300,11 @@ fail: return E_FAIL; } -HRESULT wined3d_context_vk_init(struct wined3d_context *context_vk, struct wined3d_swapchain *swapchain) +HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) { TRACE("context_vk %p, swapchain %p.\n", context_vk, swapchain); - wined3d_context_init(context_vk, swapchain); + wined3d_context_init(&context_vk->c, swapchain); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e63d5e65c2f..00ed6dc7c58 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2127,7 +2127,13 @@ void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) DECLSPEC_HIDDEN; -HRESULT wined3d_context_vk_init(struct wined3d_context *context_vk, +struct wined3d_context_vk +{ + struct wined3d_context c; +}; + +void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; typedef void (*APPLYSTATEFUNC)(struct wined3d_context *ctx, const struct wined3d_state *state, DWORD state_id); @@ -3287,6 +3293,23 @@ static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_gl, d); } +struct wined3d_device_vk +{ + struct wined3d_device d; + + struct wined3d_context_vk context_vk; + + VkDevice vk_device; + VkQueue vk_queue; + + struct wined3d_vk_info vk_info; +}; + +static inline struct wined3d_device_vk *wined3d_device_vk(struct wined3d_device *device) +{ + return CONTAINING_RECORD(device, struct wined3d_device_vk, d); +} + static inline BOOL isStateDirty(const struct wined3d_context *context, unsigned int state_id) { unsigned int idx = state_id / (sizeof(*context->dirty_graphics_states) * CHAR_BIT); -- 2.11.0

1 0

[PATCH 1/5] wined3d: Make the adapter responsible for swapchain creation and destruction.
by Henri Verbeet 07 Aug '19

07 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 33 ++++++++++++++++ dlls/wined3d/adapter_vk.c | 33 ++++++++++++++++ dlls/wined3d/directx.c | 33 ++++++++++++++++ dlls/wined3d/swapchain.c | 90 +++++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 16 ++++++++ 5 files changed, 173 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 86e347d8562..e60437d2812 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4649,6 +4649,37 @@ static void adapter_gl_uninit_3d(struct wined3d_device *device) wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); } +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) +{ + struct wined3d_swapchain *swapchain_gl; + HRESULT hr; + + TRACE("device %p, desc %p, parent %p, parent_ops %p, swapchain %p.\n", + device, desc, parent, parent_ops, swapchain); + + if (!(swapchain_gl = heap_alloc_zero(sizeof(*swapchain_gl)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = wined3d_swapchain_gl_init(swapchain_gl, device, desc, parent, parent_ops))) + { + WARN("Failed to initialise swapchain, hr %#x.\n", hr); + heap_free(swapchain_gl); + return hr; + } + + TRACE("Created swapchain %p.\n", swapchain_gl); + *swapchain = swapchain_gl; + + return hr; +} + +static void adapter_gl_destroy_swapchain(struct wined3d_swapchain *swapchain) +{ + wined3d_swapchain_cleanup(swapchain); + heap_free(swapchain); +} + static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = { adapter_gl_destroy, @@ -4660,6 +4691,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = adapter_gl_check_format, adapter_gl_init_3d, adapter_gl_uninit_3d, + adapter_gl_create_swapchain, + adapter_gl_destroy_swapchain, }; static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 0dc64580702..a3098475595 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -463,6 +463,37 @@ static void adapter_vk_uninit_3d(struct wined3d_device *device) wined3d_context_cleanup(context_vk); } +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) +{ + struct wined3d_swapchain *swapchain_vk; + HRESULT hr; + + TRACE("device %p, desc %p, parent %p, parent_ops %p, swapchain %p.\n", + device, desc, parent, parent_ops, swapchain); + + if (!(swapchain_vk = heap_alloc_zero(sizeof(*swapchain_vk)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = wined3d_swapchain_vk_init(swapchain_vk, device, desc, parent, parent_ops))) + { + WARN("Failed to initialise swapchain, hr %#x.\n", hr); + heap_free(swapchain_vk); + return hr; + } + + TRACE("Created swapchain %p.\n", swapchain_vk); + *swapchain = swapchain_vk; + + return hr; +} + +static void adapter_vk_destroy_swapchain(struct wined3d_swapchain *swapchain) +{ + wined3d_swapchain_cleanup(swapchain); + heap_free(swapchain); +} + static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = { adapter_vk_destroy, @@ -474,6 +505,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = adapter_vk_check_format, adapter_vk_init_3d, adapter_vk_uninit_3d, + adapter_vk_create_swapchain, + adapter_vk_destroy_swapchain, }; static unsigned int wined3d_get_wine_vk_version(void) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 967348dd00e..d175842e4c0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2354,6 +2354,37 @@ static void adapter_no3d_uninit_3d(struct wined3d_device *device) wined3d_context_cleanup(context_no3d); } +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) +{ + struct wined3d_swapchain *swapchain_no3d; + HRESULT hr; + + TRACE("device %p, desc %p, parent %p, parent_ops %p, swapchain %p.\n", + device, desc, parent, parent_ops, swapchain); + + if (!(swapchain_no3d = heap_alloc_zero(sizeof(*swapchain_no3d)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = wined3d_swapchain_no3d_init(swapchain_no3d, device, desc, parent, parent_ops))) + { + WARN("Failed to initialise swapchain, hr %#x.\n", hr); + heap_free(swapchain_no3d); + return hr; + } + + TRACE("Created swapchain %p.\n", swapchain_no3d); + *swapchain = swapchain_no3d; + + return hr; +} + +static void adapter_no3d_destroy_swapchain(struct wined3d_swapchain *swapchain) +{ + wined3d_swapchain_cleanup(swapchain); + heap_free(swapchain); +} + static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = { adapter_no3d_destroy, @@ -2365,6 +2396,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = adapter_no3d_check_format, adapter_no3d_init_3d, adapter_no3d_uninit_3d, + adapter_no3d_create_swapchain, + adapter_no3d_destroy_swapchain, }; static void wined3d_adapter_no3d_init_d3d_info(struct wined3d_adapter *adapter, unsigned int wined3d_creation_flags) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 43907755b62..4d277c7a5e2 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -32,7 +32,7 @@ static void wined3d_swapchain_destroy_object(void *object) swapchain_destroy_contexts(object); } -static void swapchain_cleanup(struct wined3d_swapchain *swapchain) +void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) { HRESULT hr; UINT i; @@ -131,12 +131,10 @@ ULONG CDECL wined3d_swapchain_decref(struct wined3d_swapchain *swapchain) wined3d_device_uninit_3d(device); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); - swapchain_cleanup(swapchain); swapchain->parent_ops->wined3d_object_destroyed(swapchain->parent); + swapchain->device->adapter->adapter_ops->adapter_destroy_swapchain(swapchain); wined3d_mutex_unlock(); - - heap_free(swapchain); } return refcount; @@ -578,7 +576,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, context_release(context); } -static void swapchain_gl_frontbuffer_updated(struct wined3d_swapchain *swapchain) +static void swapchain_frontbuffer_updated(struct wined3d_swapchain *swapchain) { struct wined3d_texture *front_buffer = swapchain->front_buffer; struct wined3d_context *context; @@ -592,7 +590,19 @@ static void swapchain_gl_frontbuffer_updated(struct wined3d_swapchain *swapchain static const struct wined3d_swapchain_ops swapchain_gl_ops = { swapchain_gl_present, - swapchain_gl_frontbuffer_updated, + swapchain_frontbuffer_updated, +}; + +static void swapchain_vk_present(struct wined3d_swapchain *swapchain, const RECT *src_rect, + const RECT *dst_rect, unsigned int swap_interval, uint32_t flags) +{ + FIXME("Not implemented.\n"); +} + +static const struct wined3d_swapchain_ops swapchain_vk_ops = +{ + swapchain_vk_present, + swapchain_frontbuffer_updated, }; static void swapchain_gdi_frontbuffer_updated(struct wined3d_swapchain *swapchain) @@ -684,7 +694,7 @@ static void swapchain_gdi_present(struct wined3d_swapchain *swapchain, swapchain_gdi_frontbuffer_updated(swapchain); } -static const struct wined3d_swapchain_ops swapchain_gdi_ops = +static const struct wined3d_swapchain_ops swapchain_no3d_ops = { swapchain_gdi_present, swapchain_gdi_frontbuffer_updated, @@ -783,8 +793,9 @@ static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *stat return hr; } -static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3d_device *device, - struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) +static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struct wined3d_device *device, + struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, + const struct wined3d_swapchain_ops *swapchain_ops) { const struct wined3d_adapter *adapter = device->adapter; struct wined3d_resource_desc texture_desc; @@ -795,6 +806,8 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 HWND window; HRESULT hr; + wined3d_mutex_lock(); + if (desc->backbuffer_count > 1) { FIXME("The application requested more than one back buffer, this is not properly supported.\n" @@ -806,15 +819,11 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 && desc->swap_effect != WINED3D_SWAP_EFFECT_COPY) FIXME("Unimplemented swap effect %#x.\n", desc->swap_effect); - if (device->wined3d->flags & WINED3D_NO3D) - swapchain->swapchain_ops = &swapchain_gdi_ops; - else - swapchain->swapchain_ops = &swapchain_gl_ops; - window = desc->device_window ? desc->device_window : device->create_parms.focus_window; if (FAILED(hr = wined3d_swapchain_state_init(&swapchain->state, desc, window, device->wined3d, adapter->ordinal))) return hr; + swapchain->swapchain_ops = swapchain_ops; swapchain->device = device; swapchain->parent = parent; swapchain->parent_ops = parent_ops; @@ -973,6 +982,8 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 wined3d_swapchain_get_gamma_ramp(swapchain, &swapchain->orig_gamma); + wined3d_mutex_unlock(); + return WINED3D_OK; err: @@ -1006,30 +1017,47 @@ err: wined3d_texture_decref(swapchain->front_buffer); } + wined3d_mutex_unlock(); + return hr; } +HRESULT wined3d_swapchain_no3d_init(struct wined3d_swapchain *swapchain_no3d, struct wined3d_device *device, + struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) +{ + TRACE("swapchain_no3d %p, device %p, desc %p, parent %p, parent_ops %p.\n", + swapchain_no3d, device, desc, parent, parent_ops); + + return wined3d_swapchain_init(swapchain_no3d, device, desc, parent, parent_ops, &swapchain_no3d_ops); +} + +HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain *swapchain_gl, struct wined3d_device *device, + struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) +{ + TRACE("swapchain_gl %p, device %p, desc %p, parent %p, parent_ops %p.\n", + swapchain_gl, device, desc, parent, parent_ops); + + return wined3d_swapchain_init(swapchain_gl, device, desc, parent, parent_ops, &swapchain_gl_ops); +} + +HRESULT wined3d_swapchain_vk_init(struct wined3d_swapchain *swapchain_vk, struct wined3d_device *device, + struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) +{ + TRACE("swapchain_vk %p, device %p, desc %p, parent %p, parent_ops %p.\n", + swapchain_vk, device, desc, parent, parent_ops); + + return wined3d_swapchain_init(swapchain_vk, device, desc, parent, parent_ops, &swapchain_vk_ops); +} + HRESULT CDECL wined3d_swapchain_create(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain) { struct wined3d_swapchain *object; HRESULT hr; - TRACE("device %p, desc %p, parent %p, parent_ops %p, swapchain %p.\n", - device, desc, parent, parent_ops, swapchain); - - if (!(object = heap_alloc_zero(sizeof(*object)))) - return E_OUTOFMEMORY; - - wined3d_mutex_lock(); - hr = swapchain_init(object, device, desc, parent, parent_ops); - wined3d_mutex_unlock(); - if (FAILED(hr)) - { - WARN("Failed to initialize swapchain, hr %#x.\n", hr); - heap_free(object); + if (FAILED(hr = device->adapter->adapter_ops->adapter_create_swapchain(device, + desc, parent, parent_ops, &object))) return hr; - } if (desc->flags & WINED3D_SWAPCHAIN_HOOK) wined3d_hook_swapchain(object); @@ -1040,18 +1068,16 @@ HRESULT CDECL wined3d_swapchain_create(struct wined3d_device *device, struct win if (FAILED(hr = wined3d_device_set_implicit_swapchain(device, object))) { wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); - swapchain_cleanup(object); + device->adapter->adapter_ops->adapter_destroy_swapchain(object); wined3d_mutex_unlock(); - heap_free(swapchain); return hr; } wined3d_mutex_unlock(); } - TRACE("Created swapchain %p.\n", object); *swapchain = object; - return WINED3D_OK; + return hr; } static struct wined3d_context *swapchain_create_context(struct wined3d_swapchain *swapchain) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c628b2fa80d..e63d5e65c2f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2775,6 +2775,9 @@ struct wined3d_adapter_ops const struct wined3d_format *ds_format); HRESULT (*adapter_init_3d)(struct wined3d_device *device); void (*adapter_uninit_3d)(struct wined3d_device *device); + 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); }; /* The adapter structure */ @@ -4233,6 +4236,7 @@ struct wined3d_swapchain }; void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) DECLSPEC_HIDDEN; +void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; @@ -4240,6 +4244,18 @@ void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) DECLSPE void swapchain_set_max_frame_latency(struct wined3d_swapchain *swapchain, const struct wined3d_device *device) DECLSPEC_HIDDEN; +HRESULT wined3d_swapchain_no3d_init(struct wined3d_swapchain *swapchain_no3d, + struct wined3d_device *device, struct wined3d_swapchain_desc *desc, + void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + +HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain *swapchain_gl, + struct wined3d_device *device, struct wined3d_swapchain_desc *desc, + void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + +HRESULT wined3d_swapchain_vk_init(struct wined3d_swapchain *swapchain_vk, + struct wined3d_device *device, struct wined3d_swapchain_desc *desc, + void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + /***************************************************************************** * Utility function prototypes */ -- 2.11.0

1 0

[PATCH] xinput: Fix vibration capabilities
by Alexey Prokhin 07 Aug '19

07 Aug '19

wLeftMotorSpeed and wRightMotorSpeed returned by XInputGetCapabilities are supposed to be resolutions rather than current motor speeds. This fixes rumble in Far Cry 5. Signed-off-by: Alexey Prokhin <alexey(a)prokhin.ru> --- I have two concernes about the patch: 1. I have no idea how to write a test for it. The only thing I can think of is to dump Vibration the same way Gamepad is dumped in test_get_capabilities(). I can do it in the next revision, if you wish. 2. The patch is a bit incorrect for xinput9_1_0. XInputGetCapabilities from the library returns wLeftMotorSpeed=wRightMotorSpeed=1. It is possible to define XINPUT_VER in Makefile.in. But should I bother with this? Far Cry 5, my testing target, does not seem to care if the returned values are 1 or 255. The rumble starts working either way. --- dlls/xinput1_3/hid.c | 10 +++++++--- dlls/xinput1_3/xinput_private.h | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index aa46f35239..38c93beb80 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -173,7 +173,11 @@ static BOOL VerifyGamepad(PHIDP_PREPARSED_DATA ppd, XINPUT_CAPABILITIES *xinput_ value_caps_count = caps->NumberOutputValueCaps; if (value_caps_count > 0) + { xinput_caps->Flags |= XINPUT_CAPS_FFB_SUPPORTED; + xinput_caps->Vibration.wLeftMotorSpeed = 255; + xinput_caps->Vibration.wRightMotorSpeed = 255; + } return TRUE; } @@ -456,8 +460,8 @@ DWORD HID_set_state(xinput_controller* device, XINPUT_VIBRATION* state) if (device->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) { - device->caps.Vibration.wLeftMotorSpeed = state->wLeftMotorSpeed; - device->caps.Vibration.wRightMotorSpeed = state->wRightMotorSpeed; + device->vibration.wLeftMotorSpeed = state->wLeftMotorSpeed; + device->vibration.wRightMotorSpeed = state->wRightMotorSpeed; if (private->enabled) { @@ -498,7 +502,7 @@ void HID_enable(xinput_controller* device, BOOL enable) } else if (!private->enabled && enable) { - HID_set_state(device, &device->caps.Vibration); + HID_set_state(device, &device->vibration); } LeaveCriticalSection(&private->crit); } diff --git a/dlls/xinput1_3/xinput_private.h b/dlls/xinput1_3/xinput_private.h index 00888f4518..d6e0e9614e 100644 --- a/dlls/xinput1_3/xinput_private.h +++ b/dlls/xinput1_3/xinput_private.h @@ -23,6 +23,7 @@ typedef struct _xinput_controller XINPUT_CAPABILITIES caps; void *platform_private; XINPUT_STATE state; + XINPUT_VIBRATION vibration; } xinput_controller; -- 2.20.1 (Apple Git-117)

2 1

[PATCH 2/2] [v2] shell32: Fix return value for DragQueryPoint.
by Akihiro Sagawa 07 Aug '19

07 Aug '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47514 In v2, rebased. Not compile tested about winemac.drv part. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/shell32/shellole.c | 2 +- dlls/shell32/tests/shellole.c | 2 +- dlls/winemac.drv/dragdrop.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

2 1

[PATCH 1/2] [v2] shell32/tests: Add DragQueryPoint tests.
by Akihiro Sagawa 07 Aug '19

07 Aug '19

In v2, test both fNC cases and set values explicitly. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/shell32/tests/shellole.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-)

2 1

[PATCH] ddraw: implement Pick() and GetPickRecords().
by MattKC 07 Aug '19

07 Aug '19

3 5