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

Gabriel Ivăncescu : mshtml/tests: Fix DispatchEx leak in test set_dispex_value.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: e7f19883b34f6e8080fa8b54f6e7d7e86734b9cb URL: https://gitlab.winehq.org/wine/wine/-/commit/e7f19883b34f6e8080fa8b54f6e7d7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jul 7 17:25:05 2023 +0300 mshtml/tests: Fix DispatchEx leak in test set_dispex_value. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/dom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 34172c9156e..4b7782aa0d2 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -810,7 +810,7 @@ static void _set_dispex_value(unsigned line, IUnknown *unk, const WCHAR *name, V memset(&ei, 0, sizeof(ei)); hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, INVOKE_PROPERTYPUT, &dp, NULL, &ei, NULL); ok_(__FILE__,line)(hres == S_OK, "InvokeEx failed: %08lx\n", hres); - + IDispatchEx_Release(dispex); } #define get_elem_iface(u) _get_elem_iface(__LINE__,u)

1 0

Gabriel Ivăncescu : mshtml/tests: Fix anchor element leaks in test helpers.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: 4fc1d8ee3614f47bf8b9331f4235a5fe933d0f39 URL: https://gitlab.winehq.org/wine/wine/-/commit/4fc1d8ee3614f47bf8b9331f4235a5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jul 7 17:25:05 2023 +0300 mshtml/tests: Fix anchor element leaks in test helpers. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/dom.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4b7782aa0d2..a15ae34bc50 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1550,6 +1550,7 @@ static void _test_anchor_href(unsigned line, IUnknown *unk, const WCHAR *exhref) hres = IHTMLAnchorElement_get_href(anchor, &str); ok_(__FILE__,line)(hres == S_OK, "get_href failed: %08lx\n", hres); ok_(__FILE__,line)(!lstrcmpW(str, exhref), "href = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(exhref)); + IHTMLAnchorElement_Release(anchor); SysFreeString(str); _test_disp_value(line, unk, exhref); @@ -1565,6 +1566,7 @@ static void _test_anchor_put_href(unsigned line, IUnknown *unk, const WCHAR *exh str = SysAllocString(exhref); hres = IHTMLAnchorElement_put_href(anchor, str); ok_(__FILE__,line)(hres == S_OK, "get_href failed: %08lx\n", hres); + IHTMLAnchorElement_Release(anchor); SysFreeString(str); _test_disp_value(line, unk, exhref); @@ -1583,6 +1585,7 @@ static void _test_anchor_rel(unsigned line, IUnknown *unk, const WCHAR *exrel) ok_(__FILE__,line)(!lstrcmpW(str, exrel), "rel = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(exrel)); else ok_(__FILE__,line)(!str, "rel = %s, expected NULL\n", wine_dbgstr_w(str)); + IHTMLAnchorElement_Release(anchor); SysFreeString(str); } @@ -1596,6 +1599,7 @@ static void _test_anchor_put_rel(unsigned line, IUnknown *unk, const WCHAR *exre str = SysAllocString(exrel); hres = IHTMLAnchorElement_put_rel(anchor, str); ok_(__FILE__,line)(hres == S_OK, "get_rel failed: %08lx\n", hres); + IHTMLAnchorElement_Release(anchor); SysFreeString(str); } @@ -1612,6 +1616,7 @@ static void _test_anchor_get_target(unsigned line, IUnknown *unk, const WCHAR *t ok_(__FILE__,line)(!lstrcmpW(str, target), "target = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(target)); else ok_(__FILE__,line)(str == NULL, "target = %s, expected NULL\n", wine_dbgstr_w(str)); + IHTMLAnchorElement_Release(anchor); SysFreeString(str); } @@ -1625,6 +1630,7 @@ static void _test_anchor_put_target(unsigned line, IUnknown *unk, const WCHAR *t str = target ? SysAllocString(target) : NULL; hres = IHTMLAnchorElement_put_target(anchor, str); ok_(__FILE__,line)(hres == S_OK, "put_target failed: %08lx\n", hres); + IHTMLAnchorElement_Release(anchor); SysFreeString(str); } @@ -1641,6 +1647,7 @@ static void _test_anchor_name(unsigned line, IUnknown *unk, const WCHAR *name) ok_(__FILE__,line)(!lstrcmpW(str, name), "name = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(name)); else ok_(__FILE__,line)(str == NULL, "name = %s, expected NULL\n", wine_dbgstr_w(str)); + IHTMLAnchorElement_Release(anchor); SysFreeString(str); } @@ -1654,6 +1661,7 @@ static void _test_anchor_put_name(unsigned line, IUnknown *unk, const WCHAR *nam str = name ? SysAllocString(name) : NULL; hres = IHTMLAnchorElement_put_name(anchor, str); ok_(__FILE__,line)(hres == S_OK, "put_name failed: %08lx\n", hres); + IHTMLAnchorElement_Release(anchor); SysFreeString(str); _test_anchor_name(line, unk, name); @@ -1672,6 +1680,7 @@ static void _test_anchor_hostname(unsigned line, IUnknown *unk, const WCHAR *hos ok_(__FILE__,line)(!lstrcmpW(str, hostname), "hostname = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(hostname)); else ok_(__FILE__,line)(str == NULL, "hostname = %s, expected NULL\n", wine_dbgstr_w(str)); + IHTMLAnchorElement_Release(anchor); SysFreeString(str); } @@ -1688,6 +1697,7 @@ static void _test_anchor_port(unsigned line, IUnknown *unk, const WCHAR *port) ok_(__FILE__,line)(!lstrcmpW(str, port), "port = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(port)); else ok_(__FILE__,line)(str == NULL, "port = %s, expected NULL\n", wine_dbgstr_w(str)); + IHTMLAnchorElement_Release(anchor); SysFreeString(str); } @@ -1706,6 +1716,7 @@ static void _test_anchor_search(unsigned line, IUnknown *elem, const WCHAR *sear ok_(__FILE__,line)(!lstrcmpW(str, search), "search = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(search)); else ok_(__FILE__,line)(!str, "search = %s, expected NULL\n", wine_dbgstr_w(str)); + IHTMLAnchorElement_Release(anchor); SysFreeString(str); } @@ -1719,6 +1730,7 @@ static void _test_anchor_put_search(unsigned line, IUnknown *unk, const WCHAR *s str = search ? SysAllocString(search) : NULL; hres = IHTMLAnchorElement_put_search(anchor, str); ok_(__FILE__,line)(hres == S_OK, "put_search failed: %08lx\n", hres); + IHTMLAnchorElement_Release(anchor); SysFreeString(str); } @@ -1735,6 +1747,7 @@ static void _test_anchor_hash(unsigned line, IHTMLElement *elem, const WCHAR *ex ok_(__FILE__,line)(!lstrcmpW(str, exhash), "hash = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(exhash)); else ok_(__FILE__,line)(!str, "hash = %s, expected NULL\n", wine_dbgstr_w(str)); + IHTMLAnchorElement_Release(anchor); SysFreeString(str); }

