July 2023 - Wine-Commits - list.winehq.org

Gabriel Ivăncescu : mshtml/tests: Fix attribute leak in test_attr.
by Alexandre Julliard July 7, 2023

July 7, 2023

Module: wine Branch: master Commit: 5a1da7334a9c356a4eabe00df3d177e354288902 URL: https://gitlab.winehq.org/wine/wine/-/commit/5a1da7334a9c356a4eabe00df3d177… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jul 7 17:25:04 2023 +0300 mshtml/tests: Fix attribute leak in test_attr. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/dom.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 81b1f87c6c5..fea718c6b6b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -9944,6 +9944,7 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) V_BSTR(&v) = SysAllocString(L"newvalue"); put_attr_node_value(attr, v); VariantClear(&v); + IHTMLDOMAttribute_Release(attr); attr = get_elem_attr_node((IUnknown*)elem, L"emptyattr", TRUE); get_attr_node_value(attr, &v, VT_BSTR);

1 0

Gabriel Ivăncescu : mshtml/tests: Fix node leak in test_create_elems.
by Alexandre Julliard July 7, 2023

July 7, 2023

Module: wine Branch: master Commit: 129482f88626b120cb5a353605c0b2e68652995c URL: https://gitlab.winehq.org/wine/wine/-/commit/129482f88626b120cb5a353605c0b2… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jul 7 17:25:04 2023 +0300 mshtml/tests: Fix node leak in test_create_elems. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/dom.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index fea718c6b6b..429edf37668 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -10454,8 +10454,9 @@ static void test_create_elems(IHTMLDocument2 *doc) node = test_create_text(doc, L" Test"); V_VT(&var) = VT_DISPATCH; V_DISPATCH(&var) = NULL; - test_node_insertbefore((IUnknown*)body, node, &var); + node2 = test_node_insertbefore((IUnknown*)body, node, &var); test_elem_innertext(body, L"insert test Test"); + IHTMLDOMNode_Release(node2); IHTMLDOMNode_Release(node); doc5 = get_htmldoc5_iface((IUnknown*)doc);

1 0

Gabriel Ivăncescu : mshtml/tests: Fix node leaks in test_docfrag.
by Alexandre Julliard July 7, 2023

July 7, 2023

