wine-devel July 2018

wine-devel@winehq.org

74 participants
637 discussions

The future of WineConf
by Henri Verbeet 16 Jul '18

16 Jul '18

We touched on this during WineConf a little already, but were slightly short on time. With most people back from travel and the videos starting to get published, now seems like a good time to continue that conversation. Key points from the previous conversation: - We have several offers for hosting WineConf 2019. In no particular order: - Kiev, Ukraine, by Arthur Hil - Bali, Indonesia, by Aric Stewart - Vilnius, Lithuania, by Ričardas Barkauskas - Japan, by Alexandre Julliard - Toronto, Canada, by Ulrich Czekalla - Minnesota, United States of America, by Jeremy White - Austin, Texas, United States of America, by Austin English Most of those are longer standing ones; Kiev, Bali and Japan are new this year. There's an argument for holding WineConf somewhere other than Europe and the United States after 16 years, although travel costs are also a consideration. Another fact worth pointing out in this context is that September 12, 2019 would be the 25th anniversary of Alexandre's maintainership of Wine. - The time of year this time seems to have been generally well-received. - Samathy proposed having a Code of Conduct for the conference. While, to my knowledge, there has never been an instance where one would have been needed, and hopefully that will continue to be the case in the future, it seems prudent to me to have one. - The CFP could have been more formal/explicit. - General discussion slots are still considered useful. We'd like to preserve those. Other points I'd like to bring up: - What did people think of the A/V recording? Was that a good thing, and something we should continue to keep improving? Or is the consensus that it's intrusive and not worth bothering with? - I think there was a sentiment, at least with some people, that 2-3 days was fairly short and we weren't quite done discussing things yet. Would it perhaps make sense to extend the conference by a day in the future an include e.g. Monday as well? - Should we put more effort into attracting external (e.g., from the broader Free Software community, and people/organisations using Wine) speakers? We'd like to hear your feedback on these points, as well as your general feedback about which things you liked and would like to keep seeing in the future, and which things you disliked. If there's any feedback you'd rather not give in public, you can of course always simply send me a private e-mail as well. Henri

6 8

[PATCH v2 1/2] user32: Fix menu item rectangle calculation in GetMenuItemRect().
by Zhiyi Zhang 16 Jul '18

16 Jul '18