1 0

Gabriel Ivăncescu : mshtml/tests: Fix area element leaks in test helpers.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: 26e5166c9d764b1b64dec50f05b12ccc698c1095 URL: https://gitlab.winehq.org/wine/wine/-/commit/26e5166c9d764b1b64dec50f05b12c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jul 7 17:25:05 2023 +0300 mshtml/tests: Fix area element leaks in test helpers. 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 a15ae34bc50..c97124b043c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1761,6 +1761,7 @@ static void _test_area_href(unsigned line, IUnknown *unk, const WCHAR *exhref) hres = IHTMLAreaElement_get_href(area, &str); ok_(__FILE__,line)(hres == S_OK, "get_href failed: %08lx\n", hres); ok_(__FILE__,line)(!lstrcmpW(str, exhref), "href = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(exhref)); + IHTMLAreaElement_Release(area); SysFreeString(str); _test_disp_value(line, unk, exhref); @@ -1776,6 +1777,7 @@ static void _test_area_put_href(unsigned line, IUnknown *unk, const WCHAR *exhre str = SysAllocString(exhref); hres = IHTMLAreaElement_put_href(area, str); ok_(__FILE__,line)(hres == S_OK, "get_href failed: %08lx\n", hres); + IHTMLAreaElement_Release(area); SysFreeString(str); _test_disp_value(line, unk, exhref);

1 0