Module: wine Branch: master Commit: f17f7df5c76f85fc6bc2bd9758a31dd0ec5912bb URL: https://gitlab.winehq.org/wine/wine/-/commit/f17f7df5c76f85fc6bc2bd9758a31d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jul 7 17:25:04 2023 +0300 mshtml/tests: Fix node leaks in test_docfrag. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/dom.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 429edf37668..68dc38f2a03 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5238,6 +5238,13 @@ static IHTMLDOMNode *_test_node_append_child(unsigned line, IUnknown *node_unk, return new_child; } +#define test_node_append_child_discard(n,c) _test_node_append_child_discard(__LINE__,n,c) +static void _test_node_append_child_discard(unsigned line, IUnknown *node_unk, IUnknown *child_unk) +{ + IHTMLDOMNode *node = _test_node_append_child(line, node_unk, child_unk); + IHTMLDOMNode_Release(node); +} + #define test_node_insertbefore(n,c,v) _test_node_insertbefore(__LINE__,n,c,v) static IHTMLDOMNode *_test_node_insertbefore(unsigned line, IUnknown *node_unk, IHTMLDOMNode *child, VARIANT *var) { @@ -11046,7 +11053,7 @@ static void test_docfrag(IHTMLDocument2 *doc) br = test_create_elem(doc, L"BR"); test_elem_source_index(br, -1); - test_node_append_child((IUnknown*)frag, (IUnknown*)br); + test_node_append_child_discard((IUnknown*)frag, (IUnknown*)br); test_elem_source_index(br, 0); IHTMLElement_Release(br); @@ -11054,7 +11061,7 @@ static void test_docfrag(IHTMLDocument2 *doc) test_doc_getelembytag(frag, "Br", ET_BR, 1); div = get_elem_by_id(doc, L"divid", TRUE); - test_node_append_child((IUnknown*)div, (IUnknown*)frag); + test_node_append_child_discard((IUnknown*)div, (IUnknown*)frag); IHTMLElement_Release(div); hres = IHTMLDocument2_get_all(doc, &col); @@ -11064,23 +11071,23 @@ static void test_docfrag(IHTMLDocument2 *doc) html = test_create_elem(doc, L"HTML"); test_elem_source_index(html, -1); - test_node_append_child((IUnknown*)frag, (IUnknown*)html); + test_node_append_child_discard((IUnknown*)frag, (IUnknown*)html); test_elem_source_index(html, 0); div = test_create_elem(doc, L"DIV"); test_elem_source_index(div, -1); - test_node_append_child((IUnknown*)html, (IUnknown*)div); + test_node_append_child_discard((IUnknown*)html, (IUnknown*)div); test_elem_source_index(div, 1); IHTMLElement_Release(div); div = test_create_elem(doc, L"DIV"); test_elem_source_index(div, -1); - test_node_append_child((IUnknown*)html, (IUnknown*)div); + test_node_append_child_discard((IUnknown*)html, (IUnknown*)div); test_elem_source_index(div, 2); frag_body = test_create_elem(doc, L"BODY"); test_elem_source_index(frag_body, -1); - test_node_append_child((IUnknown*)div, (IUnknown*)frag_body); + test_node_append_child_discard((IUnknown*)div, (IUnknown*)frag_body); test_elem_source_index(frag_body, 3); IHTMLElement_Release(frag_body); IHTMLElement_Release(div);

1 0

Gabriel Ivăncescu : mshtml/tests: Fix form element leak in test_form_item.
by Alexandre Julliard July 7, 2023

July 7, 2023

Module: wine Branch: master Commit: f4f879955748065867345863cd53f7dcbf4a62ae URL: https://gitlab.winehq.org/wine/wine/-/commit/f4f879955748065867345863cd53f7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jul 7 17:25:04 2023 +0300 mshtml/tests: Fix form element leak in test_form_item. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/dom.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b593985e87f..81b1f87c6c5 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5782,6 +5782,8 @@ static void test_form_item(IHTMLElement *elem) ok(hres == S_FALSE, "Next failed: %08lx\n", hres); ok(fetched == 0, "fetched = %lu\n", fetched); IEnumVARIANT_Release(enum_var); + + IHTMLFormElement_Release(form); } static void test_create_option_elem(IHTMLDocument2 *doc)

1 0

Gabriel Ivăncescu : mshtml/tests: Fix element leak in test_elems.
by Alexandre Julliard July 7, 2023

July 7, 2023

Module: wine Branch: master Commit: dcd364609b72860e86630bfe5ace5a0cc01c040c URL: https://gitlab.winehq.org/wine/wine/-/commit/dcd364609b72860e86630bfe5ace5a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jul 7 17:25:04 2023 +0300 mshtml/tests: Fix element leak in test_elems. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/dom.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 07c4fec9bd8..b593985e87f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -9441,6 +9441,8 @@ static void test_elems(IHTMLDocument2 *doc) set_elem_language(elem, L"vbscript"); set_elem_language(elem, L"xxx"); + + IHTMLElement_Release(elem); } elem = get_elem_by_id(doc, L"in", TRUE);

1 0

Zebediah Figura : wined3d: Move struct wined3d_adapter_vk to wined3d_vk.h.
by Alexandre Julliard July 7, 2023

July 7, 2023

