March 2020 - Wine-commits - list.winehq.org

Zhiyi Zhang : d3d8: Report d3d8 adapter ordinal in d3d8_device_GetCreationParameters().
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: c8889fb9fbd4298840e2405427ecb51d378b8c06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8889fb9fbd4298840e24054… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Mar 22 20:18:10 2020 +0800 d3d8: Report d3d8 adapter ordinal in d3d8_device_GetCreationParameters(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 1 + dlls/d3d8/tests/device.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 400e1e292a..23e93df061 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -730,6 +730,7 @@ static HRESULT WINAPI d3d8_device_GetCreationParameters(IDirect3DDevice8 *iface, (struct wined3d_device_creation_parameters *)parameters); wined3d_mutex_unlock(); + parameters->AdapterOrdinal = device->adapter_ordinal; return D3D_OK; } diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 2e182e6192..a2c02b2c6a 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9869,6 +9869,53 @@ static void test_multi_adapter(void) IDirect3D8_Release(d3d); } +static void test_creation_parameters(void) +{ + unsigned int adapter_idx, adapter_count; + D3DDEVICE_CREATION_PARAMETERS params; + struct device_desc device_desc; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + HWND window; + HRESULT hr; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + device_desc.flags = 0; + + adapter_count = IDirect3D8_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + device_desc.adapter_ordinal = adapter_idx; + if (!(device = create_device(d3d, window, &device_desc))) + { + skip("Adapter %u: Failed to create a D3D device.\n", adapter_idx); + break; + } + + memset(&params, 0, sizeof(params)); + hr = IDirect3DDevice8_GetCreationParameters(device, &params); + ok(hr == D3D_OK, "Adapter %u: GetCreationParameters failed, hr %#x.\n", adapter_idx, hr); + ok(params.AdapterOrdinal == adapter_idx, "Adapter %u: Got unexpected adapter ordinal %u.\n", + adapter_idx, params.AdapterOrdinal); + ok(params.DeviceType == D3DDEVTYPE_HAL, "Adapter %u: Expect device type %#x, got %#x.\n", + adapter_idx, D3DDEVTYPE_HAL, params.DeviceType); + ok(params.hFocusWindow == window, "Adapter %u: Expect focus window %p, got %p.\n", + adapter_idx, window, params.hFocusWindow); + + IDirect3DDevice8_Release(device); + } + + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = GetModuleHandleA("d3d8.dll"); @@ -9986,6 +10033,7 @@ START_TEST(device) test_draw_primitive(); test_get_display_mode(); test_multi_adapter(); + test_creation_parameters(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Zhiyi Zhang : d3d9: Report d3d9 adapter ordinal in d3d9_device_GetCreationParameters().
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: 669cac98529f5e85be5845f454d0c9a41e32632f URL: https://source.winehq.org/git/wine.git/?a=commit;h=669cac98529f5e85be5845f4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Mar 22 20:18:25 2020 +0800 d3d9: Report d3d9 adapter ordinal in d3d9_device_GetCreationParameters(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 1 + dlls/d3d9/tests/device.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 4ac38c0e89..61cb505d77 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -778,6 +778,7 @@ static HRESULT WINAPI d3d9_device_GetCreationParameters(IDirect3DDevice9Ex *ifac (struct wined3d_device_creation_parameters *)parameters); wined3d_mutex_unlock(); + parameters->AdapterOrdinal = device->adapter_ordinal; return D3D_OK; } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index afbd13a398..4255293439 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -13609,6 +13609,53 @@ static void test_shader_validator(void) todo_wine ok(!refcount, "Validator has %u references left.\n", refcount); } +static void test_creation_parameters(void) +{ + unsigned int adapter_idx, adapter_count; + D3DDEVICE_CREATION_PARAMETERS params; + struct device_desc device_desc; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + HWND window; + HRESULT hr; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + device_desc.flags = 0; + + adapter_count = IDirect3D9_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + device_desc.adapter_ordinal = adapter_idx; + if (!(device = create_device(d3d, window, &device_desc))) + { + skip("Adapter %u: Failed to create a D3D device.\n", adapter_idx); + break; + } + + memset(&params, 0, sizeof(params)); + hr = IDirect3DDevice9_GetCreationParameters(device, &params); + ok(hr == D3D_OK, "Adapter %u: GetCreationParameters failed, hr %#x.\n", adapter_idx, hr); + ok(params.AdapterOrdinal == adapter_idx, "Adapter %u: Got unexpected adapter ordinal %u.\n", + adapter_idx, params.AdapterOrdinal); + ok(params.DeviceType == D3DDEVTYPE_HAL, "Adapter %u: Expect device type %#x, got %#x.\n", + adapter_idx, D3DDEVTYPE_HAL, params.DeviceType); + ok(params.hFocusWindow == window, "Adapter %u: Expect focus window %p, got %p.\n", + adapter_idx, window, params.hFocusWindow); + + IDirect3DDevice9_Release(device); + } + + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d9_handle = GetModuleHandleA("d3d9.dll"); @@ -13741,6 +13788,7 @@ START_TEST(device) test_get_display_mode(); test_multi_adapter(); test_shader_validator(); + test_creation_parameters(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Zebediah Figura : d2d1/tests: Adjust a color to prevent test failures.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: 7ce3b65f1e1931a746f1fed921991a102a597341 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ce3b65f1e1931a746f1fed9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 22 18:11:34 2020 -0500 d2d1/tests: Adjust a color to prevent test failures. Different drivers may produce either #ff7f00 or #ff8000 here, both on Windows and Linux. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 77899ccd6e..8548a0a4aa 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1250,7 +1250,7 @@ static void test_clip(void) translate_matrix(&matrix, 0.1f, 0.0f); ID2D1RenderTarget_SetTransform(rt, &matrix); set_rect(&rect, 110.0f, 250.25f, 150.0f, 300.25f); - set_color(&color, 0.0f, 0.5f, 1.0f, 1.0f); + set_color(&color, 0.0f, 1.0f, 0.0f, 1.0f); ID2D1RenderTarget_PushAxisAlignedClip(rt, &rect, D2D1_ANTIALIAS_MODE_ALIASED); ID2D1RenderTarget_Clear(rt, &color); ID2D1RenderTarget_PopAxisAlignedClip(rt); @@ -1277,7 +1277,7 @@ static void test_clip(void) hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); - match = compare_surface(surface, "a958d1fe69ee880200d47b206948e4c1ef382748"); + match = compare_surface(surface, "cb418ec4a7c8407b5e36db06fc6292a06bb8476c"); ok(match, "Surface does not match.\n"); ID2D1RenderTarget_Release(rt);

1 0

Zebediah Figura : d3d11/tests: Relax some color comparisons.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: 40eb77d5c4ebcc4decc6c221f4823b84fbe22417 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40eb77d5c4ebcc4decc6c221… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 22 18:27:44 2020 -0500 d3d11/tests: Relax some color comparisons. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 729f57f443..dcde0d1c10 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -29819,7 +29819,7 @@ static void test_color_mask(void) { get_texture_readback(rts[i], 0, &rb); color = get_readback_color(&rb, 320, 240, 0); - ok(color == expected_colors[i], "%u: Got unexpected color 0x%08x.\n", i, color); + ok(compare_color(color, expected_colors[i], 1), "%u: Got unexpected color 0x%08x.\n", i, color); release_resource_readback(&rb); } @@ -29837,7 +29837,7 @@ static void test_color_mask(void) { get_texture_readback(rts[i], 0, &rb); color = get_readback_color(&rb, 320, 240, 0); - ok(color == expected_colors[0], "%u: Got unexpected color 0x%08x.\n", i, color); + ok(compare_color(color, expected_colors[0], 1), "%u: Got unexpected color 0x%08x.\n", i, color); release_resource_readback(&rb); ID3D11Texture2D_Release(rts[i]);

1 0

Zebediah Figura : d3d10core/tests: Relax some color comparisons.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: 00e55c8fc0c08e14c39880e62526f8503468b641 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00e55c8fc0c08e14c39880e6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 22 18:27:45 2020 -0500 d3d10core/tests: Relax some color comparisons. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index b5b5715282..f29ebf97f2 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -18163,7 +18163,7 @@ static void test_color_mask(void) { get_texture_readback(rts[i], 0, &rb); color = get_readback_color(&rb, 320, 240); - ok(color == expected_colors[i], "%u: Got unexpected color 0x%08x.\n", i, color); + ok(compare_color(color, expected_colors[i], 1), "%u: Got unexpected color 0x%08x.\n", i, color); release_resource_readback(&rb); ID3D10Texture2D_Release(rts[i]); @@ -18274,7 +18274,7 @@ static void test_independent_blend(void) { get_texture_readback(rts[i], 0, &rb); color = get_readback_color(&rb, 320, 240); - ok(color == ((i & 1) ? 0x80008080 : 0x8000ff00), "%u: Got unexpected color 0x%08x.\n", i, color); + ok(compare_color(color, (i & 1) ? 0x80008080 : 0x8000ff00, 1), "%u: Got unexpected color 0x%08x.\n", i, color); release_resource_readback(&rb); ID3D10Texture2D_Release(rts[i]);

1 0

Alexandre Julliard : comctl32: Forward string functions to kernelbase.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: 077fc97a289e69f0ffb1c2e17bcb429f51074603 URL: https://source.winehq.org/git/wine.git/?a=commit;h=077fc97a289e69f0ffb1c2e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 21 19:46:04 2020 +0100 comctl32: Forward string functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/comctl32.spec | 48 ++-- dlls/comctl32/string.c | 673 -------------------------------------------- 2 files changed, 24 insertions(+), 697 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=077fc97a289e69f0ffb1…

1 0

Alexandre Julliard : loader: Remove a check for antediluvian glibc.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: a449385150139627be9c00bc0022950ec1b42a31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a449385150139627be9c00bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Mar 22 11:22:48 2020 +0100 loader: Remove a check for antediluvian glibc. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/main.c | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/loader/main.c b/loader/main.c index f197cf802e..407c897892 100644 --- a/loader/main.c +++ b/loader/main.c @@ -36,7 +36,6 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#include <pthread.h> #include "wine/library.h" #include "main.h" @@ -87,42 +86,6 @@ static int pre_exec(void) #elif defined(__linux__) && (defined(__i386__) || defined(__arm__)) -#ifdef __i386__ -/* separate thread to check for NPTL and TLS features */ -static void *needs_pthread( void *arg ) -{ - pid_t tid = syscall( 224 /* SYS_gettid */ ); - /* check for NPTL */ - if (tid != -1 && tid != getpid()) return (void *)1; - /* check for TLS glibc */ - if (wine_get_gs() != 0) return (void *)1; - /* check for exported epoll_create to detect new glibc versions without TLS */ - if (wine_dlsym( RTLD_DEFAULT, "epoll_create", NULL, 0 )) - fprintf( stderr, - "wine: glibc >= 2.3 without NPTL or TLS is not a supported combination.\n" - " Please upgrade to a glibc with NPTL support.\n" ); - else - fprintf( stderr, - "wine: Your C library is too old. You need at least glibc 2.3 with NPTL support.\n" ); - return 0; -} - -/* check if we support the glibc threading model */ -static void check_threading(void) -{ - pthread_t id; - void *ret; - - pthread_create( &id, NULL, needs_pthread, NULL ); - pthread_join( id, &ret ); - if (!ret) exit(1); -} -#else -static void check_threading(void) -{ -} -#endif - static void check_vmsplit( void *stack ) { if (stack < (void *)0x80000000) @@ -150,7 +113,6 @@ static int pre_exec(void) { int temp; - check_threading(); check_vmsplit( &temp ); set_max_limit( RLIMIT_AS ); #ifdef __i386__

1 0

Brendan Shanks : vulkan-1: Set FILEVERSION to fix official Vulkan loader installer.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: 1e41a38c3b45332f2202caecc04f1c93bdeeb020 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e41a38c3b45332f2202caec… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Mar 20 17:28:31 2020 -0700 vulkan-1: Set FILEVERSION to fix official Vulkan loader installer. Red Dead Redemption 2 requires and installs the official Vulkan loader, but the installer requires vulkan-1.dll's FILEVERSION to be lower than what it's installing. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/version.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/vulkan-1/version.rc b/dlls/vulkan-1/version.rc index ec75462ddf..93cf661525 100644 --- a/dlls/vulkan-1/version.rc +++ b/dlls/vulkan-1/version.rc @@ -20,6 +20,7 @@ #define WINE_FILEDESCRIPTION_STR "Wine Vulkan Loader" #define WINE_FILENAME_STR "vulkan-1.dll" +#define WINE_FILEVERSION 1,0,0,0 /* Set to 1.0.0 so the official Vulkan runtime installer will replace this file */ #define WINE_FILEVERSION_STR PACKAGE_VERSION #define WINE_PRODUCTVERSION_STR PACKAGE_VERSION #define WINE_PRODUCTNAME_STR "Wine Vulkan"

1 0

Liam Middlebrook : winevulkan: Generate typedefs for aliased enums.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: da71d390d4fbd9ce9de2a7dce244d44b7fc5e6bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=da71d390d4fbd9ce9de2a7dc… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Fri Mar 20 19:39:29 2020 -0700 winevulkan: Generate typedefs for aliased enums. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Piers Daniell <pdaniell(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 19 +++++++++++++++++-- include/wine/vulkan.h | 16 ++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3593410041..443b15b098 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -335,11 +335,15 @@ class VkEnum(object): self.values = values self.required = False self.alias = alias + self.aliased_by = [] @staticmethod def from_alias(enum, alias): name = enum.attrib.get("name") - return VkEnum(name, alias.values, alias=alias) + aliasee = VkEnum(name, alias.values, alias=alias) + + alias.add_aliased_by(aliasee) + return aliasee @staticmethod def from_xml(enum): @@ -386,18 +390,29 @@ class VkEnum(object): self.values.append(value) def definition(self): + if self.is_alias(): + return "" + text = "typedef enum {0}\n{{\n".format(self.name) # Print values sorted, values can have been added in a random order. values = sorted(self.values, key=lambda value: value.value) for value in values: text += " {0},\n".format(value.definition()) - text += "}} {0};\n\n".format(self.name) + text += "}} {0};\n".format(self.name) + + for aliasee in self.aliased_by: + text += "typedef {0} {1};\n".format(self.name, aliasee.name) + + text += "\n" return text def is_alias(self): return bool(self.alias) + def add_aliased_by(self, aliasee): + self.aliased_by.append(aliasee) + class VkEnumValue(object): def __init__(self, name, value, hex=False): diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index fe804fd23e..fddb64fc9a 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -777,6 +777,7 @@ typedef enum VkChromaLocation VK_CHROMA_LOCATION_MIDPOINT = 1, VK_CHROMA_LOCATION_MAX_ENUM = 0x7fffffff, } VkChromaLocation; +typedef VkChromaLocation VkChromaLocationKHR; typedef enum VkCoarseSampleOrderTypeNV { @@ -994,6 +995,7 @@ typedef enum VkDescriptorUpdateTemplateType VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR = 1, VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_MAX_ENUM = 0x7fffffff, } VkDescriptorUpdateTemplateType; +typedef VkDescriptorUpdateTemplateType VkDescriptorUpdateTemplateTypeKHR; typedef enum VkDeviceGroupPresentModeFlagBitsKHR { @@ -1061,6 +1063,7 @@ typedef enum VkExternalFenceFeatureFlagBits VK_EXTERNAL_FENCE_FEATURE_IMPORTABLE_BIT = 0x00000002, VK_EXTERNAL_FENCE_FEATURE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkExternalFenceFeatureFlagBits; +typedef VkExternalFenceFeatureFlagBits VkExternalFenceFeatureFlagBitsKHR; typedef enum VkExternalFenceHandleTypeFlagBits { @@ -1070,6 +1073,7 @@ typedef enum VkExternalFenceHandleTypeFlagBits VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT = 0x00000008, VK_EXTERNAL_FENCE_HANDLE_TYPE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkExternalFenceHandleTypeFlagBits; +typedef VkExternalFenceHandleTypeFlagBits VkExternalFenceHandleTypeFlagBitsKHR; typedef enum VkExternalMemoryFeatureFlagBits { @@ -1078,6 +1082,7 @@ typedef enum VkExternalMemoryFeatureFlagBits VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT = 0x00000004, VK_EXTERNAL_MEMORY_FEATURE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkExternalMemoryFeatureFlagBits; +typedef VkExternalMemoryFeatureFlagBits VkExternalMemoryFeatureFlagBitsKHR; typedef enum VkExternalMemoryHandleTypeFlagBits { @@ -1092,6 +1097,7 @@ typedef enum VkExternalMemoryHandleTypeFlagBits VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_MAPPED_FOREIGN_MEMORY_BIT_EXT = 0x00000100, VK_EXTERNAL_MEMORY_HANDLE_TYPE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkExternalMemoryHandleTypeFlagBits; +typedef VkExternalMemoryHandleTypeFlagBits VkExternalMemoryHandleTypeFlagBitsKHR; typedef enum VkExternalSemaphoreFeatureFlagBits { @@ -1099,6 +1105,7 @@ typedef enum VkExternalSemaphoreFeatureFlagBits VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT = 0x00000002, VK_EXTERNAL_SEMAPHORE_FEATURE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkExternalSemaphoreFeatureFlagBits; +typedef VkExternalSemaphoreFeatureFlagBits VkExternalSemaphoreFeatureFlagBitsKHR; typedef enum VkExternalSemaphoreHandleTypeFlagBits { @@ -1109,6 +1116,7 @@ typedef enum VkExternalSemaphoreHandleTypeFlagBits VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT = 0x00000010, VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkExternalSemaphoreHandleTypeFlagBits; +typedef VkExternalSemaphoreHandleTypeFlagBits VkExternalSemaphoreHandleTypeFlagBitsKHR; typedef enum VkFenceCreateFlagBits { @@ -1121,6 +1129,7 @@ typedef enum VkFenceImportFlagBits VK_FENCE_IMPORT_TEMPORARY_BIT = 0x00000001, VK_FENCE_IMPORT_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkFenceImportFlagBits; +typedef VkFenceImportFlagBits VkFenceImportFlagBitsKHR; typedef enum VkFilter { @@ -1597,6 +1606,7 @@ typedef enum VkMemoryAllocateFlagBits VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT_KHR = 0x00000004, VK_MEMORY_ALLOCATE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkMemoryAllocateFlagBits; +typedef VkMemoryAllocateFlagBits VkMemoryAllocateFlagBitsKHR; typedef enum VkMemoryHeapFlagBits { @@ -1672,6 +1682,7 @@ typedef enum VkPeerMemoryFeatureFlagBits VK_PEER_MEMORY_FEATURE_GENERIC_DST_BIT = 0x00000008, VK_PEER_MEMORY_FEATURE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkPeerMemoryFeatureFlagBits; +typedef VkPeerMemoryFeatureFlagBits VkPeerMemoryFeatureFlagBitsKHR; typedef enum VkPerformanceConfigurationTypeINTEL { @@ -1839,6 +1850,7 @@ typedef enum VkPointClippingBehavior VK_POINT_CLIPPING_BEHAVIOR_USER_CLIP_PLANES_ONLY = 1, VK_POINT_CLIPPING_BEHAVIOR_MAX_ENUM = 0x7fffffff, } VkPointClippingBehavior; +typedef VkPointClippingBehavior VkPointClippingBehaviorKHR; typedef enum VkPolygonMode { @@ -2058,6 +2070,7 @@ typedef enum VkSamplerYcbcrModelConversion VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_2020 = 4, VK_SAMPLER_YCBCR_MODEL_CONVERSION_MAX_ENUM = 0x7fffffff, } VkSamplerYcbcrModelConversion; +typedef VkSamplerYcbcrModelConversion VkSamplerYcbcrModelConversionKHR; typedef enum VkSamplerYcbcrRange { @@ -2065,6 +2078,7 @@ typedef enum VkSamplerYcbcrRange VK_SAMPLER_YCBCR_RANGE_ITU_NARROW = 1, VK_SAMPLER_YCBCR_RANGE_MAX_ENUM = 0x7fffffff, } VkSamplerYcbcrRange; +typedef VkSamplerYcbcrRange VkSamplerYcbcrRangeKHR; typedef enum VkScopeNV { @@ -2080,6 +2094,7 @@ typedef enum VkSemaphoreImportFlagBits VK_SEMAPHORE_IMPORT_TEMPORARY_BIT = 0x00000001, VK_SEMAPHORE_IMPORT_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkSemaphoreImportFlagBits; +typedef VkSemaphoreImportFlagBits VkSemaphoreImportFlagBitsKHR; typedef enum VkSemaphoreTypeKHR { @@ -2573,6 +2588,7 @@ typedef enum VkTessellationDomainOrigin VK_TESSELLATION_DOMAIN_ORIGIN_LOWER_LEFT = 1, VK_TESSELLATION_DOMAIN_ORIGIN_MAX_ENUM = 0x7fffffff, } VkTessellationDomainOrigin; +typedef VkTessellationDomainOrigin VkTessellationDomainOriginKHR; typedef enum VkToolPurposeFlagBitsEXT {

1 0

Liam Middlebrook : winevulkan: Add alias field to VkEnumValue.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: a5b633f3f6f497d80c55c4a2b32a88c169946eea URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5b633f3f6f497d80c55c4a2… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Fri Mar 20 19:39:30 2020 -0700 winevulkan: Add alias field to VkEnumValue. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Piers Daniell <pdaniell(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 443b15b098..0a126bd422 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -356,24 +356,24 @@ class VkEnum(object): alias_name = v.attrib.get("alias") if alias_name: alias = next(x for x in values if x.name == alias_name) - values.append(VkEnumValue(v.attrib.get("name"), alias.value, alias.hex)) + values.append(VkEnumValue(v.attrib.get("name"), value=alias.value, hex=alias.hex)) elif value: # Some values are in hex form. We want to preserve the hex representation # at least when we convert back to a string. Internally we want to use int. if "0x" in value: - values.append(VkEnumValue(v.attrib.get("name"), int(value, 0), hex=True)) + values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0), hex=True)) else: - values.append(VkEnumValue(v.attrib.get("name"), int(value, 0))) + values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0))) else: # bitmask value = 1 << int(v.attrib.get("bitpos")) - values.append(VkEnumValue(v.attrib.get("name"), value, hex=True)) + values.append(VkEnumValue(v.attrib.get("name"), value=value, hex=True)) # vulkan.h contains a *_MAX_ENUM value set to 32-bit at the time of writing, # which is to prepare for extensions as they can add values and hence affect # the size definition. max_name = re.sub(r'([0-9a-z_])([A-Z0-9])',r'\1_\2', name).upper() + "_MAX_ENUM" - values.append(VkEnumValue(max_name, 0x7fffffff, hex=True)) + values.append(VkEnumValue(max_name, value=0x7fffffff, hex=True)) return VkEnum(name, values) @@ -415,16 +415,21 @@ class VkEnum(object): class VkEnumValue(object): - def __init__(self, name, value, hex=False): + def __init__(self, name, value=None, hex=False, alias=None): self.name = name self.value = value self.hex = hex + self.alias = alias def __repr__(self): + if self.is_alias(): + return "{0}={1}".format(self.name, self.alias) return "{0}={1}".format(self.name, self.value) def definition(self): """ Convert to text definition e.g. VK_FOO = 1 """ + if self.is_alias(): + return "{0} = {1}".format(self.name, self.alias) # Hex is commonly used for FlagBits and sometimes within # a non-FlagBits enum for a bitmask value as well. @@ -433,6 +438,9 @@ class VkEnumValue(object): else: return "{0} = {1}".format(self.name, self.value) + def is_alias(self): + return self.alias is not None + class VkFunction(object): def __init__(self, _type=None, name=None, params=[], extensions=[], alias=None): @@ -2708,7 +2716,7 @@ class VkRegistry(object): if "bitpos" in enum_elem.keys(): # We need to add an extra value to an existing enum type. # E.g. VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG to VkFormatFeatureFlagBits. - enum.add(VkEnumValue(enum_elem.attrib["name"], 1 << int(enum_elem.attrib["bitpos"]), hex=True)) + enum.add(VkEnumValue(enum_elem.attrib["name"], value=(1 << int(enum_elem.attrib["bitpos"])), hex=True)) elif "offset" in enum_elem.keys(): # Extensions promoted to Core, have the extension number as part

1 0