Gabriel Ivăncescu : mshtml/tests: Fix image element leaks in test helpers.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: 815d0f1d24e1f1d52812076af448636dae793d40 URL: https://gitlab.winehq.org/wine/wine/-/commit/815d0f1d24e1f1d52812076af44863… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jul 7 17:25:05 2023 +0300 mshtml/tests: Fix image element leaks in test helpers. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/dom.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c97124b043c..b7079447cf2 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3503,6 +3503,7 @@ static void _test_img_alt(unsigned line, IUnknown *unk, const WCHAR *exalt) ok_(__FILE__,line) (!lstrcmpW(alt, exalt), "unexpected alt %s\n", wine_dbgstr_w(alt)); else ok_(__FILE__,line) (!alt, "alt != NULL\n"); + IHTMLImgElement_Release(img); SysFreeString(alt); } @@ -3516,6 +3517,7 @@ static void _test_img_set_alt(unsigned line, IUnknown *unk, const WCHAR *alt) tmp = SysAllocString(alt); hres = IHTMLImgElement_put_alt(img, tmp); ok_(__FILE__,line) (hres == S_OK, "get_alt failed: %08lx\n", hres); + IHTMLImgElement_Release(img); SysFreeString(tmp); _test_img_alt(line, unk, alt); @@ -3536,6 +3538,7 @@ static void _test_img_align(unsigned line, IUnknown *unk, const WCHAR *align) hres = IHTMLImgElement_get_align(img, &tmp); ok_(__FILE__,line) (hres == S_OK, "put_align failed: %08lx\n", hres); ok_(__FILE__,line) (!lstrcmpW(tmp, align), "Expect %s, got %s\n", wine_dbgstr_w(align), wine_dbgstr_w(tmp)); + IHTMLImgElement_Release(img); SysFreeString(tmp); }

1 0

Alexandre Julliard : Release 8.12.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: aaf304f2441ebe52834fdda2b8a02a5349d2ca43 URL: https://gitlab.winehq.org/wine/wine/-/commit/aaf304f2441ebe52834fdda2b8a02a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 7 22:20:15 2023 +0200 Release 8.12. --- ANNOUNCE | 775 +++++++++++++++++++++++++++++++++++++------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 478 insertions(+), 321 deletions(-)

1 0

Piotr Caban : gdi32: Fix DIB_PAL_INDICES usage handling in EMR_CREATEMONOBRUSH playback.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: ef7b1839846d3ed3d4ebf826f92d50dbf52b29df URL: https://gitlab.winehq.org/wine/wine/-/commit/ef7b1839846d3ed3d4ebf826f92d50… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 7 14:17:34 2023 +0200 gdi32: Fix DIB_PAL_INDICES usage handling in EMR_CREATEMONOBRUSH playback. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55177 --- dlls/gdi32/enhmetafile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index b6b51e3483a..12449ecfdf0 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1848,7 +1848,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( /* Need to check if the bitmap is monochrome, and if the two colors are really black and white */ - if (is_dib_monochrome(pbi)) + if (pCreateMonoBrush->iUsage == DIB_PAL_INDICES || is_dib_monochrome(pbi)) { /* Top-down DIBs have a negative height */ LONG height = pbi->bmiHeader.biHeight;

1 0

Zebediah Figura : wined3d: Move some definitions to wined3d_vk.h.
by Alexandre Julliard 07 Jul '23

07 Jul '23