Module: wine Branch: master Commit: 45d271beed9afb02455408451ea8f96cab75b2ef URL: https://gitlab.winehq.org/wine/wine/-/commit/45d271beed9afb02455408451ea8f9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 15:19:07 2022 -0600 wined3d: Move struct wined3d_adapter_vk to wined3d_vk.h. --- dlls/wined3d/wined3d_private.h | 35 +++++------------------------------ dlls/wined3d/wined3d_vk.h | 26 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 20fb5ea0a2d..61847e3d5cb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2385,8 +2385,6 @@ void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context const struct wined3d_state *state) DECLSPEC_HIDDEN; void wined3d_context_gl_wait_command_fence(struct wined3d_context_gl *context_gl, uint64_t id) DECLSPEC_HIDDEN; -#include "wined3d_vk.h" - typedef void (*APPLYSTATEFUNC)(struct wined3d_context *ctx, const struct wined3d_state *state, DWORD state_id); struct wined3d_state_entry @@ -3188,6 +3186,9 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN; BOOL wined3d_get_primary_adapter_luid(LUID *luid) DECLSPEC_HIDDEN; +struct wined3d_adapter *wined3d_adapter_vk_create(unsigned int ordinal, + unsigned int wined3d_creation_flags) DECLSPEC_HIDDEN; + struct wined3d_adapter_gl { struct wined3d_adapter a; @@ -3209,32 +3210,6 @@ static inline const struct wined3d_adapter_gl *wined3d_adapter_gl_const(const st struct wined3d_adapter *wined3d_adapter_gl_create(unsigned int ordinal, unsigned int wined3d_creation_flags) DECLSPEC_HIDDEN; -struct wined3d_adapter_vk -{ - struct wined3d_adapter a; - - struct wined3d_vk_info vk_info; - unsigned int device_extension_count; - const char **device_extensions; - VkPhysicalDevice physical_device; - - VkPhysicalDeviceLimits device_limits; - VkPhysicalDeviceMemoryProperties memory_properties; -}; - -static inline struct wined3d_adapter_vk *wined3d_adapter_vk(struct wined3d_adapter *adapter) -{ - return CONTAINING_RECORD(adapter, struct wined3d_adapter_vk, a); -} - -struct wined3d_adapter *wined3d_adapter_vk_create(unsigned int ordinal, - unsigned int wined3d_creation_flags) DECLSPEC_HIDDEN; -unsigned int wined3d_adapter_vk_get_memory_type_index(const struct wined3d_adapter_vk *adapter_vk, - uint32_t memory_type_mask, VkMemoryPropertyFlags flags) DECLSPEC_HIDDEN; -void adapter_vk_copy_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *dst, - const struct wined3d_bo_address *src, - unsigned int range_count, const struct wined3d_range *ranges) DECLSPEC_HIDDEN; - struct wined3d_caps_gl_ctx { HDC dc; @@ -3254,8 +3229,6 @@ struct wined3d_caps_gl_ctx BOOL wined3d_adapter_gl_init_format_info(struct wined3d_adapter *adapter, struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; BOOL wined3d_adapter_no3d_init_format_info(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN; -BOOL wined3d_adapter_vk_init_format_info(struct wined3d_adapter_vk *adapter_vk, - const struct wined3d_vk_info *vk_info) DECLSPEC_HIDDEN; ssize_t adapter_adjust_mapped_memory(struct wined3d_adapter *adapter, ssize_t size) DECLSPEC_HIDDEN; UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) DECLSPEC_HIDDEN; @@ -3673,6 +3646,8 @@ static inline struct wined3d_device_no3d *wined3d_device_no3d(struct wined3d_dev return CONTAINING_RECORD(device, struct wined3d_device_no3d, d); } +#include "wined3d_vk.h" + struct wined3d_null_resources_vk { struct wined3d_bo_vk bo; diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 9eaddbf99c4..43b40889451 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -664,4 +664,30 @@ void wined3d_context_vk_wait_command_buffer(struct wined3d_context_vk *context_v VkDescriptorSet wined3d_context_vk_create_vk_descriptor_set(struct wined3d_context_vk *context_vk, VkDescriptorSetLayout vk_set_layout) DECLSPEC_HIDDEN; +struct wined3d_adapter_vk +{ + struct wined3d_adapter a; + + struct wined3d_vk_info vk_info; + unsigned int device_extension_count; + const char **device_extensions; + VkPhysicalDevice physical_device; + + VkPhysicalDeviceLimits device_limits; + VkPhysicalDeviceMemoryProperties memory_properties; +}; + +static inline struct wined3d_adapter_vk *wined3d_adapter_vk(struct wined3d_adapter *adapter) +{ + return CONTAINING_RECORD(adapter, struct wined3d_adapter_vk, a); +} + +void adapter_vk_copy_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *dst, + const struct wined3d_bo_address *src, + unsigned int range_count, const struct wined3d_range *ranges) DECLSPEC_HIDDEN; +unsigned int wined3d_adapter_vk_get_memory_type_index(const struct wined3d_adapter_vk *adapter_vk, + uint32_t memory_type_mask, VkMemoryPropertyFlags flags) DECLSPEC_HIDDEN; +BOOL wined3d_adapter_vk_init_format_info(struct wined3d_adapter_vk *adapter_vk, + const struct wined3d_vk_info *vk_info) DECLSPEC_HIDDEN; + #endif /* __WINE_WINED3D_VK */