This fixes the menu of BibleWorks 10 not showing up and some todo in tests. Sysmenu is in non-client area. And because MapWindowPoints() should not be used with non-client area coordinates. Doing so results in wrong coordinates for sysmenu item rectangles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/menu.c | 10 +++++- dlls/user32/tests/menu.c | 67 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 71 insertions(+), 6 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index ab1ae9bc1b..27e6430cc5 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -5306,6 +5306,7 @@ BOOL WINAPI GetMenuItemRect(HWND hwnd, HMENU hMenu, UINT uItem, RECT *rect) { POPUPMENU *menu; UINT pos; + RECT window_rect; TRACE("(%p,%p,%d,%p)\n", hwnd, hMenu, uItem, rect); @@ -5326,7 +5327,14 @@ BOOL WINAPI GetMenuItemRect(HWND hwnd, HMENU hMenu, UINT uItem, RECT *rect) OffsetRect(rect, menu->items_rect.left, menu->items_rect.top); release_menu_ptr(menu); - MapWindowPoints(hwnd, 0, (POINT *)rect, 2); + /* Popup menu item draws in the client area */ + if (menu->wFlags & MF_POPUP) MapWindowPoints(hwnd, 0, (POINT *)rect, 2); + /* Sysmenu draws in the non-client area, can't use MapWindowPoints in non-client area */ + else + { + GetWindowRect(hwnd, &window_rect); + OffsetRect(rect, window_rect.left, window_rect.top); + } return TRUE; } diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 7f338ce9b1..54a5ea232a 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -341,6 +341,62 @@ static void test_getmenubarinfo(void) DestroyWindow(hwnd); } +static void test_GetMenuItemRect(void) +{ + HWND hwnd; + HMENU hmenu; + HMENU popup_hmenu; + RECT window_rect; + RECT item_rect; + POINT client_top_left; + INT caption_height; + BOOL ret; + + hwnd = CreateWindowW((LPCWSTR)MAKEINTATOM(atomMenuCheckClass), NULL, WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, NULL, + NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed with error %d\n", GetLastError()); + hmenu = CreateMenu(); + ok(hmenu != NULL, "CreateMenu failed with error %d\n", GetLastError()); + popup_hmenu = CreatePopupMenu(); + ok(popup_hmenu != NULL, "CreatePopupMenu failed with error %d\n", GetLastError()); + ret = AppendMenuA(popup_hmenu, MF_STRING, 0, "Popup"); + ok(ret, "AppendMenu failed with error %d\n", GetLastError()); + ret = AppendMenuA(hmenu, MF_STRING | MF_POPUP, (UINT_PTR)popup_hmenu, "Menu"); + ok(ret, "AppendMenu failed with error %d\n", GetLastError()); + ret = SetMenu(hwnd, hmenu); + ok(ret, "SetMenu failed with error %d\n", GetLastError()); + + /* Get the menu item rectangle of the displayed sysmenu item */ + ret = GetMenuItemRect(hwnd, hmenu, 0, &item_rect); + ok(ret, "GetMenuItemRect failed with error %d\n", GetLastError()); + GetWindowRect(hwnd, &window_rect); + /* Get the screen coordinate of the left top corner of the client rectangle */ + client_top_left.x = 0; + client_top_left.y = 0; + MapWindowPoints(hwnd, 0, &client_top_left, 1); + caption_height = GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYCAPTION); + + ok(item_rect.left == client_top_left.x, "Expect item_rect.left %d == %d\n", item_rect.left, client_top_left.x); + ok(item_rect.right <= window_rect.right, "Expect item_rect.right %d <= %d\n", item_rect.right, window_rect.right); + /* A gap of 1 pixel is added deliberately in commit 75f9e64, so using equal operator would fail on Wine. + * Check that top and bottom are correct with 1 pixel margin tolerance */ + ok(item_rect.top - (window_rect.top + caption_height) <= 1, "Expect item_rect.top %d - %d <= 1\n", item_rect.top, + window_rect.top + caption_height); + ok(item_rect.bottom - (client_top_left.y - 1) <= 1, "Expect item_rect.bottom %d - %d <= 1\n", item_rect.bottom, + client_top_left.y - 1); + + /* Get the item rectangle of the not yet displayed popup menu item. */ + ret = GetMenuItemRect(hwnd, popup_hmenu, 0, &item_rect); + ok(ret, "GetMenuItemRect failed with error %d\n", GetLastError()); + ok(item_rect.left == client_top_left.x, "Expect item_rect.left %d == %d\n", item_rect.left, client_top_left.x); + ok(item_rect.right == client_top_left.x, "Expect item_rect.right %d == %d\n", item_rect.right, client_top_left.x); + ok(item_rect.top == client_top_left.y, "Expect item_rect.top %d == %d\n", item_rect.top, client_top_left.y); + ok(item_rect.bottom == client_top_left.y, "Expect item_rect.bottom %d == %d\n", item_rect.bottom, + client_top_left.y); + + DestroyWindow(hwnd); +} + static void test_system_menu(void) { WCHAR testW[] = {'t','e','s','t',0}; @@ -2188,15 +2244,15 @@ static struct menu_mouse_tests_s { { INPUT_KEYBOARD, {{0}}, {VK_F10, 0}, TRUE, FALSE }, { INPUT_KEYBOARD, {{0}}, {VK_F10, 0}, FALSE, FALSE }, - { INPUT_MOUSE, {{1, 2}, {0}}, {0}, TRUE, TRUE }, /* test 20 */ + { INPUT_MOUSE, {{1, 2}, {0}}, {0}, TRUE, FALSE }, /* test 20 */ { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE }, - { INPUT_MOUSE, {{1, 0}, {0}}, {0}, TRUE, TRUE }, + { INPUT_MOUSE, {{1, 0}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE }, - { INPUT_MOUSE, {{1, 0}, {2, 2}, {0}}, {0}, TRUE, TRUE }, + { INPUT_MOUSE, {{1, 0}, {2, 2}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{2, 1}, {0}}, {0}, FALSE, FALSE }, - { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, TRUE }, + { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{3, 0}, {0}}, {0}, FALSE, FALSE }, - { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, TRUE }, + { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{3, 1}, {0}}, {0}, TRUE, TRUE }, { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE }, { -1 } @@ -4199,6 +4255,7 @@ START_TEST(menu) test_subpopup_locked_by_menu(); test_menu_ownerdraw(); test_getmenubarinfo(); + test_GetMenuItemRect(); test_menu_bmp_and_string(); test_menu_getmenuinfo(); test_menu_setmenuinfo(); -- 2.18.0

3 4

[PATCH v3 2/2] user32/tests: Sleep when sending mouse clicks too fast.
by Zhiyi Zhang 16 Jul '18

16 Jul '18

A thread is used to send test data. If the thread sends mouse clicks before pop-up menu initialization, it would report send input failure and skip the tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/menu.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 54a5ea232a..41c5e15ced 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2253,7 +2253,7 @@ static struct menu_mouse_tests_s { { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{3, 0}, {0}}, {0}, FALSE, FALSE }, { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, FALSE }, - { INPUT_MOUSE, {{3, 1}, {0}}, {0}, TRUE, TRUE }, + { INPUT_MOUSE, {{3, 1}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE }, { -1 } }; @@ -2307,7 +2307,7 @@ static DWORD WINAPI test_menu_input_thread(LPVOID lpParameter) for (i = 0; menu_tests[i].type != -1; i++) { BOOL ret = TRUE; - int elapsed = 0; + int elapsed; got_input = i && menu_tests[i-1].bMenuVisible; @@ -2316,7 +2316,16 @@ static DWORD WINAPI test_menu_input_thread(LPVOID lpParameter) send_key(menu_tests[i].wVk[j]); else for (j = 0; menu_tests[i].menu_item_pairs[j].uMenu != 0; j++) - if (!(ret = click_menu(hWnd, &menu_tests[i].menu_item_pairs[j]))) break; + { + /* Maybe clicking too fast before menu is initialized. Sleep 100 ms and retry */ + elapsed = 0; + while (!(ret = click_menu(hWnd, &menu_tests[i].menu_item_pairs[j]))) + { + if (elapsed > 1000) break; + elapsed += 100; + Sleep(100); + } + } if (!ret) { @@ -2324,6 +2333,8 @@ static DWORD WINAPI test_menu_input_thread(LPVOID lpParameter) PostMessageA( hWnd, WM_CANCELMODE, 0, 0 ); return 0; } + + elapsed = 0; while (menu_tests[i].bMenuVisible != bMenuVisible) { if (elapsed > 200) -- 2.18.0

1 0

[PATCH v3 1/2] user32: Fix menu item rectangle calculation in GetMenuItemRect().
by Zhiyi Zhang 16 Jul '18

16 Jul '18

This fixes the menu of BibleWorks 10 not showing up and some todo in tests. Sysmenu is in non-client area. And because MapWindowPoints() should not be used with non-client area coordinates. Doing so results in wrong coordinates for sysmenu item rectangles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v3: Fix the accessing menu pointer after it got released. Sorry I missed that. dlls/user32/menu.c | 13 ++++++-- dlls/user32/tests/menu.c | 67 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 73 insertions(+), 7 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index ab1ae9bc1b..1fd3cc4a12 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -5306,6 +5306,7 @@ BOOL WINAPI GetMenuItemRect(HWND hwnd, HMENU hMenu, UINT uItem, RECT *rect) { POPUPMENU *menu; UINT pos; + RECT window_rect; TRACE("(%p,%p,%d,%p)\n", hwnd, hMenu, uItem, rect); @@ -5324,9 +5325,17 @@ BOOL WINAPI GetMenuItemRect(HWND hwnd, HMENU hMenu, UINT uItem, RECT *rect) *rect = menu->items[pos].rect; OffsetRect(rect, menu->items_rect.left, menu->items_rect.top); - release_menu_ptr(menu); - MapWindowPoints(hwnd, 0, (POINT *)rect, 2); + /* Popup menu item draws in the client area */ + if (menu->wFlags & MF_POPUP) MapWindowPoints(hwnd, 0, (POINT *)rect, 2); + /* Sysmenu draws in the non-client area, can't use MapWindowPoints in non-client area */ + else + { + GetWindowRect(hwnd, &window_rect); + OffsetRect(rect, window_rect.left, window_rect.top); + } + + release_menu_ptr(menu); return TRUE; } diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 7f338ce9b1..54a5ea232a 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -341,6 +341,62 @@ static void test_getmenubarinfo(void) DestroyWindow(hwnd); } +static void test_GetMenuItemRect(void) +{ + HWND hwnd; + HMENU hmenu; + HMENU popup_hmenu; + RECT window_rect; + RECT item_rect; + POINT client_top_left; + INT caption_height; + BOOL ret; + + hwnd = CreateWindowW((LPCWSTR)MAKEINTATOM(atomMenuCheckClass), NULL, WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, NULL, + NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed with error %d\n", GetLastError()); + hmenu = CreateMenu(); + ok(hmenu != NULL, "CreateMenu failed with error %d\n", GetLastError()); + popup_hmenu = CreatePopupMenu(); + ok(popup_hmenu != NULL, "CreatePopupMenu failed with error %d\n", GetLastError()); + ret = AppendMenuA(popup_hmenu, MF_STRING, 0, "Popup"); + ok(ret, "AppendMenu failed with error %d\n", GetLastError()); + ret = AppendMenuA(hmenu, MF_STRING | MF_POPUP, (UINT_PTR)popup_hmenu, "Menu"); + ok(ret, "AppendMenu failed with error %d\n", GetLastError()); + ret = SetMenu(hwnd, hmenu); + ok(ret, "SetMenu failed with error %d\n", GetLastError()); + + /* Get the menu item rectangle of the displayed sysmenu item */ + ret = GetMenuItemRect(hwnd, hmenu, 0, &item_rect); + ok(ret, "GetMenuItemRect failed with error %d\n", GetLastError()); + GetWindowRect(hwnd, &window_rect); + /* Get the screen coordinate of the left top corner of the client rectangle */ + client_top_left.x = 0; + client_top_left.y = 0; + MapWindowPoints(hwnd, 0, &client_top_left, 1); + caption_height = GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYCAPTION); + + ok(item_rect.left == client_top_left.x, "Expect item_rect.left %d == %d\n", item_rect.left, client_top_left.x); + ok(item_rect.right <= window_rect.right, "Expect item_rect.right %d <= %d\n", item_rect.right, window_rect.right); + /* A gap of 1 pixel is added deliberately in commit 75f9e64, so using equal operator would fail on Wine. + * Check that top and bottom are correct with 1 pixel margin tolerance */ + ok(item_rect.top - (window_rect.top + caption_height) <= 1, "Expect item_rect.top %d - %d <= 1\n", item_rect.top, + window_rect.top + caption_height); + ok(item_rect.bottom - (client_top_left.y - 1) <= 1, "Expect item_rect.bottom %d - %d <= 1\n", item_rect.bottom, + client_top_left.y - 1); + + /* Get the item rectangle of the not yet displayed popup menu item. */ + ret = GetMenuItemRect(hwnd, popup_hmenu, 0, &item_rect); + ok(ret, "GetMenuItemRect failed with error %d\n", GetLastError()); + ok(item_rect.left == client_top_left.x, "Expect item_rect.left %d == %d\n", item_rect.left, client_top_left.x); + ok(item_rect.right == client_top_left.x, "Expect item_rect.right %d == %d\n", item_rect.right, client_top_left.x); + ok(item_rect.top == client_top_left.y, "Expect item_rect.top %d == %d\n", item_rect.top, client_top_left.y); + ok(item_rect.bottom == client_top_left.y, "Expect item_rect.bottom %d == %d\n", item_rect.bottom, + client_top_left.y); + + DestroyWindow(hwnd); +} + static void test_system_menu(void) { WCHAR testW[] = {'t','e','s','t',0}; @@ -2188,15 +2244,15 @@ static struct menu_mouse_tests_s { { INPUT_KEYBOARD, {{0}}, {VK_F10, 0}, TRUE, FALSE }, { INPUT_KEYBOARD, {{0}}, {VK_F10, 0}, FALSE, FALSE }, - { INPUT_MOUSE, {{1, 2}, {0}}, {0}, TRUE, TRUE }, /* test 20 */ + { INPUT_MOUSE, {{1, 2}, {0}}, {0}, TRUE, FALSE }, /* test 20 */ { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE }, - { INPUT_MOUSE, {{1, 0}, {0}}, {0}, TRUE, TRUE }, + { INPUT_MOUSE, {{1, 0}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE }, - { INPUT_MOUSE, {{1, 0}, {2, 2}, {0}}, {0}, TRUE, TRUE }, + { INPUT_MOUSE, {{1, 0}, {2, 2}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{2, 1}, {0}}, {0}, FALSE, FALSE }, - { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, TRUE }, + { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{3, 0}, {0}}, {0}, FALSE, FALSE }, - { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, TRUE }, + { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{3, 1}, {0}}, {0}, TRUE, TRUE }, { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE }, { -1 } @@ -4199,6 +4255,7 @@ START_TEST(menu) test_subpopup_locked_by_menu(); test_menu_ownerdraw(); test_getmenubarinfo(); + test_GetMenuItemRect(); test_menu_bmp_and_string(); test_menu_getmenuinfo(); test_menu_setmenuinfo(); -- 2.18.0

1 0

[PATCH 2/2] msvcp110: Add _Syserror_map implementation
by Piotr Caban 16 Jul '18

16 Jul '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp110/msvcp110.spec | 4 +- dlls/msvcp120/msvcp120.spec | 4 +- dlls/msvcp120_app/msvcp120_app.spec | 4 +- dlls/msvcp140/msvcp140.spec | 4 +- dlls/msvcp90/misc.c | 186 ++++++++++++++++++++++++++++++++++++ 5 files changed, 194 insertions(+), 8 deletions(-)

1 0

[PATCH 1/2] include/msvcrt: Add POSIX error codes to errno.h
by Piotr Caban 16 Jul '18

16 Jul '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- include/msvcrt/errno.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+)

1 0

[PATCH 5/5] winevulkan: Generate get_vulkan_driver_*_proc_addr() helper functions.
by Józef Kucia 16 Jul '18

16 Jul '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winemac.drv/vulkan.c | 62 ----------------------------------------- dlls/winevulkan/make_vulkan | 32 ++++++++++++++++++++- dlls/winex11.drv/vulkan.c | 66 -------------------------------------------- include/wine/vulkan_driver.h | 63 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 94 insertions(+), 129 deletions(-) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index 3f704544c865..b1211dff5448 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -488,73 +488,11 @@ static const struct vulkan_funcs vulkan_funcs = macdrv_vkQueuePresentKHR, }; -static void *get_vulkan_driver_device_proc_addr(const struct vulkan_funcs *vulkan_funcs, - const char *name) -{ - if (!name || name[0] != 'v' || name[1] != 'k') - return NULL; - - name += 2; - - if (!strcmp(name, "CreateSwapchainKHR")) - return vulkan_funcs->p_vkCreateSwapchainKHR; - if (!strcmp(name, "DestroySwapchainKHR")) - return vulkan_funcs->p_vkDestroySwapchainKHR; - if (!strcmp(name, "GetDeviceProcAddr")) - return vulkan_funcs->p_vkGetDeviceProcAddr; - if (!strcmp(name, "GetSwapchainImagesKHR")) - return vulkan_funcs->p_vkGetSwapchainImagesKHR; - if (!strcmp(name, "QueuePresentKHR")) - return vulkan_funcs->p_vkQueuePresentKHR; - - return NULL; -} - static void *macdrv_get_vk_device_proc_addr(const char *name) { return get_vulkan_driver_device_proc_addr(&vulkan_funcs, name); } -static void *get_vulkan_driver_instance_proc_addr(const struct vulkan_funcs *vulkan_funcs, - VkInstance instance, const char *name) -{ - if (!name || name[0] != 'v' || name[1] != 'k') - return NULL; - - name += 2; - - if (!strcmp(name, "CreateInstance")) - return vulkan_funcs->p_vkCreateInstance; - if (!strcmp(name, "EnumerateInstanceExtensionProperties")) - return vulkan_funcs->p_vkEnumerateInstanceExtensionProperties; - - if (!instance) - return NULL; - - if (!strcmp(name, "CreateWin32SurfaceKHR")) - return vulkan_funcs->p_vkCreateWin32SurfaceKHR; - if (!strcmp(name, "DestroyInstance")) - return vulkan_funcs->p_vkDestroyInstance; - if (!strcmp(name, "DestroySurfaceKHR")) - return vulkan_funcs->p_vkDestroySurfaceKHR; - if (!strcmp(name, "GetInstanceProcAddr")) - return vulkan_funcs->p_vkGetInstanceProcAddr; - if (!strcmp(name, "GetPhysicalDeviceSurfaceCapabilitiesKHR")) - return vulkan_funcs->p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR; - if (!strcmp(name, "GetPhysicalDeviceSurfaceFormatsKHR")) - return vulkan_funcs->p_vkGetPhysicalDeviceSurfaceFormatsKHR; - if (!strcmp(name, "GetPhysicalDeviceSurfacePresentModesKHR")) - return vulkan_funcs->p_vkGetPhysicalDeviceSurfacePresentModesKHR; - if (!strcmp(name, "GetPhysicalDeviceSurfaceSupportKHR")) - return vulkan_funcs->p_vkGetPhysicalDeviceSurfaceSupportKHR; - if (!strcmp(name, "GetPhysicalDeviceWin32PresentationSupportKHR")) - return vulkan_funcs->p_vkGetPhysicalDeviceWin32PresentationSupportKHR; - - name -= 2; - - return get_vulkan_driver_device_proc_addr(vulkan_funcs, name); -} - static void *macdrv_get_vk_instance_proc_addr(VkInstance instance, const char *name) { return get_vulkan_driver_instance_proc_addr(&vulkan_funcs, instance, name); diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 7ab92dc940bf..a7dc040a6de4 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2235,7 +2235,7 @@ class VkGenerator(object): f.write(" */\n") for vk_func in self.registry.funcs.values(): - if not vk_func.is_required() or not vk_func.is_driver_func(): + if not vk_func.is_driver_func(): continue pfn = vk_func.pfn() @@ -2246,6 +2246,36 @@ class VkGenerator(object): f.write("};\n\n") f.write("extern const struct vulkan_funcs * CDECL __wine_get_vulkan_driver(HDC hdc, UINT version);\n\n") + + f.write("static inline void *get_vulkan_driver_device_proc_addr(\n") + f.write(" const struct vulkan_funcs *vulkan_funcs, const char *name)\n{\n") + f.write(" if (!name || name[0] != 'v' || name[1] != 'k') return NULL;\n\n") + f.write(" name += 2;\n\n") + for vk_func in self.registry.funcs.values(): + if vk_func.is_driver_func() and vk_func.is_device_func(): + f.write(' if (!strcmp(name, "{0}"))\n'.format(vk_func.name[2:])) + f.write(' return vulkan_funcs->p_{0};\n'.format(vk_func.name)) + f.write("\n") + f.write(" return NULL;\n}\n\n") + + f.write("static inline void *get_vulkan_driver_instance_proc_addr(\n") + f.write(" const struct vulkan_funcs *vulkan_funcs, VkInstance instance, const char *name)\n{\n") + f.write(" if (!name || name[0] != 'v' || name[1] != 'k') return NULL;\n\n") + f.write(" name += 2;\n\n") + for vk_func in self.registry.funcs.values(): + if vk_func.is_driver_func() and vk_func.is_global_func() and vk_func.name != "vkGetInstanceProcAddr": + f.write(' if (!strcmp(name, "{0}"))\n'.format(vk_func.name[2:])) + f.write(' return vulkan_funcs->p_{0};\n'.format(vk_func.name)) + f.write("\n") + f.write(" if (!instance) return NULL;\n\n") + for vk_func in self.registry.funcs.values(): + if vk_func.is_driver_func() and vk_func.is_instance_func(): + f.write(' if (!strcmp(name, "{0}"))\n'.format(vk_func.name[2:])) + f.write(' return vulkan_funcs->p_{0};\n'.format(vk_func.name)) + f.write("\n") + f.write(" name -= 2;\n\n") + f.write(" return get_vulkan_driver_device_proc_addr(vulkan_funcs, name);\n}\n\n") + f.write("#endif /* __WINE_VULKAN_DRIVER_H */\n") def generate_vulkan_spec(self, f): diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index e0d576b144fd..f9eea74d1bde 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -540,77 +540,11 @@ static const struct vulkan_funcs vulkan_funcs = X11DRV_vkQueuePresentKHR, }; -static void *get_vulkan_driver_device_proc_addr(const struct vulkan_funcs *vulkan_funcs, - const char *name) -{ - if (!name || name[0] != 'v' || name[1] != 'k') - return NULL; - - name += 2; - - if (!strcmp(name, "CreateSwapchainKHR")) - return vulkan_funcs->p_vkCreateSwapchainKHR; - if (!strcmp(name, "DestroySwapchainKHR")) - return vulkan_funcs->p_vkDestroySwapchainKHR; - if (!strcmp(name, "GetDeviceGroupSurfacePresentModesKHR")) - return vulkan_funcs->p_vkGetDeviceGroupSurfacePresentModesKHR; - if (!strcmp(name, "GetDeviceProcAddr")) - return vulkan_funcs->p_vkGetDeviceProcAddr; - if (!strcmp(name, "GetSwapchainImagesKHR")) - return vulkan_funcs->p_vkGetSwapchainImagesKHR; - if (!strcmp(name, "QueuePresentKHR")) - return vulkan_funcs->p_vkQueuePresentKHR; - - return NULL; -} - static void *X11DRV_get_vk_device_proc_addr(const char *name) { return get_vulkan_driver_device_proc_addr(&vulkan_funcs, name); } -static void *get_vulkan_driver_instance_proc_addr(const struct vulkan_funcs *vulkan_funcs, - VkInstance instance, const char *name) -{ - if (!name || name[0] != 'v' || name[1] != 'k') - return NULL; - - name += 2; - - if (!strcmp(name, "CreateInstance")) - return vulkan_funcs->p_vkCreateInstance; - if (!strcmp(name, "EnumerateInstanceExtensionProperties")) - return vulkan_funcs->p_vkEnumerateInstanceExtensionProperties; - - if (!instance) - return NULL; - - if (!strcmp(name, "CreateWin32SurfaceKHR")) - return vulkan_funcs->p_vkCreateWin32SurfaceKHR; - if (!strcmp(name, "DestroyInstance")) - return vulkan_funcs->p_vkDestroyInstance; - if (!strcmp(name, "DestroySurfaceKHR")) - return vulkan_funcs->p_vkDestroySurfaceKHR; - if (!strcmp(name, "GetInstanceProcAddr")) - return vulkan_funcs->p_vkGetInstanceProcAddr; - if (!strcmp(name, "GetPhysicalDevicePresentRectanglesKHR")) - return vulkan_funcs->p_vkGetPhysicalDevicePresentRectanglesKHR; - if (!strcmp(name, "GetPhysicalDeviceSurfaceCapabilitiesKHR")) - return vulkan_funcs->p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR; - if (!strcmp(name, "GetPhysicalDeviceSurfaceFormatsKHR")) - return vulkan_funcs->p_vkGetPhysicalDeviceSurfaceFormatsKHR; - if (!strcmp(name, "GetPhysicalDeviceSurfacePresentModesKHR")) - return vulkan_funcs->p_vkGetPhysicalDeviceSurfacePresentModesKHR; - if (!strcmp(name, "GetPhysicalDeviceSurfaceSupportKHR")) - return vulkan_funcs->p_vkGetPhysicalDeviceSurfaceSupportKHR; - if (!strcmp(name, "GetPhysicalDeviceWin32PresentationSupportKHR")) - return vulkan_funcs->p_vkGetPhysicalDeviceWin32PresentationSupportKHR; - - name -= 2; - - return get_vulkan_driver_device_proc_addr(vulkan_funcs, name); -} - static void *X11DRV_get_vk_instance_proc_addr(VkInstance instance, const char *name) { return get_vulkan_driver_instance_proc_addr(&vulkan_funcs, instance, name); diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index d009f12832f3..a5bc50325c7d 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -69,4 +69,67 @@ struct vulkan_funcs extern const struct vulkan_funcs * CDECL __wine_get_vulkan_driver(HDC hdc, UINT version); +static inline void *get_vulkan_driver_device_proc_addr( + const struct vulkan_funcs *vulkan_funcs, const char *name) +{ + if (!name || name[0] != 'v' || name[1] != 'k') return NULL; + + name += 2; + + if (!strcmp(name, "CreateSwapchainKHR")) + return vulkan_funcs->p_vkCreateSwapchainKHR; + if (!strcmp(name, "DestroySwapchainKHR")) + return vulkan_funcs->p_vkDestroySwapchainKHR; + if (!strcmp(name, "GetDeviceGroupSurfacePresentModesKHR")) + return vulkan_funcs->p_vkGetDeviceGroupSurfacePresentModesKHR; + if (!strcmp(name, "GetDeviceProcAddr")) + return vulkan_funcs->p_vkGetDeviceProcAddr; + if (!strcmp(name, "GetSwapchainImagesKHR")) + return vulkan_funcs->p_vkGetSwapchainImagesKHR; + if (!strcmp(name, "QueuePresentKHR")) + return vulkan_funcs->p_vkQueuePresentKHR; + + return NULL; +} + +static inline void *get_vulkan_driver_instance_proc_addr( + const struct vulkan_funcs *vulkan_funcs, VkInstance instance, const char *name) +{ + if (!name || name[0] != 'v' || name[1] != 'k') return NULL; + + name += 2; + + if (!strcmp(name, "CreateInstance")) + return vulkan_funcs->p_vkCreateInstance; + if (!strcmp(name, "EnumerateInstanceExtensionProperties")) + return vulkan_funcs->p_vkEnumerateInstanceExtensionProperties; + + if (!instance) return NULL; + + if (!strcmp(name, "CreateWin32SurfaceKHR")) + return vulkan_funcs->p_vkCreateWin32SurfaceKHR; + if (!strcmp(name, "DestroyInstance")) + return vulkan_funcs->p_vkDestroyInstance; + if (!strcmp(name, "DestroySurfaceKHR")) + return vulkan_funcs->p_vkDestroySurfaceKHR; + if (!strcmp(name, "GetInstanceProcAddr")) + return vulkan_funcs->p_vkGetInstanceProcAddr; + if (!strcmp(name, "GetPhysicalDevicePresentRectanglesKHR")) + return vulkan_funcs->p_vkGetPhysicalDevicePresentRectanglesKHR; + if (!strcmp(name, "GetPhysicalDeviceSurfaceCapabilitiesKHR")) + return vulkan_funcs->p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR; + if (!strcmp(name, "GetPhysicalDeviceSurfaceFormatsKHR")) + return vulkan_funcs->p_vkGetPhysicalDeviceSurfaceFormatsKHR; + if (!strcmp(name, "GetPhysicalDeviceSurfacePresentModesKHR")) + return vulkan_funcs->p_vkGetPhysicalDeviceSurfacePresentModesKHR; + if (!strcmp(name, "GetPhysicalDeviceSurfaceSupportKHR")) + return vulkan_funcs->p_vkGetPhysicalDeviceSurfaceSupportKHR; + if (!strcmp(name, "GetPhysicalDeviceWin32PresentationSupportKHR")) + return vulkan_funcs->p_vkGetPhysicalDeviceWin32PresentationSupportKHR; + + name -= 2; + + return get_vulkan_driver_device_proc_addr(vulkan_funcs, name); +} + #endif /* __WINE_VULKAN_DRIVER_H */ -- 2.16.4

1 0

[PATCH 4/5] winemac: Add missing entries to vulkan_funcs.
by Józef Kucia 16 Jul '18

16 Jul '18

MoltenVK doesn't implement VK_KHR_device_group. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- It should fix build with MoltenVK (conflict between 10035f1b974235e09db8c81d24855ab547f8d5fc and 960e52e12fb9d6384c293d727bb14c0d439757fe). It wasn't even compile-tested. --- dlls/winemac.drv/vulkan.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index 4d1e4964bbb4..3f704544c865 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -475,8 +475,10 @@ static const struct vulkan_funcs vulkan_funcs = macdrv_vkDestroySurfaceKHR, macdrv_vkDestroySwapchainKHR, macdrv_vkEnumerateInstanceExtensionProperties, + NULL, macdrv_vkGetDeviceProcAddr, macdrv_vkGetInstanceProcAddr, + NULL, macdrv_vkGetPhysicalDeviceSurfaceCapabilitiesKHR, macdrv_vkGetPhysicalDeviceSurfaceFormatsKHR, macdrv_vkGetPhysicalDeviceSurfacePresentModesKHR, -- 2.16.4

1 0

[PATCH 3/5] winevulkan: Remove vkAcquireNextImageKHR() from Vulkan driver functions.
by Józef Kucia 16 Jul '18

16 Jul '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 6 +++--- dlls/winemac.drv/vulkan.c | 15 --------------- dlls/winevulkan/make_vulkan | 3 +-- dlls/winex11.drv/vulkan.c | 15 --------------- include/wine/vulkan_driver.h | 3 +-- 5 files changed, 5 insertions(+), 37 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index ae7bde73995c..90f72d06e87a 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1526,7 +1526,6 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkDevice vk_device) return FALSE; } - dxgi->p_vkAcquireNextImageKHR = vk->p_vkAcquireNextImageKHR; dxgi->p_vkCreateSwapchainKHR = vk->p_vkCreateSwapchainKHR; dxgi->p_vkCreateWin32SurfaceKHR = vk->p_vkCreateWin32SurfaceKHR; dxgi->p_vkDestroySurfaceKHR = vk->p_vkDestroySurfaceKHR; @@ -1547,10 +1546,11 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkDevice vk_device) ERR("Failed to get device proc "#name".\n"); \ return FALSE; \ } + LOAD_DEVICE_PFN(vkAcquireNextImageKHR) LOAD_DEVICE_PFN(vkCreateFence) - LOAD_DEVICE_PFN(vkWaitForFences) - LOAD_DEVICE_PFN(vkResetFences) LOAD_DEVICE_PFN(vkDestroyFence) + LOAD_DEVICE_PFN(vkResetFences) + LOAD_DEVICE_PFN(vkWaitForFences) #undef LOAD_DEVICE_PFN return TRUE; diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index d590903310c5..4d1e4964bbb4 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -63,7 +63,6 @@ typedef struct VkMacOSSurfaceCreateInfoMVK const void *pView; /* NSView */ } VkMacOSSurfaceCreateInfoMVK; -static VkResult (*pvkAcquireNextImageKHR)(VkDevice, VkSwapchainKHR, uint64_t, VkSemaphore, VkFence, uint32_t *); static VkResult (*pvkCreateInstance)(const VkInstanceCreateInfo *, const VkAllocationCallbacks *, VkInstance *); static VkResult (*pvkCreateSwapchainKHR)(VkDevice, const VkSwapchainCreateInfoKHR *, const VkAllocationCallbacks *, VkSwapchainKHR *); static VkResult (*pvkCreateMacOSSurfaceMVK)(VkInstance, const VkMacOSSurfaceCreateInfoMVK*, const VkAllocationCallbacks *, VkSurfaceKHR *); @@ -99,7 +98,6 @@ static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) } #define LOAD_FUNCPTR(f) if ((p##f = wine_dlsym(vulkan_handle, #f, NULL, 0)) == NULL) goto fail; - LOAD_FUNCPTR(vkAcquireNextImageKHR) LOAD_FUNCPTR(vkCreateInstance) LOAD_FUNCPTR(vkCreateSwapchainKHR) LOAD_FUNCPTR(vkCreateMacOSSurfaceMVK) @@ -190,16 +188,6 @@ static void wine_vk_surface_destroy(VkInstance instance, struct wine_vk_surface heap_free(surface); } -static VkResult macdrv_vkAcquireNextImageKHR(VkDevice device, VkSwapchainKHR swapchain, - uint64_t timeout, VkSemaphore semaphore, VkFence fence, uint32_t *index) -{ - TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %p\n", device, - wine_dbgstr_longlong(swapchain), wine_dbgstr_longlong(timeout), - wine_dbgstr_longlong(semaphore), wine_dbgstr_longlong(fence), index); - - return pvkAcquireNextImageKHR(device, swapchain, timeout, semaphore, fence, index); -} - static VkResult macdrv_vkCreateInstance(const VkInstanceCreateInfo *create_info, const VkAllocationCallbacks *allocator, VkInstance *instance) { @@ -480,7 +468,6 @@ static VkResult macdrv_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR * static const struct vulkan_funcs vulkan_funcs = { - macdrv_vkAcquireNextImageKHR, macdrv_vkCreateInstance, macdrv_vkCreateSwapchainKHR, macdrv_vkCreateWin32SurfaceKHR, @@ -507,8 +494,6 @@ static void *get_vulkan_driver_device_proc_addr(const struct vulkan_funcs *vulka name += 2; - if (!strcmp(name, "AcquireNextImageKHR")) - return vulkan_funcs->p_vkAcquireNextImageKHR; if (!strcmp(name, "CreateSwapchainKHR")) return vulkan_funcs->p_vkCreateSwapchainKHR; if (!strcmp(name, "DestroySwapchainKHR")) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3432e4f3b360..7ab92dc940bf 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -130,7 +130,7 @@ CORE_EXTENSIONS = [ # Functions part of our winevulkan graphics driver interface. # DRIVER_VERSION should be bumped on any change to driver interface # in FUNCTION_OVERRIDES -DRIVER_VERSION = 6 +DRIVER_VERSION = 7 # Table of functions for which we have a special implementation. # These are regular device / instance functions for which we need @@ -176,7 +176,6 @@ FUNCTION_OVERRIDES = { "vkGetPhysicalDeviceWin32PresentationSupportKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, # VK_KHR_swapchain - "vkAcquireNextImageKHR": {"dispatch" : True, "driver" : True, "thunk" : True}, "vkCreateSwapchainKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, "vkDestroySwapchainKHR" : {"dispatch" : True, "driver" : True, "thunk" : True}, "vkGetSwapchainImagesKHR": {"dispatch" : True, "driver" : True, "thunk" : True}, diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 93c3065c0593..e0d576b144fd 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -74,7 +74,6 @@ typedef struct VkXlibSurfaceCreateInfoKHR Window window; } VkXlibSurfaceCreateInfoKHR; -static VkResult (*pvkAcquireNextImageKHR)(VkDevice, VkSwapchainKHR, uint64_t, VkSemaphore, VkFence, uint32_t *); static VkResult (*pvkCreateInstance)(const VkInstanceCreateInfo *, const VkAllocationCallbacks *, VkInstance *); static VkResult (*pvkCreateSwapchainKHR)(VkDevice, const VkSwapchainCreateInfoKHR *, const VkAllocationCallbacks *, VkSwapchainKHR *); static VkResult (*pvkCreateXlibSurfaceKHR)(VkInstance, const VkXlibSurfaceCreateInfoKHR *, const VkAllocationCallbacks *, VkSurfaceKHR *); @@ -114,7 +113,6 @@ static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) #define LOAD_FUNCPTR(f) if (!(p##f = wine_dlsym(vulkan_handle, #f, NULL, 0))) goto fail; #define LOAD_OPTIONAL_FUNCPTR(f) p##f = wine_dlsym(vulkan_handle, #f, NULL, 0); - LOAD_FUNCPTR(vkAcquireNextImageKHR) LOAD_FUNCPTR(vkCreateInstance) LOAD_FUNCPTR(vkCreateSwapchainKHR) LOAD_FUNCPTR(vkCreateXlibSurfaceKHR) @@ -223,16 +221,6 @@ void wine_vk_surface_destroy(HWND hwnd) LeaveCriticalSection(&context_section); } -static VkResult X11DRV_vkAcquireNextImageKHR(VkDevice device, VkSwapchainKHR swapchain, - uint64_t timeout, VkSemaphore semaphore, VkFence fence, uint32_t *index) -{ - TRACE("%p, 0x%s, 0x%s, 0x%s, 0x%s, %p\n", device, - wine_dbgstr_longlong(swapchain), wine_dbgstr_longlong(timeout), - wine_dbgstr_longlong(semaphore), wine_dbgstr_longlong(fence), index); - - return pvkAcquireNextImageKHR(device, swapchain, timeout, semaphore, fence, index); -} - static VkResult X11DRV_vkCreateInstance(const VkInstanceCreateInfo *create_info, const VkAllocationCallbacks *allocator, VkInstance *instance) { @@ -532,7 +520,6 @@ static VkResult X11DRV_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR * static const struct vulkan_funcs vulkan_funcs = { - X11DRV_vkAcquireNextImageKHR, X11DRV_vkCreateInstance, X11DRV_vkCreateSwapchainKHR, X11DRV_vkCreateWin32SurfaceKHR, @@ -561,8 +548,6 @@ static void *get_vulkan_driver_device_proc_addr(const struct vulkan_funcs *vulka name += 2; - if (!strcmp(name, "AcquireNextImageKHR")) - return vulkan_funcs->p_vkAcquireNextImageKHR; if (!strcmp(name, "CreateSwapchainKHR")) return vulkan_funcs->p_vkCreateSwapchainKHR; if (!strcmp(name, "DestroySwapchainKHR")) diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index 790d63076d39..d009f12832f3 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -39,7 +39,7 @@ #define __WINE_VULKAN_DRIVER_H /* Wine internal vulkan driver version, needs to be bumped upon vulkan_funcs changes. */ -#define WINE_VULKAN_DRIVER_VERSION 6 +#define WINE_VULKAN_DRIVER_VERSION 7 struct vulkan_funcs { @@ -47,7 +47,6 @@ struct vulkan_funcs * needs to provide. Other function calls will be provided indirectly by dispatch * tables part of dispatchable Vulkan objects such as VkInstance or vkDevice. */ - VkResult (*p_vkAcquireNextImageKHR)(VkDevice, VkSwapchainKHR, uint64_t, VkSemaphore, VkFence, uint32_t *); VkResult (*p_vkCreateInstance)(const VkInstanceCreateInfo *, const VkAllocationCallbacks *, VkInstance *); VkResult (*p_vkCreateSwapchainKHR)(VkDevice, const VkSwapchainCreateInfoKHR *, const VkAllocationCallbacks *, VkSwapchainKHR *); VkResult (*p_vkCreateWin32SurfaceKHR)(VkInstance, const VkWin32SurfaceCreateInfoKHR *, const VkAllocationCallbacks *, VkSurfaceKHR *); -- 2.16.4

1 0

[PATCH 2/5] winevulkan: Remove vkEnumerateInstanceVersion() from Vulkan driver functions.
by Józef Kucia 16 Jul '18

16 Jul '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 4 ++-- dlls/winevulkan/vulkan.c | 16 +++++++++++++++- dlls/winex11.drv/vulkan.c | 18 ------------------ include/wine/vulkan_driver.h | 3 +-- 4 files changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index e922203ef40a..3432e4f3b360 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -130,7 +130,7 @@ CORE_EXTENSIONS = [ # Functions part of our winevulkan graphics driver interface. # DRIVER_VERSION should be bumped on any change to driver interface # in FUNCTION_OVERRIDES -DRIVER_VERSION = 5 +DRIVER_VERSION = 6 # Table of functions for which we have a special implementation. # These are regular device / instance functions for which we need @@ -144,7 +144,7 @@ FUNCTION_OVERRIDES = { # Global functions "vkCreateInstance" : {"dispatch" : False, "driver" : True, "thunk" : False}, "vkEnumerateInstanceExtensionProperties" : {"dispatch" : False, "driver" : True, "thunk" : False}, - "vkEnumerateInstanceVersion": {"dispatch" : False, "driver" : True, "thunk" : False}, + "vkEnumerateInstanceVersion": {"dispatch" : False, "driver" : False, "thunk" : False}, "vkGetInstanceProcAddr": {"dispatch" : False, "driver" : True, "thunk" : False}, # Instance functions diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index cb73e1c1c3a0..4d2e39fa5053 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -58,6 +58,7 @@ static void *wine_vk_find_struct_(void *s, VkStructureType t) static void *wine_vk_get_global_proc_addr(const char *name); static const struct vulkan_funcs *vk_funcs; +static VkResult (*p_vkEnumerateInstanceVersion)(uint32_t *version); static void wine_vk_physical_device_free(struct VkPhysicalDevice_T *phys_dev) { @@ -322,6 +323,8 @@ static BOOL wine_vk_init(void) return FALSE; } + p_vkEnumerateInstanceVersion = vk_funcs->p_vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion"); + return TRUE; } @@ -849,7 +852,16 @@ VkResult WINAPI wine_vkEnumerateInstanceVersion(uint32_t *version) TRACE("%p\n", version); - res = vk_funcs->p_vkEnumerateInstanceVersion(version); + if (p_vkEnumerateInstanceVersion) + { + res = p_vkEnumerateInstanceVersion(version); + } + else + { + *version = VK_API_VERSION_1_0; + res = VK_SUCCESS; + } + TRACE("API version %u.%u.%u.\n", VK_VERSION_MAJOR(*version), VK_VERSION_MINOR(*version), VK_VERSION_PATCH(*version)); *version = min(WINE_VK_VERSION, *version); @@ -1117,6 +1129,8 @@ VkResult WINAPI wine_vkEnumeratePhysicalDeviceGroupsKHR(VkInstance instance, BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) { + TRACE("%p, %u, %p\n", hinst, reason, reserved); + switch (reason) { case DLL_PROCESS_ATTACH: diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 58c08ad81803..93c3065c0593 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -82,7 +82,6 @@ static void (*pvkDestroyInstance)(VkInstance, const VkAllocationCallbacks *); static void (*pvkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); static void (*pvkDestroySwapchainKHR)(VkDevice, VkSwapchainKHR, const VkAllocationCallbacks *); static VkResult (*pvkEnumerateInstanceExtensionProperties)(const char *, uint32_t *, VkExtensionProperties *); -static VkResult (*pvkEnumerateInstanceVersion)(uint32_t *); static VkResult (*pvkGetDeviceGroupSurfacePresentModesKHR)(VkDevice, VkSurfaceKHR, VkDeviceGroupPresentModeFlagsKHR *); static void * (*pvkGetDeviceProcAddr)(VkDevice, const char *); static void * (*pvkGetInstanceProcAddr)(VkInstance, const char *); @@ -132,7 +131,6 @@ static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) LOAD_FUNCPTR(vkGetPhysicalDeviceXlibPresentationSupportKHR) LOAD_FUNCPTR(vkGetSwapchainImagesKHR) LOAD_FUNCPTR(vkQueuePresentKHR) - LOAD_OPTIONAL_FUNCPTR(vkEnumerateInstanceVersion) LOAD_OPTIONAL_FUNCPTR(vkGetDeviceGroupSurfacePresentModesKHR) LOAD_OPTIONAL_FUNCPTR(vkGetPhysicalDevicePresentRectanglesKHR) #undef LOAD_FUNCPTR @@ -426,19 +424,6 @@ static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_ return res; } -static VkResult X11DRV_vkEnumerateInstanceVersion(uint32_t *version) -{ - TRACE("%p\n", version); - - if (!pvkEnumerateInstanceVersion) - { - *version = VK_API_VERSION_1_0; - return VK_SUCCESS; - } - - return pvkEnumerateInstanceVersion(version); -} - static VkResult X11DRV_vkGetDeviceGroupSurfacePresentModesKHR(VkDevice device, VkSurfaceKHR surface, VkDeviceGroupPresentModeFlagsKHR *flags) { @@ -555,7 +540,6 @@ static const struct vulkan_funcs vulkan_funcs = X11DRV_vkDestroySurfaceKHR, X11DRV_vkDestroySwapchainKHR, X11DRV_vkEnumerateInstanceExtensionProperties, - X11DRV_vkEnumerateInstanceVersion, X11DRV_vkGetDeviceGroupSurfacePresentModesKHR, X11DRV_vkGetDeviceProcAddr, X11DRV_vkGetInstanceProcAddr, @@ -612,8 +596,6 @@ static void *get_vulkan_driver_instance_proc_addr(const struct vulkan_funcs *vul return vulkan_funcs->p_vkCreateInstance; if (!strcmp(name, "EnumerateInstanceExtensionProperties")) return vulkan_funcs->p_vkEnumerateInstanceExtensionProperties; - if (!strcmp(name, "EnumerateInstanceVersion")) - return vulkan_funcs->p_vkEnumerateInstanceVersion; if (!instance) return NULL; diff --git a/include/wine/vulkan_driver.h b/include/wine/vulkan_driver.h index 37fe9ad3066d..790d63076d39 100644 --- a/include/wine/vulkan_driver.h +++ b/include/wine/vulkan_driver.h @@ -39,7 +39,7 @@ #define __WINE_VULKAN_DRIVER_H /* Wine internal vulkan driver version, needs to be bumped upon vulkan_funcs changes. */ -#define WINE_VULKAN_DRIVER_VERSION 5 +#define WINE_VULKAN_DRIVER_VERSION 6 struct vulkan_funcs { @@ -55,7 +55,6 @@ struct vulkan_funcs void (*p_vkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); void (*p_vkDestroySwapchainKHR)(VkDevice, VkSwapchainKHR, const VkAllocationCallbacks *); VkResult (*p_vkEnumerateInstanceExtensionProperties)(const char *, uint32_t *, VkExtensionProperties *); - VkResult (*p_vkEnumerateInstanceVersion)(uint32_t *); VkResult (*p_vkGetDeviceGroupSurfacePresentModesKHR)(VkDevice, VkSurfaceKHR, VkDeviceGroupPresentModeFlagsKHR *); void * (*p_vkGetDeviceProcAddr)(VkDevice, const char *); void * (*p_vkGetInstanceProcAddr)(VkInstance, const char *); -- 2.16.4

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel July 2018