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

[PATCH 05/10] wined3d: Make the adapter responsible for unordered access view creation and destruction.
by Henri Verbeet 11 Aug '19

11 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 67 ++++++++++++++++++++++++++++++--- dlls/wined3d/adapter_vk.c | 48 ++++++++++++++++++++++++ dlls/wined3d/directx.c | 17 +++++++++ dlls/wined3d/view.c | 84 ++++++++++++++++++------------------------ dlls/wined3d/wined3d_private.h | 24 ++++++++++++ 5 files changed, 186 insertions(+), 54 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index cc7bc57ea3d..958983315cb 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4771,6 +4771,7 @@ struct wined3d_view_gl_destroy_ctx { struct wined3d_device *device; const struct wined3d_gl_view *gl_view; + GLuint counter_bo; void *object; struct wined3d_view_gl_destroy_ctx *free; }; @@ -4784,12 +4785,17 @@ static void wined3d_view_gl_destroy_object(void *object) device = ctx->device; - if (ctx->gl_view->name) + if (ctx->gl_view->name || ctx->counter_bo) { context = context_acquire(device, NULL, 0); gl_info = wined3d_context_gl(context)->gl_info; - context_gl_resource_released(device, ctx->gl_view->name, FALSE); - gl_info->gl_ops.gl.p_glDeleteTextures(1, &ctx->gl_view->name); + if (ctx->gl_view->name) + { + context_gl_resource_released(device, ctx->gl_view->name, FALSE); + gl_info->gl_ops.gl.p_glDeleteTextures(1, &ctx->gl_view->name); + } + if (ctx->counter_bo) + GL_EXTCALL(glDeleteBuffers(1, &ctx->counter_bo)); checkGLcall("delete resources"); context_release(context); } @@ -4799,7 +4805,7 @@ static void wined3d_view_gl_destroy_object(void *object) } static void wined3d_view_gl_destroy(struct wined3d_device *device, - const struct wined3d_gl_view *gl_view, void *object) + const struct wined3d_gl_view *gl_view, GLuint counter_bo, void *object) { struct wined3d_view_gl_destroy_ctx *ctx, c; @@ -4807,6 +4813,7 @@ static void wined3d_view_gl_destroy(struct wined3d_device *device, ctx = &c; ctx->device = device; ctx->gl_view = gl_view; + ctx->counter_bo = counter_bo; ctx->object = object; ctx->free = ctx != &c ? ctx : NULL; @@ -4830,7 +4837,7 @@ static void adapter_gl_destroy_rendertarget_view(struct wined3d_rendertarget_vie if (swapchain_count) wined3d_device_incref(device); wined3d_rendertarget_view_cleanup(&view_gl->v); - wined3d_view_gl_destroy(device, &view_gl->gl_view, view_gl); + wined3d_view_gl_destroy(device, &view_gl->gl_view, 0, view_gl); if (swapchain_count) wined3d_device_decref(device); } @@ -4876,7 +4883,53 @@ static void adapter_gl_destroy_shader_resource_view(struct wined3d_shader_resour if (swapchain_count) wined3d_device_incref(device); wined3d_shader_resource_view_cleanup(&view_gl->v); - wined3d_view_gl_destroy(device, &view_gl->gl_view, view_gl); + wined3d_view_gl_destroy(device, &view_gl->gl_view, 0, view_gl); + if (swapchain_count) + wined3d_device_decref(device); +} + +static HRESULT adapter_gl_create_unordered_access_view(const struct wined3d_view_desc *desc, + struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_unordered_access_view **view) +{ + struct wined3d_unordered_access_view_gl *view_gl; + HRESULT hr; + + TRACE("desc %s, resource %p, parent %p, parent_ops %p, view %p.\n", + wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops, view); + + if (!(view_gl = heap_alloc_zero(sizeof(*view_gl)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = wined3d_unordered_access_view_gl_init(view_gl, desc, resource, parent, parent_ops))) + { + WARN("Failed to initialise view, hr %#x.\n", hr); + heap_free(view_gl); + return hr; + } + + TRACE("Created unordered access view %p.\n", view_gl); + *view = &view_gl->v; + + return hr; +} + +static void adapter_gl_destroy_unordered_access_view(struct wined3d_unordered_access_view *view) +{ + struct wined3d_unordered_access_view_gl *view_gl = wined3d_unordered_access_view_gl(view); + struct wined3d_device *device = view_gl->v.resource->device; + unsigned int swapchain_count = device->swapchain_count; + + TRACE("view_gl %p.\n", view_gl); + + /* Take a reference to the device, in case releasing the view's resource + * would cause the device to be destroyed. However, swapchain resources + * don't take a reference to the device, and we wouldn't want to increment + * the refcount on a device that's in the process of being destroyed. */ + if (swapchain_count) + wined3d_device_incref(device); + wined3d_unordered_access_view_cleanup(&view_gl->v); + wined3d_view_gl_destroy(device, &view_gl->gl_view, view_gl->counter_bo, view_gl); if (swapchain_count) wined3d_device_decref(device); } @@ -4900,6 +4953,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = adapter_gl_destroy_rendertarget_view, adapter_gl_create_shader_resource_view, adapter_gl_destroy_shader_resource_view, + adapter_gl_create_unordered_access_view, + adapter_gl_destroy_unordered_access_view, }; 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 f739ebfaac4..19111543ca1 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -632,6 +632,52 @@ static void adapter_vk_destroy_shader_resource_view(struct wined3d_shader_resour wined3d_device_decref(device); } +static HRESULT adapter_vk_create_unordered_access_view(const struct wined3d_view_desc *desc, + struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_unordered_access_view **view) +{ + struct wined3d_unordered_access_view_vk *view_vk; + HRESULT hr; + + TRACE("desc %s, resource %p, parent %p, parent_ops %p, view %p.\n", + wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops, view); + + if (!(view_vk = heap_alloc_zero(sizeof(*view_vk)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = wined3d_unordered_access_view_vk_init(view_vk, desc, resource, parent, parent_ops))) + { + WARN("Failed to initialise view, hr %#x.\n", hr); + heap_free(view_vk); + return hr; + } + + TRACE("Created unordered access view %p.\n", view_vk); + *view = &view_vk->v; + + return hr; +} + +static void adapter_vk_destroy_unordered_access_view(struct wined3d_unordered_access_view *view) +{ + struct wined3d_unordered_access_view_vk *view_vk = wined3d_unordered_access_view_vk(view); + struct wined3d_device *device = view_vk->v.resource->device; + unsigned int swapchain_count = device->swapchain_count; + + TRACE("view_vk %p.\n", view_vk); + + /* Take a reference to the device, in case releasing the view's resource + * would cause the device to be destroyed. However, swapchain resources + * don't take a reference to the device, and we wouldn't want to increment + * the refcount on a device that's in the process of being destroyed. */ + if (swapchain_count) + wined3d_device_incref(device); + wined3d_unordered_access_view_cleanup(&view_vk->v); + wined3d_cs_destroy_object(device->cs, heap_free, view_vk); + if (swapchain_count) + wined3d_device_decref(device); +} + static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = { adapter_vk_destroy, @@ -651,6 +697,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = adapter_vk_destroy_rendertarget_view, adapter_vk_create_shader_resource_view, adapter_vk_destroy_shader_resource_view, + adapter_vk_create_unordered_access_view, + adapter_vk_destroy_unordered_access_view, }; static unsigned int wined3d_get_wine_vk_version(void) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9e31c0415c5..c886ea155c5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2490,6 +2490,21 @@ static void adapter_no3d_destroy_shader_resource_view(struct wined3d_shader_reso TRACE("view %p.\n", view); } +static HRESULT adapter_no3d_create_unordered_access_view(const struct wined3d_view_desc *desc, + struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_unordered_access_view **view) +{ + TRACE("desc %s, resource %p, parent %p, parent_ops %p, view %p.\n", + wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops, view); + + return E_NOTIMPL; +} + +static void adapter_no3d_destroy_unordered_access_view(struct wined3d_unordered_access_view *view) +{ + TRACE("view %p.\n", view); +} + static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = { adapter_no3d_destroy, @@ -2509,6 +2524,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = adapter_no3d_destroy_rendertarget_view, adapter_no3d_create_shader_resource_view, adapter_no3d_destroy_shader_resource_view, + adapter_no3d_create_unordered_access_view, + adapter_no3d_destroy_unordered_access_view, }; 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 ff8043c8682..43b4ac58f17 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -963,26 +963,12 @@ ULONG CDECL wined3d_unordered_access_view_incref(struct wined3d_unordered_access return refcount; } -static void wined3d_unordered_access_view_gl_destroy_object(void *object) +void wined3d_unordered_access_view_cleanup(struct wined3d_unordered_access_view *view) { - struct wined3d_unordered_access_view_gl *view_gl = object; - - if (view_gl->gl_view.name || view_gl->counter_bo) - { - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - - context = context_acquire(view_gl->v.resource->device, NULL, 0); - gl_info = wined3d_context_gl(context)->gl_info; - if (view_gl->gl_view.name) - gl_info->gl_ops.gl.p_glDeleteTextures(1, &view_gl->gl_view.name); - if (view_gl->counter_bo) - GL_EXTCALL(glDeleteBuffers(1, &view_gl->counter_bo)); - checkGLcall("delete resources"); - context_release(context); - } - - heap_free(view_gl); + /* Call wined3d_object_destroyed() before releasing the resource, + * since releasing the resource may end up destroying the parent. */ + view->parent_ops->wined3d_object_destroyed(view->parent); + wined3d_resource_decref(view->resource); } ULONG CDECL wined3d_unordered_access_view_decref(struct wined3d_unordered_access_view *view) @@ -992,17 +978,7 @@ ULONG CDECL wined3d_unordered_access_view_decref(struct wined3d_unordered_access TRACE("%p decreasing refcount to %u.\n", view, refcount); if (!refcount) - { - struct wined3d_resource *resource = view->resource; - struct wined3d_device *device = resource->device; - - /* Call wined3d_object_destroyed() before releasing the resource, - * since releasing the resource may end up destroying the parent. */ - view->parent_ops->wined3d_object_destroyed(view->parent); - wined3d_cs_destroy_object(device->cs, wined3d_unordered_access_view_gl_destroy_object, - wined3d_unordered_access_view_gl(view)); - wined3d_resource_decref(resource); - } + view->resource->device->adapter->adapter_ops->adapter_destroy_unordered_access_view(view); return refcount; } @@ -1167,30 +1143,42 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces return WINED3D_OK; } -HRESULT CDECL wined3d_unordered_access_view_create(const struct wined3d_view_desc *desc, - struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, - struct wined3d_unordered_access_view **view) +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) { - struct wined3d_unordered_access_view_gl *object; HRESULT hr; - TRACE("desc %s, resource %p, parent %p, parent_ops %p, view %p.\n", - wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops, view); - - if (!(object = heap_alloc_zero(sizeof(*object)))) - return E_OUTOFMEMORY; + TRACE("view_gl %p, desc %s, resource %p, parent %p, parent_ops %p.\n", + view_gl, wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops); - if (FAILED(hr = wined3d_unordered_access_view_init(&object->v, desc, resource, parent, parent_ops))) - { - heap_free(object); - WARN("Failed to initialise view, hr %#x.\n", hr); + if (FAILED(hr = wined3d_unordered_access_view_init(&view_gl->v, desc, resource, parent, parent_ops))) return hr; - } - wined3d_cs_init_object(resource->device->cs, wined3d_unordered_access_view_gl_cs_init, object); + wined3d_cs_init_object(resource->device->cs, wined3d_unordered_access_view_gl_cs_init, view_gl); - TRACE("Created unordered access view %p.\n", object); - *view = &object->v; + return hr; +} - return WINED3D_OK; +HRESULT wined3d_unordered_access_view_vk_init(struct wined3d_unordered_access_view_vk *view_vk, + const struct wined3d_view_desc *desc, struct wined3d_resource *resource, + void *parent, const struct wined3d_parent_ops *parent_ops) +{ + TRACE("view_vk %p, desc %s, resource %p, parent %p, parent_ops %p.\n", + view_vk, wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops); + + return wined3d_unordered_access_view_init(&view_vk->v, desc, resource, parent, parent_ops); +} + +HRESULT CDECL wined3d_unordered_access_view_create(const struct wined3d_view_desc *desc, + struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_unordered_access_view **view) +{ + const struct wined3d_adapter_ops *adapter_ops; + + TRACE("desc %s, resource %p, parent %p, parent_ops %p, view %p.\n", + wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops, view); + + adapter_ops = resource->device->adapter->adapter_ops; + return adapter_ops->adapter_create_unordered_access_view(desc, resource, parent, parent_ops, view); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6cab6f34966..860cf03169d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2796,6 +2796,10 @@ struct wined3d_adapter_ops struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_shader_resource_view **view); void (*adapter_destroy_shader_resource_view)(struct wined3d_shader_resource_view *view); + HRESULT (*adapter_create_unordered_access_view)(const struct wined3d_view_desc *desc, + struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_unordered_access_view **view); + void (*adapter_destroy_unordered_access_view)(struct wined3d_unordered_access_view *view); }; /* The adapter structure */ @@ -4270,6 +4274,7 @@ struct wined3d_unordered_access_view struct wined3d_view_desc desc; }; +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, @@ -4292,6 +4297,25 @@ static inline struct wined3d_unordered_access_view_gl *wined3d_unordered_access_ return CONTAINING_RECORD(view, struct wined3d_unordered_access_view_gl, v); } +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; + +struct wined3d_unordered_access_view_vk +{ + struct wined3d_unordered_access_view v; +}; + +static inline struct wined3d_unordered_access_view_vk *wined3d_unordered_access_view_vk( + struct wined3d_unordered_access_view *view) +{ + return CONTAINING_RECORD(view, struct wined3d_unordered_access_view_vk, v); +} + +HRESULT wined3d_unordered_access_view_vk_init(struct wined3d_unordered_access_view_vk *view_vk, + const struct wined3d_view_desc *desc, struct wined3d_resource *resource, + void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + struct wined3d_swapchain_state { struct wined3d_swapchain_desc desc; -- 2.11.0

1 0

[PATCH 04/10] wined3d: Make the adapter responsible for shader resource view creation and destruction.
by Henri Verbeet 11 Aug '19

11 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 48 +++++++++++++++++++++++++ dlls/wined3d/adapter_vk.c | 48 +++++++++++++++++++++++++ dlls/wined3d/directx.c | 17 +++++++++ dlls/wined3d/view.c | 81 +++++++++++++++++++----------------------- dlls/wined3d/wined3d_private.h | 23 ++++++++++++ 5 files changed, 172 insertions(+), 45 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 7f321d4acba..cc7bc57ea3d 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4835,6 +4835,52 @@ static void adapter_gl_destroy_rendertarget_view(struct wined3d_rendertarget_vie wined3d_device_decref(device); } +static HRESULT adapter_gl_create_shader_resource_view(const struct wined3d_view_desc *desc, + struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_shader_resource_view **view) +{ + struct wined3d_shader_resource_view_gl *view_gl; + HRESULT hr; + + TRACE("desc %s, resource %p, parent %p, parent_ops %p, view %p.\n", + wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops, view); + + if (!(view_gl = heap_alloc_zero(sizeof(*view_gl)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = wined3d_shader_resource_view_gl_init(view_gl, desc, resource, parent, parent_ops))) + { + WARN("Failed to initialise view, hr %#x.\n", hr); + heap_free(view_gl); + return hr; + } + + TRACE("Created shader resource view %p.\n", view_gl); + *view = &view_gl->v; + + return hr; +} + +static void adapter_gl_destroy_shader_resource_view(struct wined3d_shader_resource_view *view) +{ + struct wined3d_shader_resource_view_gl *view_gl = wined3d_shader_resource_view_gl(view); + struct wined3d_device *device = view_gl->v.resource->device; + unsigned int swapchain_count = device->swapchain_count; + + TRACE("view_gl %p.\n", view_gl); + + /* Take a reference to the device, in case releasing the view's resource + * would cause the device to be destroyed. However, swapchain resources + * don't take a reference to the device, and we wouldn't want to increment + * the refcount on a device that's in the process of being destroyed. */ + if (swapchain_count) + wined3d_device_incref(device); + wined3d_shader_resource_view_cleanup(&view_gl->v); + wined3d_view_gl_destroy(device, &view_gl->gl_view, view_gl); + if (swapchain_count) + wined3d_device_decref(device); +} + static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = { adapter_gl_destroy, @@ -4852,6 +4898,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = adapter_gl_destroy_buffer, adapter_gl_create_rendertarget_view, adapter_gl_destroy_rendertarget_view, + adapter_gl_create_shader_resource_view, + adapter_gl_destroy_shader_resource_view, }; 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 a58efb8b7d8..f739ebfaac4 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -586,6 +586,52 @@ static void adapter_vk_destroy_rendertarget_view(struct wined3d_rendertarget_vie wined3d_device_decref(device); } +static HRESULT adapter_vk_create_shader_resource_view(const struct wined3d_view_desc *desc, + struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_shader_resource_view **view) +{ + struct wined3d_shader_resource_view_vk *view_vk; + HRESULT hr; + + TRACE("desc %s, resource %p, parent %p, parent_ops %p, view %p.\n", + wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops, view); + + if (!(view_vk = heap_alloc_zero(sizeof(*view_vk)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = wined3d_shader_resource_view_vk_init(view_vk, desc, resource, parent, parent_ops))) + { + WARN("Failed to initialise view, hr %#x.\n", hr); + heap_free(view_vk); + return hr; + } + + TRACE("Created shader resource view %p.\n", view_vk); + *view = &view_vk->v; + + return hr; +} + +static void adapter_vk_destroy_shader_resource_view(struct wined3d_shader_resource_view *view) +{ + struct wined3d_shader_resource_view_vk *view_vk = wined3d_shader_resource_view_vk(view); + struct wined3d_device *device = view_vk->v.resource->device; + unsigned int swapchain_count = device->swapchain_count; + + TRACE("view_vk %p.\n", view_vk); + + /* Take a reference to the device, in case releasing the view's resource + * would cause the device to be destroyed. However, swapchain resources + * don't take a reference to the device, and we wouldn't want to increment + * the refcount on a device that's in the process of being destroyed. */ + if (swapchain_count) + wined3d_device_incref(device); + wined3d_shader_resource_view_cleanup(&view_vk->v); + wined3d_cs_destroy_object(device->cs, heap_free, view_vk); + if (swapchain_count) + wined3d_device_decref(device); +} + static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = { adapter_vk_destroy, @@ -603,6 +649,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = adapter_vk_destroy_buffer, adapter_vk_create_rendertarget_view, adapter_vk_destroy_rendertarget_view, + adapter_vk_create_shader_resource_view, + adapter_vk_destroy_shader_resource_view, }; static unsigned int wined3d_get_wine_vk_version(void) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5a4f7d2471e..9e31c0415c5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2475,6 +2475,21 @@ static void adapter_no3d_destroy_rendertarget_view(struct wined3d_rendertarget_v wined3d_device_decref(device); } +static HRESULT adapter_no3d_create_shader_resource_view(const struct wined3d_view_desc *desc, + struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_shader_resource_view **view) +{ + TRACE("desc %s, resource %p, parent %p, parent_ops %p, view %p.\n", + wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops, view); + + return E_NOTIMPL; +} + +static void adapter_no3d_destroy_shader_resource_view(struct wined3d_shader_resource_view *view) +{ + TRACE("view %p.\n", view); +} + static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = { adapter_no3d_destroy, @@ -2492,6 +2507,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = adapter_no3d_destroy_buffer, adapter_no3d_create_rendertarget_view, adapter_no3d_destroy_rendertarget_view, + adapter_no3d_create_shader_resource_view, + adapter_no3d_destroy_shader_resource_view, }; 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 8239059279b..ff8043c8682 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -674,23 +674,12 @@ ULONG CDECL wined3d_shader_resource_view_incref(struct wined3d_shader_resource_v return refcount; } -static void wined3d_shader_resource_view_gl_destroy_object(void *object) +void wined3d_shader_resource_view_cleanup(struct wined3d_shader_resource_view *view) { - struct wined3d_shader_resource_view_gl *view_gl = object; - - if (view_gl->gl_view.name) - { - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - - context = context_acquire(view_gl->v.resource->device, NULL, 0); - gl_info = wined3d_context_gl(context)->gl_info; - gl_info->gl_ops.gl.p_glDeleteTextures(1, &view_gl->gl_view.name); - checkGLcall("glDeleteTextures"); - context_release(context); - } - - heap_free(view_gl); + /* Call wined3d_object_destroyed() before releasing the resource, + * since releasing the resource may end up destroying the parent. */ + view->parent_ops->wined3d_object_destroyed(view->parent); + wined3d_resource_decref(view->resource); } ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_view *view) @@ -700,17 +689,7 @@ ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_v TRACE("%p decreasing refcount to %u.\n", view, refcount); if (!refcount) - { - struct wined3d_resource *resource = view->resource; - struct wined3d_device *device = resource->device; - - /* Call wined3d_object_destroyed() before releasing the resource, - * since releasing the resource may end up destroying the parent. */ - view->parent_ops->wined3d_object_destroyed(view->parent); - wined3d_cs_destroy_object(device->cs, wined3d_shader_resource_view_gl_destroy_object, - wined3d_shader_resource_view_gl(view)); - wined3d_resource_decref(resource); - } + view->resource->device->adapter->adapter_ops->adapter_destroy_shader_resource_view(view); return refcount; } @@ -798,32 +777,44 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ return WINED3D_OK; } -HRESULT CDECL wined3d_shader_resource_view_create(const struct wined3d_view_desc *desc, - struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, - struct wined3d_shader_resource_view **view) +HRESULT wined3d_shader_resource_view_gl_init(struct wined3d_shader_resource_view_gl *view_gl, + const struct wined3d_view_desc *desc, struct wined3d_resource *resource, + void *parent, const struct wined3d_parent_ops *parent_ops) { - struct wined3d_shader_resource_view_gl *object; HRESULT hr; - TRACE("desc %s, resource %p, parent %p, parent_ops %p, view %p.\n", - wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops, view); - - if (!(object = heap_alloc_zero(sizeof(*object)))) - return E_OUTOFMEMORY; + TRACE("view_gl %p, desc %s, resource %p, parent %p, parent_ops %p.\n", + view_gl, wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops); - if (FAILED(hr = wined3d_shader_resource_view_init(&object->v, desc, resource, parent, parent_ops))) - { - heap_free(object); - WARN("Failed to initialise view, hr %#x.\n", hr); + if (FAILED(hr = wined3d_shader_resource_view_init(&view_gl->v, desc, resource, parent, parent_ops))) return hr; - } - wined3d_cs_init_object(resource->device->cs, wined3d_shader_resource_view_gl_cs_init, object); + wined3d_cs_init_object(resource->device->cs, wined3d_shader_resource_view_gl_cs_init, view_gl); - TRACE("Created shader resource view %p.\n", object); - *view = &object->v; + return hr; +} - return WINED3D_OK; +HRESULT wined3d_shader_resource_view_vk_init(struct wined3d_shader_resource_view_vk *view_vk, + const struct wined3d_view_desc *desc, struct wined3d_resource *resource, + void *parent, const struct wined3d_parent_ops *parent_ops) +{ + TRACE("view_vk %p, desc %s, resource %p, parent %p, parent_ops %p.\n", + view_vk, wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops); + + return wined3d_shader_resource_view_init(&view_vk->v, desc, resource, parent, parent_ops); +} + +HRESULT CDECL wined3d_shader_resource_view_create(const struct wined3d_view_desc *desc, + struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_shader_resource_view **view) +{ + const struct wined3d_adapter_ops *adapter_ops; + + TRACE("desc %s, resource %p, parent %p, parent_ops %p, view %p.\n", + wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops, view); + + adapter_ops = resource->device->adapter->adapter_ops; + return adapter_ops->adapter_create_shader_resource_view(desc, resource, parent, parent_ops, view); } void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl *view_gl, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e9bb28536c9..6cab6f34966 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2792,6 +2792,10 @@ struct wined3d_adapter_ops struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_rendertarget_view **view); void (*adapter_destroy_rendertarget_view)(struct wined3d_rendertarget_view *view); + HRESULT (*adapter_create_shader_resource_view)(const struct wined3d_view_desc *desc, + struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_shader_resource_view **view); + void (*adapter_destroy_shader_resource_view)(struct wined3d_shader_resource_view *view); }; /* The adapter structure */ @@ -4217,6 +4221,7 @@ struct wined3d_shader_resource_view struct wined3d_view_desc desc; }; +void wined3d_shader_resource_view_cleanup(struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; struct wined3d_shader_resource_view_gl @@ -4233,6 +4238,24 @@ static inline struct wined3d_shader_resource_view_gl *wined3d_shader_resource_vi void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl *view_gl, unsigned int unit, struct wined3d_sampler *sampler, struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +HRESULT wined3d_shader_resource_view_gl_init(struct wined3d_shader_resource_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; + +struct wined3d_shader_resource_view_vk +{ + struct wined3d_shader_resource_view v; +}; + +static inline struct wined3d_shader_resource_view_vk *wined3d_shader_resource_view_vk( + struct wined3d_shader_resource_view *view) +{ + return CONTAINING_RECORD(view, struct wined3d_shader_resource_view_vk, v); +} + +HRESULT wined3d_shader_resource_view_vk_init(struct wined3d_shader_resource_view_vk *view_vk, + const struct wined3d_view_desc *desc, struct wined3d_resource *resource, + void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; struct wined3d_unordered_access_view { -- 2.11.0

1 0

[PATCH 03/10] wined3d: Make the adapter responsible for render target view creation and destruction.
by Henri Verbeet 11 Aug '19

11 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 96 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/adapter_vk.c | 48 +++++++++++++++++++++ dlls/wined3d/directx.c | 47 +++++++++++++++++++++ dlls/wined3d/view.c | 93 ++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 28 ++++++++++++ 5 files changed, 265 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 471eb42e862..7f321d4acba 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4741,6 +4741,100 @@ static void adapter_gl_destroy_buffer(struct wined3d_buffer *buffer) wined3d_device_decref(device); } +static HRESULT adapter_gl_create_rendertarget_view(const struct wined3d_view_desc *desc, + struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_rendertarget_view **view) +{ + struct wined3d_rendertarget_view_gl *view_gl; + HRESULT hr; + + TRACE("desc %s, resource %p, parent %p, parent_ops %p, view %p.\n", + wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops, view); + + if (!(view_gl = heap_alloc_zero(sizeof(*view_gl)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = wined3d_rendertarget_view_gl_init(view_gl, desc, resource, parent, parent_ops))) + { + WARN("Failed to initialise view, hr %#x.\n", hr); + heap_free(view_gl); + return hr; + } + + TRACE("Created render target view %p.\n", view_gl); + *view = &view_gl->v; + + return hr; +} + +struct wined3d_view_gl_destroy_ctx +{ + struct wined3d_device *device; + const struct wined3d_gl_view *gl_view; + void *object; + struct wined3d_view_gl_destroy_ctx *free; +}; + +static void wined3d_view_gl_destroy_object(void *object) +{ + struct wined3d_view_gl_destroy_ctx *ctx = object; + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + struct wined3d_device *device; + + device = ctx->device; + + if (ctx->gl_view->name) + { + context = context_acquire(device, NULL, 0); + gl_info = wined3d_context_gl(context)->gl_info; + context_gl_resource_released(device, ctx->gl_view->name, FALSE); + gl_info->gl_ops.gl.p_glDeleteTextures(1, &ctx->gl_view->name); + checkGLcall("delete resources"); + context_release(context); + } + + heap_free(ctx->object); + heap_free(ctx->free); +} + +static void wined3d_view_gl_destroy(struct wined3d_device *device, + const struct wined3d_gl_view *gl_view, void *object) +{ + struct wined3d_view_gl_destroy_ctx *ctx, c; + + if (!(ctx = heap_alloc(sizeof(*ctx)))) + ctx = &c; + ctx->device = device; + ctx->gl_view = gl_view; + ctx->object = object; + ctx->free = ctx != &c ? ctx : NULL; + + wined3d_cs_destroy_object(device->cs, wined3d_view_gl_destroy_object, ctx); + if (!ctx->free) + device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); +} + +static void adapter_gl_destroy_rendertarget_view(struct wined3d_rendertarget_view *view) +{ + struct wined3d_rendertarget_view_gl *view_gl = wined3d_rendertarget_view_gl(view); + struct wined3d_device *device = view_gl->v.resource->device; + unsigned int swapchain_count = device->swapchain_count; + + TRACE("view_gl %p.\n", view_gl); + + /* Take a reference to the device, in case releasing the view's resource + * would cause the device to be destroyed. However, swapchain resources + * don't take a reference to the device, and we wouldn't want to increment + * the refcount on a device that's in the process of being destroyed. */ + if (swapchain_count) + wined3d_device_incref(device); + wined3d_rendertarget_view_cleanup(&view_gl->v); + wined3d_view_gl_destroy(device, &view_gl->gl_view, view_gl); + if (swapchain_count) + wined3d_device_decref(device); +} + static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = { adapter_gl_destroy, @@ -4756,6 +4850,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = adapter_gl_destroy_swapchain, adapter_gl_create_buffer, adapter_gl_destroy_buffer, + adapter_gl_create_rendertarget_view, + adapter_gl_destroy_rendertarget_view, }; 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 73a16177f41..a58efb8b7d8 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -540,6 +540,52 @@ static void adapter_vk_destroy_buffer(struct wined3d_buffer *buffer) wined3d_device_decref(device); } +static HRESULT adapter_vk_create_rendertarget_view(const struct wined3d_view_desc *desc, + struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_rendertarget_view **view) +{ + struct wined3d_rendertarget_view_vk *view_vk; + HRESULT hr; + + TRACE("desc %s, resource %p, parent %p, parent_ops %p, view %p.\n", + wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops, view); + + if (!(view_vk = heap_alloc_zero(sizeof(*view_vk)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = wined3d_rendertarget_view_vk_init(view_vk, desc, resource, parent, parent_ops))) + { + WARN("Failed to initialise view, hr %#x.\n", hr); + heap_free(view_vk); + return hr; + } + + TRACE("Created render target view %p.\n", view_vk); + *view = &view_vk->v; + + return hr; +} + +static void adapter_vk_destroy_rendertarget_view(struct wined3d_rendertarget_view *view) +{ + struct wined3d_rendertarget_view_vk *view_vk = wined3d_rendertarget_view_vk(view); + struct wined3d_device *device = view_vk->v.resource->device; + unsigned int swapchain_count = device->swapchain_count; + + TRACE("view_vk %p.\n", view_vk); + + /* Take a reference to the device, in case releasing the view's resource + * would cause the device to be destroyed. However, swapchain resources + * don't take a reference to the device, and we wouldn't want to increment + * the refcount on a device that's in the process of being destroyed. */ + if (swapchain_count) + wined3d_device_incref(device); + wined3d_rendertarget_view_cleanup(&view_vk->v); + wined3d_cs_destroy_object(device->cs, heap_free, view_vk); + if (swapchain_count) + wined3d_device_decref(device); +} + static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = { adapter_vk_destroy, @@ -555,6 +601,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = adapter_vk_destroy_swapchain, adapter_vk_create_buffer, adapter_vk_destroy_buffer, + adapter_vk_create_rendertarget_view, + adapter_vk_destroy_rendertarget_view, }; static unsigned int wined3d_get_wine_vk_version(void) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7cc2490390a..5a4f7d2471e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2430,6 +2430,51 @@ static void adapter_no3d_destroy_buffer(struct wined3d_buffer *buffer) wined3d_device_decref(device); } +static HRESULT adapter_no3d_create_rendertarget_view(const struct wined3d_view_desc *desc, + struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_rendertarget_view **view) +{ + struct wined3d_rendertarget_view *view_no3d; + HRESULT hr; + + TRACE("desc %s, resource %p, parent %p, parent_ops %p, view %p.\n", + wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops, view); + + if (!(view_no3d = heap_alloc_zero(sizeof(*view_no3d)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = wined3d_rendertarget_view_no3d_init(view_no3d, desc, resource, parent, parent_ops))) + { + WARN("Failed to initialise view, hr %#x.\n", hr); + heap_free(view_no3d); + return hr; + } + + TRACE("Created render target view %p.\n", view_no3d); + *view = view_no3d; + + return hr; +} + +static void adapter_no3d_destroy_rendertarget_view(struct wined3d_rendertarget_view *view) +{ + struct wined3d_device *device = view->resource->device; + unsigned int swapchain_count = device->swapchain_count; + + TRACE("view %p.\n", view); + + /* Take a reference to the device, in case releasing the view's resource + * would cause the device to be destroyed. However, swapchain resources + * don't take a reference to the device, and we wouldn't want to increment + * the refcount on a device that's in the process of being destroyed. */ + if (swapchain_count) + wined3d_device_incref(device); + wined3d_rendertarget_view_cleanup(view); + wined3d_cs_destroy_object(device->cs, heap_free, view); + if (swapchain_count) + wined3d_device_decref(device); +} + static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = { adapter_no3d_destroy, @@ -2445,6 +2490,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = adapter_no3d_destroy_swapchain, adapter_no3d_create_buffer, adapter_no3d_destroy_buffer, + adapter_no3d_create_rendertarget_view, + adapter_no3d_destroy_rendertarget_view, }; 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 5ab7965d0f4..8239059279b 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -345,25 +345,12 @@ ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *v return refcount; } -static void wined3d_rendertarget_view_gl_destroy_object(void *object) +void wined3d_rendertarget_view_cleanup(struct wined3d_rendertarget_view *view) { - struct wined3d_rendertarget_view_gl *view_gl = object; - struct wined3d_device *device = view_gl->v.resource->device; - - if (view_gl->gl_view.name) - { - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - - context = context_acquire(device, NULL, 0); - gl_info = wined3d_context_gl(context)->gl_info; - context_gl_resource_released(device, view_gl->gl_view.name, FALSE); - gl_info->gl_ops.gl.p_glDeleteTextures(1, &view_gl->gl_view.name); - checkGLcall("glDeleteTextures"); - context_release(context); - } - - heap_free(view_gl); + /* Call wined3d_object_destroyed() before releasing the resource, + * since releasing the resource may end up destroying the parent. */ + view->parent_ops->wined3d_object_destroyed(view->parent); + wined3d_resource_decref(view->resource); } ULONG CDECL wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *view) @@ -373,17 +360,7 @@ ULONG CDECL wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *v TRACE("%p decreasing refcount to %u.\n", view, refcount); if (!refcount) - { - struct wined3d_resource *resource = view->resource; - struct wined3d_device *device = resource->device; - - /* Call wined3d_object_destroyed() before releasing the resource, - * since releasing the resource may end up destroying the parent. */ - view->parent_ops->wined3d_object_destroyed(view->parent); - wined3d_cs_destroy_object(device->cs, wined3d_rendertarget_view_gl_destroy_object, - wined3d_rendertarget_view_gl(view)); - wined3d_resource_decref(resource); - } + view->resource->device->adapter->adapter_ops->adapter_destroy_rendertarget_view(view); return refcount; } @@ -619,34 +596,56 @@ static HRESULT wined3d_rendertarget_view_init(struct wined3d_rendertarget_view * return WINED3D_OK; } -HRESULT CDECL wined3d_rendertarget_view_create(const struct wined3d_view_desc *desc, - struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, - struct wined3d_rendertarget_view **view) +HRESULT wined3d_rendertarget_view_no3d_init(struct wined3d_rendertarget_view *view_no3d, + const struct wined3d_view_desc *desc, struct wined3d_resource *resource, + void *parent, const struct wined3d_parent_ops *parent_ops) { - struct wined3d_rendertarget_view_gl *object; - HRESULT hr; + TRACE("view_no3d %p, desc %s, resource %p, parent %p, parent_ops %p.\n", + view_no3d, wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops); - TRACE("desc %s, resource %p, parent %p, parent_ops %p, view %p.\n", - wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops, view); + return wined3d_rendertarget_view_init(view_no3d, desc, resource, parent, parent_ops); +} - if (!(object = heap_alloc_zero(sizeof(*object)))) - return E_OUTOFMEMORY; +HRESULT wined3d_rendertarget_view_gl_init(struct wined3d_rendertarget_view_gl *view_gl, + const struct wined3d_view_desc *desc, struct wined3d_resource *resource, + void *parent, const struct wined3d_parent_ops *parent_ops) +{ + HRESULT hr; - if (FAILED(hr = wined3d_rendertarget_view_init(&object->v, desc, resource, parent, parent_ops))) - { - heap_free(object); - WARN("Failed to initialise view, hr %#x.\n", hr); - return hr; - } + TRACE("view_gl %p, desc %s, resource %p, parent %p, parent_ops %p.\n", + view_gl, wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops); - wined3d_cs_init_object(resource->device->cs, wined3d_render_target_view_gl_cs_init, object); + if (FAILED(hr = wined3d_rendertarget_view_init(&view_gl->v, desc, resource, parent, parent_ops))) + return hr; - TRACE("Created render target view %p.\n", object); - *view = &object->v; + wined3d_cs_init_object(resource->device->cs, wined3d_render_target_view_gl_cs_init, view_gl); return hr; } +HRESULT wined3d_rendertarget_view_vk_init(struct wined3d_rendertarget_view_vk *view_vk, + const struct wined3d_view_desc *desc, struct wined3d_resource *resource, + void *parent, const struct wined3d_parent_ops *parent_ops) +{ + TRACE("view_vk %p, desc %s, resource %p, parent %p, parent_ops %p.\n", + view_vk, wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops); + + return wined3d_rendertarget_view_init(&view_vk->v, desc, resource, parent, parent_ops); +} + +HRESULT CDECL wined3d_rendertarget_view_create(const struct wined3d_view_desc *desc, + struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_rendertarget_view **view) +{ + const struct wined3d_adapter_ops *adapter_ops; + + TRACE("desc %s, resource %p, parent %p, parent_ops %p, view %p.\n", + wined3d_debug_view_desc(desc, resource), resource, parent, parent_ops, view); + + adapter_ops = resource->device->adapter->adapter_ops; + return adapter_ops->adapter_create_rendertarget_view(desc, resource, parent, parent_ops, view); +} + HRESULT CDECL wined3d_rendertarget_view_create_from_sub_resource(struct wined3d_texture *texture, unsigned int sub_resource_idx, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_rendertarget_view **view) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 18fed2eda19..e9bb28536c9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2788,6 +2788,10 @@ struct wined3d_adapter_ops const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer); void (*adapter_destroy_buffer)(struct wined3d_buffer *buffer); + HRESULT (*adapter_create_rendertarget_view)(const struct wined3d_view_desc *desc, + struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_rendertarget_view **view); + void (*adapter_destroy_rendertarget_view)(struct wined3d_rendertarget_view *view); }; /* The adapter structure */ @@ -4153,6 +4157,7 @@ struct wined3d_rendertarget_view struct wined3d_view_desc desc; }; +void wined3d_rendertarget_view_cleanup(struct wined3d_rendertarget_view *view) DECLSPEC_HIDDEN; void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarget_view *view, const struct wined3d_context *context, unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN; void wined3d_rendertarget_view_invalidate_location(struct wined3d_rendertarget_view *view, @@ -4164,6 +4169,10 @@ void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_view *view, DWORD location) DECLSPEC_HIDDEN; +HRESULT wined3d_rendertarget_view_no3d_init(struct wined3d_rendertarget_view *view_no3d, + const struct wined3d_view_desc *desc, struct wined3d_resource *resource, + void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + struct wined3d_rendertarget_view_gl { struct wined3d_rendertarget_view v; @@ -4176,6 +4185,25 @@ static inline struct wined3d_rendertarget_view_gl *wined3d_rendertarget_view_gl( return CONTAINING_RECORD(view, struct wined3d_rendertarget_view_gl, v); } +HRESULT wined3d_rendertarget_view_gl_init(struct wined3d_rendertarget_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; + +struct wined3d_rendertarget_view_vk +{ + struct wined3d_rendertarget_view v; +}; + +static inline struct wined3d_rendertarget_view_vk *wined3d_rendertarget_view_vk( + struct wined3d_rendertarget_view *view) +{ + return CONTAINING_RECORD(view, struct wined3d_rendertarget_view_vk, v); +} + +HRESULT wined3d_rendertarget_view_vk_init(struct wined3d_rendertarget_view_vk *view_vk, + const struct wined3d_view_desc *desc, struct wined3d_resource *resource, + void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + struct wined3d_shader_resource_view { LONG refcount; -- 2.11.0

1 0

[PATCH 02/10] wined3d: Don't call wined3d_texture_prepare_location() with a NULL context in wined3d_texture_update_desc().
by Henri Verbeet 11 Aug '19

11 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 705b725c4f1..467dd093a45 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1535,6 +1535,14 @@ void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *t checkGLcall("set compatible renderbuffer"); } +static BOOL wined3d_texture_prepare_sysmem(struct wined3d_texture *texture) +{ + if (texture->resource.heap_memory) + return TRUE; + + return wined3d_resource_allocate_sysmem(&texture->resource); +} + HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT width, UINT height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, UINT multisample_quality, void *mem, UINT pitch) @@ -1657,7 +1665,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT } else { - wined3d_texture_prepare_location(texture, 0, NULL, WINED3D_LOCATION_SYSMEM); + wined3d_texture_prepare_sysmem(texture); valid_location = WINED3D_LOCATION_SYSMEM; } @@ -1832,12 +1840,7 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned switch (location) { case WINED3D_LOCATION_SYSMEM: - if (texture->resource.heap_memory) - return TRUE; - - if (!wined3d_resource_allocate_sysmem(&texture->resource)) - return FALSE; - return TRUE; + return wined3d_texture_prepare_sysmem(texture); case WINED3D_LOCATION_USER_MEMORY: if (!texture->user_memory) -- 2.11.0

1 0

[PATCH 01/10] wined3d: Make the adapter responsible for buffer creation and destruction.
by Henri Verbeet 11 Aug '19

11 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 63 ++++++++++++++++++++ dlls/wined3d/adapter_vk.c | 48 +++++++++++++++ dlls/wined3d/buffer.c | 129 +++++++++++++++++++++++++++-------------- dlls/wined3d/directx.c | 47 +++++++++++++++ dlls/wined3d/wined3d_private.h | 29 +++++++++ 5 files changed, 274 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index e60437d2812..471eb42e862 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4680,6 +4680,67 @@ static void adapter_gl_destroy_swapchain(struct wined3d_swapchain *swapchain) heap_free(swapchain); } +static HRESULT adapter_gl_create_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, struct wined3d_buffer **buffer) +{ + struct wined3d_buffer_gl *buffer_gl; + HRESULT hr; + + TRACE("device %p, desc %p, data %p, parent %p, parent_ops %p, buffer %p.\n", + device, desc, data, parent, parent_ops, buffer); + + if (!(buffer_gl = heap_alloc_zero(sizeof(*buffer_gl)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = wined3d_buffer_gl_init(buffer_gl, device, desc, data, parent, parent_ops))) + { + WARN("Failed to initialise buffer, hr %#x.\n", hr); + heap_free(buffer_gl); + return hr; + } + + TRACE("Created buffer %p.\n", buffer_gl); + *buffer = &buffer_gl->b; + + return hr; +} + +static void wined3d_buffer_gl_destroy_object(void *object) +{ + struct wined3d_buffer_gl *buffer_gl = object; + struct wined3d_context *context; + + if (buffer_gl->buffer_object) + { + context = context_acquire(buffer_gl->b.resource.device, NULL, 0); + wined3d_buffer_gl_destroy_buffer_object(buffer_gl, wined3d_context_gl(context)); + context_release(context); + } + + heap_free(buffer_gl); +} + +static void adapter_gl_destroy_buffer(struct wined3d_buffer *buffer) +{ + struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); + struct wined3d_device *device = buffer_gl->b.resource.device; + unsigned int swapchain_count = device->swapchain_count; + + TRACE("buffer_gl %p.\n", buffer_gl); + + /* Take a reference to the device, in case releasing the buffer would + * cause the device to be destroyed. However, swapchain resources don't + * take a reference to the device, and we wouldn't want to increment the + * refcount on a device that's in the process of being destroyed. */ + if (swapchain_count) + wined3d_device_incref(device); + wined3d_buffer_cleanup(&buffer_gl->b); + wined3d_cs_destroy_object(device->cs, wined3d_buffer_gl_destroy_object, buffer_gl); + if (swapchain_count) + wined3d_device_decref(device); +} + static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = { adapter_gl_destroy, @@ -4693,6 +4754,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = adapter_gl_uninit_3d, adapter_gl_create_swapchain, adapter_gl_destroy_swapchain, + adapter_gl_create_buffer, + adapter_gl_destroy_buffer, }; 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 cdb5c977f5d..73a16177f41 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -494,6 +494,52 @@ static void adapter_vk_destroy_swapchain(struct wined3d_swapchain *swapchain) heap_free(swapchain); } +static HRESULT adapter_vk_create_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, struct wined3d_buffer **buffer) +{ + struct wined3d_buffer_vk *buffer_vk; + HRESULT hr; + + TRACE("device %p, desc %p, data %p, parent %p, parent_ops %p, buffer %p.\n", + device, desc, data, parent, parent_ops, buffer); + + if (!(buffer_vk = heap_alloc_zero(sizeof(*buffer_vk)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = wined3d_buffer_vk_init(buffer_vk, device, desc, data, parent, parent_ops))) + { + WARN("Failed to initialise buffer, hr %#x.\n", hr); + heap_free(buffer_vk); + return hr; + } + + TRACE("Created buffer %p.\n", buffer_vk); + *buffer = &buffer_vk->b; + + return hr; +} + +static void adapter_vk_destroy_buffer(struct wined3d_buffer *buffer) +{ + struct wined3d_buffer_vk *buffer_vk = wined3d_buffer_vk(buffer); + struct wined3d_device *device = buffer_vk->b.resource.device; + unsigned int swapchain_count = device->swapchain_count; + + TRACE("buffer_vk %p.\n", buffer_vk); + + /* Take a reference to the device, in case releasing the buffer would + * cause the device to be destroyed. However, swapchain resources don't + * take a reference to the device, and we wouldn't want to increment the + * refcount on a device that's in the process of being destroyed. */ + if (swapchain_count) + wined3d_device_incref(device); + wined3d_buffer_cleanup(&buffer_vk->b); + wined3d_cs_destroy_object(device->cs, heap_free, buffer_vk); + if (swapchain_count) + wined3d_device_decref(device); +} + static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = { adapter_vk_destroy, @@ -507,6 +553,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = adapter_vk_uninit_3d, adapter_vk_create_swapchain, adapter_vk_destroy_swapchain, + adapter_vk_create_buffer, + adapter_vk_destroy_buffer, }; static unsigned int wined3d_get_wine_vk_version(void) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 65eff2171e1..b5f44c56ec3 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -139,7 +139,7 @@ static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct w } /* Context activation is done by the caller. */ -static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl, +void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context_gl *context_gl) { const struct wined3d_gl_info *gl_info = context_gl->gl_info; @@ -757,22 +757,18 @@ static void wined3d_buffer_drop_bo(struct wined3d_buffer *buffer) buffer_unload(&buffer->resource); } -static void wined3d_buffer_gl_destroy_object(void *object) +static void wined3d_buffer_destroy_object(void *object) { - struct wined3d_buffer_gl *buffer_gl = object; - struct wined3d_context *context; + struct wined3d_buffer *buffer = object; - if (buffer_gl->buffer_object) - { - context = context_acquire(buffer_gl->b.resource.device, NULL, 0); - wined3d_buffer_gl_destroy_buffer_object(buffer_gl, wined3d_context_gl(context)); - context_release(context); - - heap_free(buffer_gl->b.conversion_map); - } + heap_free(buffer->conversion_map); + heap_free(buffer->maps); +} - heap_free(buffer_gl->b.maps); - heap_free(buffer_gl); +void wined3d_buffer_cleanup(struct wined3d_buffer *buffer) +{ + resource_cleanup(&buffer->resource); + wined3d_cs_destroy_object(buffer->resource.device->cs, wined3d_buffer_destroy_object, buffer); } ULONG CDECL wined3d_buffer_decref(struct wined3d_buffer *buffer) @@ -784,9 +780,7 @@ ULONG CDECL wined3d_buffer_decref(struct wined3d_buffer *buffer) if (!refcount) { buffer->resource.parent_ops->wined3d_object_destroyed(buffer->resource.parent); - resource_cleanup(&buffer->resource); - wined3d_cs_destroy_object(buffer->resource.device->cs, - wined3d_buffer_gl_destroy_object, wined3d_buffer_gl(buffer)); + buffer->resource.device->adapter->adapter_ops->adapter_destroy_buffer(buffer); } return refcount; @@ -1353,6 +1347,11 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d BOOL dynamic_buffer_ok; HRESULT hr; + TRACE("buffer %p, device %p, desc byte_width %u, usage %s, bind_flags %s, " + "access %s, data %p, parent %p, parent_ops %p.\n", + buffer, device, desc->byte_width, debug_d3dusage(desc->usage), wined3d_debug_bind_flags(desc->bind_flags), + wined3d_debug_resource_access(desc->access), data, parent, parent_ops); + if (!desc->byte_width) { WARN("Size 0 requested, returning E_INVALIDARG.\n"); @@ -1382,9 +1381,8 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d buffer->structure_byte_stride = desc->structure_byte_stride; buffer->locations = data ? WINED3D_LOCATION_DISCARDED : WINED3D_LOCATION_SYSMEM; - TRACE("buffer %p, size %#x, usage %#x, format %s, memory @ %p.\n", - buffer, buffer->resource.size, buffer->resource.usage, - debug_d3dformat(buffer->resource.format->id), buffer->resource.heap_memory); + TRACE("buffer %p, size %#x, usage %#x, memory @ %p.\n", + buffer, buffer->resource.size, buffer->resource.usage, buffer->resource.heap_memory); if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING || wined3d_resource_access_is_managed(desc->access)) @@ -1441,6 +1439,34 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d return WINED3D_OK; } +static void wined3d_buffer_no3d_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) +{ + FIXME("Not implemented.\n"); +} + +static void wined3d_buffer_no3d_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) +{ + FIXME("Not implemented.\n"); +} + +static const struct wined3d_buffer_ops wined3d_buffer_no3d_ops = +{ + wined3d_buffer_no3d_upload_ranges, + wined3d_buffer_no3d_download_ranges, +}; + +HRESULT wined3d_buffer_no3d_init(struct wined3d_buffer *buffer_no3d, 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) +{ + TRACE("buffer_no3d %p, device %p, desc %p, data %p, parent %p, parent_ops %p.\n", + buffer_no3d, device, desc, data, parent, parent_ops); + + return wined3d_buffer_init(buffer_no3d, device, desc, data, parent, parent_ops, &wined3d_buffer_no3d_ops); +} + /* 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) @@ -1487,35 +1513,54 @@ static const struct wined3d_buffer_ops wined3d_buffer_gl_ops = wined3d_buffer_gl_download_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) +HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, 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) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - struct wined3d_buffer_gl *object; - HRESULT hr; - TRACE("device %p, desc byte_width %u, usage %s, bind_flags %s, access %s, data %p, parent %p, " - "parent_ops %p, buffer %p.\n", - device, desc->byte_width, debug_d3dusage(desc->usage), - wined3d_debug_bind_flags(desc->bind_flags), wined3d_debug_resource_access(desc->access), - data, parent, parent_ops, buffer); + TRACE("buffer_gl %p, device %p, desc %p, data %p, parent %p, parent_ops %p.\n", + buffer_gl, device, desc, data, parent, parent_ops); - if (!(object = heap_alloc_zero(sizeof(*object)))) - return E_OUTOFMEMORY; + buffer_gl->buffer_type_hint = buffer_type_hint_from_bind_flags(gl_info, desc->bind_flags); - object->buffer_type_hint = buffer_type_hint_from_bind_flags(gl_info, desc->bind_flags); + return wined3d_buffer_init(&buffer_gl->b, device, desc, data, parent, parent_ops, &wined3d_buffer_gl_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); - return hr; - } +static void wined3d_buffer_vk_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) +{ + FIXME("Not implemented.\n"); +} - TRACE("Created buffer %p.\n", object); +static void wined3d_buffer_vk_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) +{ + FIXME("Not implemented.\n"); +} - *buffer = &object->b; +static const struct wined3d_buffer_ops wined3d_buffer_vk_ops = +{ + wined3d_buffer_vk_upload_ranges, + wined3d_buffer_vk_download_ranges, +}; - return WINED3D_OK; +HRESULT wined3d_buffer_vk_init(struct wined3d_buffer_vk *buffer_vk, 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) +{ + TRACE("buffer_vk %p, device %p, desc %p, data %p, parent %p, parent_ops %p.\n", + buffer_vk, device, desc, data, parent, parent_ops); + + return wined3d_buffer_init(&buffer_vk->b, device, desc, data, parent, parent_ops, &wined3d_buffer_vk_ops); +} + +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) +{ + TRACE("device %p, desc %p, data %p, parent %p, parent_ops %p, buffer %p.\n", + device, desc, data, parent, parent_ops, buffer); + + return device->adapter->adapter_ops->adapter_create_buffer(device, desc, data, parent, parent_ops, buffer); } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d175842e4c0..7cc2490390a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2385,6 +2385,51 @@ static void adapter_no3d_destroy_swapchain(struct wined3d_swapchain *swapchain) heap_free(swapchain); } +static HRESULT adapter_no3d_create_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, struct wined3d_buffer **buffer) +{ + struct wined3d_buffer *buffer_no3d; + HRESULT hr; + + TRACE("device %p, desc %p, data %p, parent %p, parent_ops %p, buffer %p.\n", + device, desc, data, parent, parent_ops, buffer); + + if (!(buffer_no3d = heap_alloc_zero(sizeof(*buffer_no3d)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = wined3d_buffer_no3d_init(buffer_no3d, device, desc, data, parent, parent_ops))) + { + WARN("Failed to initialise buffer, hr %#x.\n", hr); + heap_free(buffer_no3d); + return hr; + } + + TRACE("Created buffer %p.\n", buffer_no3d); + *buffer = buffer_no3d; + + return hr; +} + +static void adapter_no3d_destroy_buffer(struct wined3d_buffer *buffer) +{ + struct wined3d_device *device = buffer->resource.device; + unsigned int swapchain_count = device->swapchain_count; + + TRACE("buffer %p.\n", buffer); + + /* Take a reference to the device, in case releasing the buffer would + * cause the device to be destroyed. However, swapchain resources don't + * take a reference to the device, and we wouldn't want to increment the + * refcount on a device that's in the process of being destroyed. */ + if (swapchain_count) + wined3d_device_incref(device); + wined3d_buffer_cleanup(buffer); + wined3d_cs_destroy_object(device->cs, heap_free, buffer); + if (swapchain_count) + wined3d_device_decref(device); +} + static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = { adapter_no3d_destroy, @@ -2398,6 +2443,8 @@ static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = adapter_no3d_uninit_3d, adapter_no3d_create_swapchain, adapter_no3d_destroy_swapchain, + adapter_no3d_create_buffer, + adapter_no3d_destroy_buffer, }; static void wined3d_adapter_no3d_init_d3d_info(struct wined3d_adapter *adapter, unsigned int wined3d_creation_flags) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 173f1691c86..18fed2eda19 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2784,6 +2784,10 @@ struct wined3d_adapter_ops 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); + HRESULT (*adapter_create_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, + struct wined3d_buffer **buffer); + void (*adapter_destroy_buffer)(struct wined3d_buffer *buffer); }; /* The adapter structure */ @@ -4078,6 +4082,7 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc return CONTAINING_RECORD(resource, struct wined3d_buffer, resource); } +void wined3d_buffer_cleanup(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_bo_address *data, DWORD locations) DECLSPEC_HIDDEN; void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD location) DECLSPEC_HIDDEN; @@ -4091,6 +4096,10 @@ void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_off void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_box *box, const void *data) DECLSPEC_HIDDEN; +HRESULT wined3d_buffer_no3d_init(struct wined3d_buffer *buffer_no3d, 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) DECLSPEC_HIDDEN; + struct wined3d_buffer_gl { struct wined3d_buffer b; @@ -4105,6 +4114,26 @@ static inline struct wined3d_buffer_gl *wined3d_buffer_gl(struct wined3d_buffer return CONTAINING_RECORD(buffer, struct wined3d_buffer_gl, b); } +void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl, + struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, 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) DECLSPEC_HIDDEN; + +struct wined3d_buffer_vk +{ + struct wined3d_buffer b; +}; + +static inline struct wined3d_buffer_vk *wined3d_buffer_vk(struct wined3d_buffer *buffer) +{ + return CONTAINING_RECORD(buffer, struct wined3d_buffer_vk, b); +} + +HRESULT wined3d_buffer_vk_init(struct wined3d_buffer_vk *buffer_vk, 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) DECLSPEC_HIDDEN; + struct wined3d_rendertarget_view { LONG refcount; -- 2.11.0

1 0

Re: [PATCH] powrprof: Add PowerReadFriendlyName() stub
by Dridi Boukelmoune 09 Aug '19

09 Aug '19

On Fri, Aug 9, 2019 at 8:46 PM Marvin <testbot(a)winehq.org> wrote: > > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Committed". > > This means that your patch has been approved, and committed to the > main git tree. Congratulations! > > Commit: https://source.winehq.org/git/wine.git/commit/0fca739770492ad94f687a9c5d518… Greetings, Thank you for taking this first trivial patch in a completely automated process, and for sparing me a public review for the embarrassing typo in api-ms-win-power-setting-l1-1-0.spec, fixing it directly as you committed the patch. I just wanted to drop a quick thank-you-self-introduction email to the Wine project. I'm simply an end-user who knows nothing about Windows development or internals but wants to get a .NET-based game working on Linux without the help of winetricks (which gets me a lot further than wine-mono today). I hope to manage further patches as I slowly make progress running into one problem after another. This missing stub is enough to get me to the next step. I also have a bug to report, but before that I'm trying to gather more data, and things change faster than I make progress. I initially reported it where I live on a daily basis: Fedora (which ships Wine staging releases). https://bugzilla.redhat.com/show_bug.cgi?id=1734794 Thanks a lot for Wine! Dridi

1 0

[PATCH] gdi32: Remove useless casts to self
by Michael Stefaniuc 09 Aug '19

09 Aug '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- x and y fields are doubles already. dlls/gdi32/path.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index a36077883d..d2d9ac90a9 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -461,8 +461,8 @@ static struct gdi_path *PATH_FlattenPath(const struct gdi_path *pPath) static void PATH_ScaleNormalizedPoint(FLOAT_POINT corners[], double x, double y, POINT *pPoint) { - pPoint->x=GDI_ROUND( (double)corners[0].x + (double)(corners[1].x-corners[0].x)*0.5*(x+1.0) ); - pPoint->y=GDI_ROUND( (double)corners[0].y + (double)(corners[1].y-corners[0].y)*0.5*(y+1.0) ); + pPoint->x = GDI_ROUND( corners[0].x + (corners[1].x-corners[0].x)*0.5*(x+1.0) ); + pPoint->y = GDI_ROUND( corners[0].y + (corners[1].y-corners[0].y)*0.5*(y+1.0) ); } /* PATH_NormalizePoint @@ -474,8 +474,8 @@ static void PATH_NormalizePoint(FLOAT_POINT corners[], const FLOAT_POINT *pPoint, double *pX, double *pY) { - *pX=(double)(pPoint->x-corners[0].x)/(double)(corners[1].x-corners[0].x) * 2.0 - 1.0; - *pY=(double)(pPoint->y-corners[0].y)/(double)(corners[1].y-corners[0].y) * 2.0 - 1.0; + *pX = (pPoint->x-corners[0].x)/(corners[1].x-corners[0].x) * 2.0 - 1.0; + *pY = (pPoint->y-corners[0].y)/(corners[1].y-corners[0].y) * 2.0 - 1.0; } /* PATH_DoArcPart -- 2.20.1

2 1

[PATCH] gdi32/tests: Remove useless casts to self
by Michael Stefaniuc 09 Aug '19

09 Aug '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/tests/brush.c | 2 +- dlls/gdi32/tests/path.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index a3ebb91e1e..1a2201bd51 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -165,7 +165,7 @@ static void test_pattern_brush(void) info->bmiHeader.biBitCount = 1; info->bmiHeader.biPlanes = 1; info->bmiHeader.biCompression = BI_RGB; - bitmap = CreateDIBSection( 0, info, DIB_RGB_COLORS, (void**)&bits, NULL, 0 ); + bitmap = CreateDIBSection( 0, info, DIB_RGB_COLORS, &bits, NULL, 0 ); ok( bitmap != NULL, "CreateDIBSection failed\n" ); /* MSDN says a DIB section is not allowed, but it works fine */ diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index f4a9d18744..3fb479df9f 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -51,7 +51,7 @@ static void test_path_state(void) bi->bmiHeader.biBitCount = 32; bi->bmiHeader.biPlanes = 1; bi->bmiHeader.biCompression = BI_RGB; - dib = CreateDIBSection( 0, bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0 ); + dib = CreateDIBSection( 0, bi, DIB_RGB_COLORS, &bits, NULL, 0 ); orig = SelectObject( hdc, dib ); BeginPath( hdc ); -- 2.20.1

1 0

[PATCH] ntdll: Remove useless cast to self
by Michael Stefaniuc 09 Aug '19

09 Aug '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 2d2caf551e..e8ac1ffa7a 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1293,7 +1293,7 @@ static BOOL HEAP_ValidateInUseArena( const SUBHEAP *subheap, const ARENA_INUSE * if (*ptr != ARENA_FREE_FILLER) { ERR("Heap %p: free block %p overwritten at %p by %08x\n", - subheap->heap, (const ARENA_INUSE *)pArena + 1, ptr, *ptr ); + subheap->heap, pArena + 1, ptr, *ptr ); if (!*ptr) { HEAP_Dump( subheap->heap ); DbgBreakPoint(); } return FALSE; } -- 2.20.1

1 0

[PATCH] winebus.sys: Report device revision number for hidraw, too
by Andrew Eikum 09 Aug '19

09 Aug '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 08ad8765af2..d9311a9b030 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1124,10 +1124,23 @@ next_line: return (found_id && found_serial); } +static DWORD a_to_bcd(const char *s) +{ + DWORD r = 0; + const char *c; + int shift = strlen(s) - 1; + for (c = s; *c; ++c) + { + r |= (*c - '0') << (shift * 4); + --shift; + } + return r; +} + static void try_add_device(struct udev_device *dev) { DWORD vid = 0, pid = 0, version = 0; - struct udev_device *hiddev = NULL; + struct udev_device *hiddev = NULL, *walk_device; DEVICE_OBJECT *device = NULL; const char *subsystem; const char *devnode; @@ -1150,6 +1163,7 @@ static void try_add_device(struct udev_device *dev) hiddev = udev_device_get_parent_with_subsystem_devtype(dev, "hid", NULL); if (hiddev) { + const char *bcdDevice = NULL; #ifdef HAS_PROPER_INPUT_HEADER const platform_vtbl *other_vtbl = NULL; DEVICE_OBJECT *dup = NULL; @@ -1171,6 +1185,17 @@ static void try_add_device(struct udev_device *dev) &vid, &pid, &input, &serial); if (serial == NULL) serial = strdupAtoW(base_serial); + + walk_device = dev; + while (walk_device && !bcdDevice) + { + bcdDevice = udev_device_get_sysattr_value(walk_device, "bcdDevice"); + walk_device = udev_device_get_parent(walk_device); + } + if (bcdDevice) + { + version = a_to_bcd(bcdDevice); + } } #ifdef HAS_PROPER_INPUT_HEADER else -- 2.22.0

1 0