1 0

Zebediah Figura : wined3d: Move struct wined3d_bo_vk to wined3d_vk.h.
by Alexandre Julliard July 7, 2023

July 7, 2023

Module: wine Branch: master Commit: 24ad12f322adab72e2df7ca6a27e6f50bba2c6bb URL: https://gitlab.winehq.org/wine/wine/-/commit/24ad12f322adab72e2df7ca6a27e6f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 15:09:30 2022 -0600 wined3d: Move struct wined3d_bo_vk to wined3d_vk.h. --- dlls/wined3d/wined3d_private.h | 47 +----------------------------------------- dlls/wined3d/wined3d_vk.h | 46 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2330ca66204..66a7ee9d711 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -54,7 +54,6 @@ #include "objbase.h" #include "wine/wined3d.h" #include "wined3d_gl.h" -#include "wined3d_vk.h" #include "wine/list.h" #include "wine/rbtree.h" #include "wine/wgl_driver.h" @@ -1715,51 +1714,7 @@ struct wined3d_bo_user bool valid; }; -struct wined3d_bo_vk -{ - struct wined3d_bo b; - - VkBuffer vk_buffer; - struct wined3d_allocator_block *memory; - struct wined3d_bo_slab_vk *slab; - - VkDeviceMemory vk_memory; - - VkDeviceSize size; - VkBufferUsageFlags usage; - VkMemoryPropertyFlags memory_type; - - uint64_t command_buffer_id; - bool host_synced; -}; - -static inline struct wined3d_bo_vk *wined3d_bo_vk(struct wined3d_bo *bo) -{ - return CONTAINING_RECORD(bo, struct wined3d_bo_vk, b); -} - -struct wined3d_bo_slab_vk_key -{ - VkMemoryPropertyFlags memory_type; - VkBufferUsageFlags usage; - VkDeviceSize size; -}; - -struct wined3d_bo_slab_vk -{ - struct wine_rb_entry entry; - struct wined3d_bo_slab_vk *next; - VkMemoryPropertyFlags requested_memory_type; - struct wined3d_bo_vk bo; - unsigned int map_count; - void *map_ptr; - uint32_t map; -}; - -void *wined3d_bo_slab_vk_map(struct wined3d_bo_slab_vk *slab_vk, - struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; -void wined3d_bo_slab_vk_unmap(struct wined3d_bo_slab_vk *slab_vk, - struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +#include "wined3d_vk.h" struct wined3d_bo_address { diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 1e7fbf57ada..0f074207807 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -248,4 +248,50 @@ VkBufferUsageFlags vk_buffer_usage_from_bind_flags(uint32_t bind_flags) DECLSPEC VkMemoryPropertyFlags vk_memory_type_from_access_flags(uint32_t access, uint32_t usage) DECLSPEC_HIDDEN; const char *wined3d_debug_vkresult(VkResult vr) DECLSPEC_HIDDEN; +struct wined3d_bo_vk +{ + struct wined3d_bo b; + + VkBuffer vk_buffer; + struct wined3d_allocator_block *memory; + struct wined3d_bo_slab_vk *slab; + + VkDeviceMemory vk_memory; + + VkDeviceSize size; + VkBufferUsageFlags usage; + VkMemoryPropertyFlags memory_type; + + uint64_t command_buffer_id; + bool host_synced; +}; + +static inline struct wined3d_bo_vk *wined3d_bo_vk(struct wined3d_bo *bo) +{ + return CONTAINING_RECORD(bo, struct wined3d_bo_vk, b); +} + +struct wined3d_bo_slab_vk_key +{ + VkMemoryPropertyFlags memory_type; + VkBufferUsageFlags usage; + VkDeviceSize size; +}; + +struct wined3d_bo_slab_vk +{ + struct wine_rb_entry entry; + struct wined3d_bo_slab_vk *next; + VkMemoryPropertyFlags requested_memory_type; + struct wined3d_bo_vk bo; + unsigned int map_count; + void *map_ptr; + uint32_t map; +}; + +void *wined3d_bo_slab_vk_map(struct wined3d_bo_slab_vk *slab_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +void wined3d_bo_slab_vk_unmap(struct wined3d_bo_slab_vk *slab_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; + #endif /* __WINE_WINED3D_VK */