Module: wine Branch: master Commit: 45a49d11ebd004596bafc719ecda459ecd9e8dad URL: https://gitlab.winehq.org/wine/wine/-/commit/45a49d11ebd004596bafc719ecda45… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 15:06:52 2022 -0600 wined3d: Move some definitions to wined3d_vk.h. --- dlls/wined3d/wined3d_private.h | 16 ---------------- dlls/wined3d/wined3d_vk.h | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 22182c0507e..2330ca66204 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -341,22 +341,7 @@ extern const GLenum magLookup[WINED3D_TEXF_LINEAR + 1] DECLSPEC_HIDDEN; static const uint32_t WINED3D_READ_ONLY_BIND_MASK = WINED3D_BIND_VERTEX_BUFFER | WINED3D_BIND_INDEX_BUFFER | WINED3D_BIND_CONSTANT_BUFFER | WINED3D_BIND_SHADER_RESOURCE | WINED3D_BIND_INDIRECT_BUFFER; -static const VkAccessFlags WINED3D_READ_ONLY_ACCESS_FLAGS = VK_ACCESS_INDIRECT_COMMAND_READ_BIT - | VK_ACCESS_INDEX_READ_BIT | VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT | VK_ACCESS_UNIFORM_READ_BIT - | VK_ACCESS_INPUT_ATTACHMENT_READ_BIT | VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_READ_BIT - | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | VK_ACCESS_TRANSFER_READ_BIT | VK_ACCESS_HOST_READ_BIT - | VK_ACCESS_MEMORY_READ_BIT; - GLenum wined3d_gl_compare_func(enum wined3d_cmp_func f) DECLSPEC_HIDDEN; -VkAccessFlags vk_access_mask_from_bind_flags(uint32_t bind_flags) DECLSPEC_HIDDEN; -VkCompareOp vk_compare_op_from_wined3d(enum wined3d_cmp_func op) DECLSPEC_HIDDEN; -VkImageViewType vk_image_view_type_from_wined3d(enum wined3d_resource_type type, uint32_t flags) DECLSPEC_HIDDEN; -VkPipelineStageFlags vk_pipeline_stage_mask_from_bind_flags(uint32_t bind_flags) DECLSPEC_HIDDEN; -VkShaderStageFlagBits vk_shader_stage_from_wined3d(enum wined3d_shader_type shader_type) DECLSPEC_HIDDEN; -VkAccessFlags vk_access_mask_from_buffer_usage(VkBufferUsageFlags usage) DECLSPEC_HIDDEN; -VkPipelineStageFlags vk_pipeline_stage_mask_from_buffer_usage(VkBufferUsageFlags usage) DECLSPEC_HIDDEN; -VkBufferUsageFlags vk_buffer_usage_from_bind_flags(uint32_t bind_flags) DECLSPEC_HIDDEN; -VkMemoryPropertyFlags vk_memory_type_from_access_flags(uint32_t access, uint32_t usage) DECLSPEC_HIDDEN; static inline enum wined3d_cmp_func wined3d_sanitize_cmp_func(enum wined3d_cmp_func func) { @@ -4366,7 +4351,6 @@ const char *wined3d_debug_resource_access(uint32_t access) DECLSPEC_HIDDEN; const char *wined3d_debug_bind_flags(uint32_t bind_flags) DECLSPEC_HIDDEN; const char *wined3d_debug_view_desc(const struct wined3d_view_desc *d, const struct wined3d_resource *resource) DECLSPEC_HIDDEN; -const char *wined3d_debug_vkresult(VkResult vr) DECLSPEC_HIDDEN; static inline ULONG wined3d_atomic_decrement_mutex_lock(volatile LONG *refcount) { diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 9135cff9143..1e7fbf57ada 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -19,6 +19,8 @@ #ifndef __WINE_WINED3D_VK_H #define __WINE_WINED3D_VK_H +#include "stdint.h" +#include "wine/wined3d.h" #define VK_NO_PROTOTYPES #include "wine/vulkan.h" @@ -229,4 +231,21 @@ struct wined3d_vk_info #define VK_CALL(f) (vk_info->vk_ops.f) +static const VkAccessFlags WINED3D_READ_ONLY_ACCESS_FLAGS = VK_ACCESS_INDIRECT_COMMAND_READ_BIT + | VK_ACCESS_INDEX_READ_BIT | VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT | VK_ACCESS_UNIFORM_READ_BIT + | VK_ACCESS_INPUT_ATTACHMENT_READ_BIT | VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_READ_BIT + | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | VK_ACCESS_TRANSFER_READ_BIT | VK_ACCESS_HOST_READ_BIT + | VK_ACCESS_MEMORY_READ_BIT; + +VkAccessFlags vk_access_mask_from_bind_flags(uint32_t bind_flags) DECLSPEC_HIDDEN; +VkCompareOp vk_compare_op_from_wined3d(enum wined3d_cmp_func op) DECLSPEC_HIDDEN; +VkImageViewType vk_image_view_type_from_wined3d(enum wined3d_resource_type type, uint32_t flags) DECLSPEC_HIDDEN; +VkPipelineStageFlags vk_pipeline_stage_mask_from_bind_flags(uint32_t bind_flags) DECLSPEC_HIDDEN; +VkShaderStageFlagBits vk_shader_stage_from_wined3d(enum wined3d_shader_type shader_type) DECLSPEC_HIDDEN; +VkAccessFlags vk_access_mask_from_buffer_usage(VkBufferUsageFlags usage) DECLSPEC_HIDDEN; +VkPipelineStageFlags vk_pipeline_stage_mask_from_buffer_usage(VkBufferUsageFlags usage) DECLSPEC_HIDDEN; +VkBufferUsageFlags vk_buffer_usage_from_bind_flags(uint32_t bind_flags) DECLSPEC_HIDDEN; +VkMemoryPropertyFlags vk_memory_type_from_access_flags(uint32_t access, uint32_t usage) DECLSPEC_HIDDEN; +const char *wined3d_debug_vkresult(VkResult vr) DECLSPEC_HIDDEN; + #endif /* __WINE_WINED3D_VK */

1 0

Zebediah Figura : wined3d: Move struct wined3d_bo_vk to wined3d_vk.h.
by Alexandre Julliard 07 Jul '23

07 Jul '23

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_image_vk to wined3d_vk.h.
by Alexandre Julliard 07 Jul '23

07 Jul '23

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

Zebediah Figura : wined3d: Move struct wined3d_query_vk to wined3d_vk.h.
by Alexandre Julliard 07 Jul '23

07 Jul '23

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