1 0

Zebediah Figura : wined3d: Move struct wined3d_query_vk to wined3d_vk.h.
by Alexandre Julliard July 7, 2023

July 7, 2023

Module: wine Branch: master Commit: 0768013327938d270828fc1f1b53a84fc0ce6f33 URL: https://gitlab.winehq.org/wine/wine/-/commit/0768013327938d270828fc1f1b53a8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 15:11:15 2022 -0600 wined3d: Move struct wined3d_query_vk to wined3d_vk.h. --- dlls/wined3d/wined3d_private.h | 63 ++---------------------------------------- dlls/wined3d/wined3d_vk.h | 60 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 61 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c5e2a8eea2f..db7ff0e0fe5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2096,67 +2096,6 @@ struct wined3d_pipeline_statistics_query #define WINED3D_QUERY_POOL_SIZE 256 -#include "wined3d_vk.h" - -struct wined3d_query_pool_vk -{ - struct list entry; - struct list completed_entry; - - struct list *free_list; - VkQueryPool vk_query_pool; - VkEvent vk_event; - - uint32_t allocated[WINED3D_BITMAP_SIZE(WINED3D_QUERY_POOL_SIZE)]; - uint32_t completed[WINED3D_BITMAP_SIZE(WINED3D_QUERY_POOL_SIZE)]; -}; - -bool wined3d_query_pool_vk_allocate_query(struct wined3d_query_pool_vk *pool_vk, size_t *idx) DECLSPEC_HIDDEN; -void wined3d_query_pool_vk_mark_free(struct wined3d_context_vk *context_vk, struct wined3d_query_pool_vk *pool_vk, - uint32_t start, uint32_t count) DECLSPEC_HIDDEN; -void wined3d_query_pool_vk_cleanup(struct wined3d_query_pool_vk *pool_vk, - struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; -bool wined3d_query_pool_vk_init(struct wined3d_query_pool_vk *pool_vk, struct wined3d_context_vk *context_vk, - enum wined3d_query_type type, struct list *free_pools) DECLSPEC_HIDDEN; - -struct wined3d_query_pool_idx_vk -{ - struct wined3d_query_pool_vk *pool_vk; - size_t idx; -}; - -#define WINED3D_QUERY_VK_FLAG_ACTIVE 0x00000001 -#define WINED3D_QUERY_VK_FLAG_STARTED 0x00000002 -#define WINED3D_QUERY_VK_FLAG_RENDER_PASS 0x00000004 - -struct wined3d_query_vk -{ - struct wined3d_query q; - - struct list entry; - struct wined3d_query_pool_idx_vk pool_idx; - uint8_t flags; - uint64_t command_buffer_id; - uint32_t control_flags; - VkEvent vk_event; - SIZE_T pending_count, pending_size; - struct wined3d_query_pool_idx_vk *pending; -}; - -static inline struct wined3d_query_vk *wined3d_query_vk(struct wined3d_query *query) -{ - return CONTAINING_RECORD(query, struct wined3d_query_vk, q); -} - -struct wined3d_device_vk; - -bool wined3d_query_vk_accumulate_data(struct wined3d_query_vk *query_vk, struct wined3d_device_vk *device_vk, - const struct wined3d_query_pool_idx_vk *pool_idx) DECLSPEC_HIDDEN; -HRESULT wined3d_query_vk_create(struct wined3d_device *device, enum wined3d_query_type type, void *parent, - const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query) DECLSPEC_HIDDEN; -void wined3d_query_vk_resume(struct wined3d_query_vk *query_vk, struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; -void wined3d_query_vk_suspend(struct wined3d_query_vk *query_vk, struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; - struct wined3d_gl_view { GLenum target; @@ -2446,6 +2385,8 @@ void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context const struct wined3d_state *state) DECLSPEC_HIDDEN; void wined3d_context_gl_wait_command_fence(struct wined3d_context_gl *context_gl, uint64_t id) DECLSPEC_HIDDEN; +#include "wined3d_vk.h" + struct wined3d_command_buffer_vk { uint64_t id; diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 5d0ad6fda79..9fbe1f00d41 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -20,10 +20,13 @@ #define __WINE_WINED3D_VK_H #include "stdint.h" +#include "wine/list.h" #include "wine/wined3d.h" #define VK_NO_PROTOTYPES #include "wine/vulkan.h" +struct wined3d_device_vk; + #define VK_INSTANCE_FUNCS() \ VK_INSTANCE_PFN(vkCreateDevice) \ VK_INSTANCE_PFN(vkDestroyInstance) \ @@ -302,4 +305,61 @@ struct wined3d_image_vk uint64_t command_buffer_id; }; +struct wined3d_query_pool_vk +{ + struct list entry; + struct list completed_entry; + + struct list *free_list; + VkQueryPool vk_query_pool; + VkEvent vk_event; + + uint32_t allocated[WINED3D_BITMAP_SIZE(WINED3D_QUERY_POOL_SIZE)]; + uint32_t completed[WINED3D_BITMAP_SIZE(WINED3D_QUERY_POOL_SIZE)]; +}; + +bool wined3d_query_pool_vk_allocate_query(struct wined3d_query_pool_vk *pool_vk, size_t *idx) DECLSPEC_HIDDEN; +void wined3d_query_pool_vk_mark_free(struct wined3d_context_vk *context_vk, struct wined3d_query_pool_vk *pool_vk, + uint32_t start, uint32_t count) DECLSPEC_HIDDEN; +void wined3d_query_pool_vk_cleanup(struct wined3d_query_pool_vk *pool_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +bool wined3d_query_pool_vk_init(struct wined3d_query_pool_vk *pool_vk, struct wined3d_context_vk *context_vk, + enum wined3d_query_type type, struct list *free_pools) DECLSPEC_HIDDEN; + +struct wined3d_query_pool_idx_vk +{ + struct wined3d_query_pool_vk *pool_vk; + size_t idx; +}; + +#define WINED3D_QUERY_VK_FLAG_ACTIVE 0x00000001 +#define WINED3D_QUERY_VK_FLAG_STARTED 0x00000002 +#define WINED3D_QUERY_VK_FLAG_RENDER_PASS 0x00000004 + +struct wined3d_query_vk +{ + struct wined3d_query q; + + struct list entry; + struct wined3d_query_pool_idx_vk pool_idx; + uint8_t flags; + uint64_t command_buffer_id; + uint32_t control_flags; + VkEvent vk_event; + SIZE_T pending_count, pending_size; + struct wined3d_query_pool_idx_vk *pending; +}; + +static inline struct wined3d_query_vk *wined3d_query_vk(struct wined3d_query *query) +{ + return CONTAINING_RECORD(query, struct wined3d_query_vk, q); +} + +bool wined3d_query_vk_accumulate_data(struct wined3d_query_vk *query_vk, struct wined3d_device_vk *device_vk, + const struct wined3d_query_pool_idx_vk *pool_idx) DECLSPEC_HIDDEN; +HRESULT wined3d_query_vk_create(struct wined3d_device *device, enum wined3d_query_type type, void *parent, + const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query) DECLSPEC_HIDDEN; +void wined3d_query_vk_resume(struct wined3d_query_vk *query_vk, struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +void wined3d_query_vk_suspend(struct wined3d_query_vk *query_vk, struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; + #endif /* __WINE_WINED3D_VK */

1 0

Zebediah Figura : wined3d: Move struct wined3d_context_vk to wined3d_vk.h.
by Alexandre Julliard July 7, 2023

July 7, 2023

Module: wine Branch: master Commit: 6698ec90aa652bc6a95fe3eb7851865e4c165c96 URL: https://gitlab.winehq.org/wine/wine/-/commit/6698ec90aa652bc6a95fe3eb785186… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 15:16:04 2022 -0600 wined3d: Move struct wined3d_context_vk to wined3d_vk.h. --- dlls/wined3d/wined3d_private.h | 302 ----------------------------------------- dlls/wined3d/wined3d_vk.h | 302 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 302 insertions(+), 302 deletions(-)

1 0

Zebediah Figura : wined3d: Move struct wined3d_image_vk to wined3d_vk.h.
by Alexandre Julliard July 7, 2023

July 7, 2023

Module: wine Branch: master Commit: 972a782fd0807ed6028ad0db39823bc026532589 URL: https://gitlab.winehq.org/wine/wine/-/commit/972a782fd0807ed6028ad0db39823b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 15:10:20 2022 -0600 wined3d: Move struct wined3d_image_vk to wined3d_vk.h. --- dlls/wined3d/wined3d_private.h | 12 ++---------- dlls/wined3d/wined3d_vk.h | 8 ++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 66a7ee9d711..c5e2a8eea2f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1714,8 +1714,6 @@ struct wined3d_bo_user bool valid; }; -#include "wined3d_vk.h" - struct wined3d_bo_address { struct wined3d_bo *buffer_object; @@ -1733,14 +1731,6 @@ static inline struct wined3d_const_bo_address *wined3d_const_bo_address(const st return (struct wined3d_const_bo_address *)data; } -struct wined3d_image_vk -{ - VkImage vk_image; - struct wined3d_allocator_block *memory; - VkDeviceMemory vk_memory; - uint64_t command_buffer_id; -}; - struct wined3d_stream_info_element { const struct wined3d_format *format; @@ -2106,6 +2096,8 @@ struct wined3d_pipeline_statistics_query #define WINED3D_QUERY_POOL_SIZE 256 +#include "wined3d_vk.h" + struct wined3d_query_pool_vk { struct list entry; diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 0f074207807..5d0ad6fda79 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -294,4 +294,12 @@ void *wined3d_bo_slab_vk_map(struct wined3d_bo_slab_vk *slab_vk, void wined3d_bo_slab_vk_unmap(struct wined3d_bo_slab_vk *slab_vk, struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +struct wined3d_image_vk +{ + VkImage vk_image; + struct wined3d_allocator_block *memory; + VkDeviceMemory vk_memory; + uint64_t command_buffer_id; +}; + #endif /* __WINE_WINED3D_VK */

1 0