- Wine-Commits - list.winehq.org

Alexandros Frantzis : win32u: Enable dibdrv wglDescribePixelFormat through p_get_pixel_formats.
by Alexandre Julliard May 12, 2024

May 12, 2024

Module: wine Branch: master Commit: 51b13e776ec454c82159974918463b0d7a3005cf URL: https://gitlab.winehq.org/wine/wine/-/commit/51b13e776ec454c82159974918463b… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri Apr 26 14:16:08 2024 +0300 win32u: Enable dibdrv wglDescribePixelFormat through p_get_pixel_formats. --- dlls/win32u/dibdrv/dc.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/win32u/dibdrv/dc.c b/dlls/win32u/dibdrv/dc.c index 637b92f5256..0d53915b2ba 100644 --- a/dlls/win32u/dibdrv/dc.c +++ b/dlls/win32u/dibdrv/dc.c @@ -426,17 +426,8 @@ static const struct { 16, 5, 0, 6, 5, 5, 11, 0, 0, 16, 16, 8 }, }; -/********************************************************************** - * dibdrv_wglDescribePixelFormat - */ -static int dibdrv_wglDescribePixelFormat( HDC hdc, int fmt, UINT size, PIXELFORMATDESCRIPTOR *descr ) +static void describe_pixel_format( int fmt, PIXELFORMATDESCRIPTOR *descr ) { - int ret = ARRAY_SIZE( pixel_formats ); - - if (!descr) return ret; - if (fmt <= 0 || fmt > ret) return 0; - if (size < sizeof(*descr)) return 0; - memset( descr, 0, sizeof(*descr) ); descr->nSize = sizeof(*descr); descr->nVersion = 1; @@ -460,7 +451,6 @@ static int dibdrv_wglDescribePixelFormat( HDC hdc, int fmt, UINT size, PIXELFORM descr->cStencilBits = pixel_formats[fmt - 1].stencil_bits; descr->cAuxBuffers = 0; descr->iLayerType = PFD_MAIN_PLANE; - return ret; } /*********************************************************************** @@ -506,7 +496,8 @@ static struct wgl_context *dibdrv_wglCreateContext( HDC hdc ) int format = dibdrv_wglGetPixelFormat( hdc ); if (!format) format = 1; - if (!dibdrv_wglDescribePixelFormat( hdc, format, sizeof(descr), &descr )) return NULL; + if (format <= 0 || format > ARRAY_SIZE( pixel_formats )) return NULL; + describe_pixel_format( format, &descr ); if (!osmesa_funcs) return NULL; return osmesa_funcs->create_context( hdc, &descr ); @@ -585,19 +576,38 @@ static BOOL dibdrv_wglSwapBuffers( HDC hdc ) return TRUE; } +/*********************************************************************** + * dibdrv_get_pixel_formats + */ +static void dibdrv_get_pixel_formats( struct wgl_pixel_format *formats, + UINT max_formats, UINT *num_formats, + UINT *num_onscreen_formats ) +{ + UINT num_pixel_formats = ARRAY_SIZE( pixel_formats ); + UINT i; + + if (formats) + { + for (i = 0; i < min( max_formats, num_pixel_formats ); ++i) + describe_pixel_format( i + 1, &formats[i].pfd ); + } + *num_formats = *num_onscreen_formats = num_pixel_formats; +} + static struct opengl_funcs opengl_funcs = { { dibdrv_wglCopyContext, /* p_wglCopyContext */ dibdrv_wglCreateContext, /* p_wglCreateContext */ dibdrv_wglDeleteContext, /* p_wglDeleteContext */ - dibdrv_wglDescribePixelFormat, /* p_wglDescribePixelFormat */ + NULL, /* p_wglDescribePixelFormat */ dibdrv_wglGetPixelFormat, /* p_wglGetPixelFormat */ dibdrv_wglGetProcAddress, /* p_wglGetProcAddress */ dibdrv_wglMakeCurrent, /* p_wglMakeCurrent */ dibdrv_wglSetPixelFormat, /* p_wglSetPixelFormat */ dibdrv_wglShareLists, /* p_wglShareLists */ dibdrv_wglSwapBuffers, /* p_wglSwapBuffers */ + dibdrv_get_pixel_formats, /* p_get_pixel_formats */ } };

1 0

Elizabeth Figura : wined3d: Use wined3d_resource_is_offscreen() directly in ffp_blitter_clear_rendertargets().
by Alexandre Julliard May 12, 2024

May 12, 2024

Module: wine Branch: master Commit: 4ad68d4e0429c1caef88203c0bf5ee489ba5a3b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/4ad68d4e0429c1caef88203c0bf5ee… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Mar 15 18:44:37 2024 -0500 wined3d: Use wined3d_resource_is_offscreen() directly in ffp_blitter_clear_rendertargets(). This is the only user of context->render_offscreen that is not related to draw state. The use here is synonymous with using wined3d_resource_is_offscreen() on the actual colour target. --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 9edfc38c01c..a4eee054528 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5955,7 +5955,7 @@ static void ffp_blitter_clear_rendertargets(struct wined3d_device *device, unsig if (target) { - render_offscreen = context->render_offscreen; + render_offscreen = wined3d_resource_is_offscreen(&target->resource); wined3d_rendertarget_view_get_drawable_size(rtv, context, &drawable_width, &drawable_height); } else

1 0

Elizabeth Figura : wined3d: Remove no longer used support for drawing to an onscreen render target.
by Alexandre Julliard May 12, 2024

May 12, 2024

Module: wine Branch: master Commit: ba2f78922f84f0576694fef17be7bec2cc9da19b URL: https://gitlab.winehq.org/wine/wine/-/commit/ba2f78922f84f0576694fef17be7be… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Mar 15 18:59:35 2024 -0500 wined3d: Remove no longer used support for drawing to an onscreen render target. Now that we require ORM_FBO, wined3d backbuffers are always offscreen (and we never draw directly to the frontbuffer, which is the only truly onscreen surface). We could reintroduce support for drawing directly to the backbuffer, and this would presumably improve performance by avoiding a blit from the wined3d backbuffer to the real GL backbuffer. However, this is not always possible or performant due to mismatching dimensions, or the need to use a depth buffer which is also used with offscreen RTVs, and for d3d1-9 it may not be possible at all due to issues related to preserving invariance between flipped and non-flipped geometry. It *may* be possible to identify situations where we can render directly to the backbuffer for d3d10+, but at that point we can rely on the Vulkan backend to work, and given other unfixable performance problems with the GL backend (most notably the inability to properly stream index buffer data) it does not really make much sense to go out of our way to perform such a minor optimization there. --- dlls/wined3d/adapter_gl.c | 1 - dlls/wined3d/arb_program_shader.c | 4 +- dlls/wined3d/context_gl.c | 101 +++++++++++--------------------------- dlls/wined3d/ffp_gl.c | 95 +++++++++-------------------------- dlls/wined3d/glsl_shader.c | 4 +- dlls/wined3d/shader.c | 4 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 10 +--- 8 files changed, 60 insertions(+), 161 deletions(-)

1 0

Paul Gofman : bcrypt: Support RSA/PKCS1 signatures with unspecified hash algorithm.
by Alexandre Julliard May 12, 2024

May 12, 2024

Module: wine Branch: master Commit: 61fdd99b0f2cb6afdb5af21de636c6619947fd99 URL: https://gitlab.winehq.org/wine/wine/-/commit/61fdd99b0f2cb6afdb5af21de636c6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 7 15:25:50 2024 -0600 bcrypt: Support RSA/PKCS1 signatures with unspecified hash algorithm. --- dlls/bcrypt/gnutls.c | 17 +++++++++++------ dlls/bcrypt/tests/bcrypt.c | 19 +++++++++++++++++++ 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 125483ead43..18ef70a7722 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -2139,9 +2139,9 @@ static NTSTATUS pubkey_set_rsa_pss_params( gnutls_pubkey_t key, gnutls_digest_al static NTSTATUS key_asymmetric_verify( void *args ) { #ifdef GNUTLS_VERIFY_ALLOW_BROKEN - static const unsigned int verify_flags = GNUTLS_VERIFY_ALLOW_BROKEN; + unsigned int verify_flags = GNUTLS_VERIFY_ALLOW_BROKEN; #else - static const unsigned int verify_flags = 0; + unsigned int verify_flags = 0; #endif const struct key_asymmetric_verify_params *params = args; struct key *key = params->key; @@ -2182,8 +2182,12 @@ static NTSTATUS key_asymmetric_verify( void *args ) BCRYPT_PKCS1_PADDING_INFO *info = params->padding; if (!info) return STATUS_INVALID_PARAMETER; - if (!info->pszAlgId) return STATUS_INVALID_SIGNATURE; - if ((hash_alg = get_digest_from_id(info->pszAlgId)) == GNUTLS_DIG_UNKNOWN) + if (!info->pszAlgId) + { + hash_alg = GNUTLS_DIG_UNKNOWN; + verify_flags |= GNUTLS_VERIFY_USE_TLS1_RSA; + } + else if ((hash_alg = get_digest_from_id(info->pszAlgId)) == GNUTLS_DIG_UNKNOWN) { FIXME( "hash algorithm %s not supported\n", debugstr_w(info->pszAlgId) ); return STATUS_NOT_SUPPORTED; @@ -2374,12 +2378,13 @@ static NTSTATUS key_asymmetric_sign( void *args ) { BCRYPT_PKCS1_PADDING_INFO *pad = params->padding; - if (!pad || !pad->pszAlgId) + if (!pad) { WARN( "padding info not found\n" ); return STATUS_INVALID_PARAMETER; } - if ((hash_alg = get_digest_from_id( pad->pszAlgId )) == GNUTLS_DIG_UNKNOWN) + if (!pad->pszAlgId) hash_alg = GNUTLS_DIG_UNKNOWN; + else if ((hash_alg = get_digest_from_id( pad->pszAlgId )) == GNUTLS_DIG_UNKNOWN) { FIXME( "hash algorithm %s not recognized\n", debugstr_w(pad->pszAlgId) ); return STATUS_NOT_SUPPORTED; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index f9c973078ab..772d4ecdc5d 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2725,6 +2725,21 @@ static void test_RSA(void) ret = BCryptVerifySignature(key, &pad, hash, sizeof(hash), sig, len, BCRYPT_PAD_PKCS1); ok(!ret, "BCryptVerifySignature failed: %#lx\n", ret); + pad.pszAlgId = NULL; + memset(sig, 0, sizeof(sig)); + len = 0; + ret = BCryptSignHash(key, &pad, hash, sizeof(hash), sig, sizeof(sig), &len, BCRYPT_PAD_PKCS1); + ok(!ret, "got %#lx\n", ret); + ok(len == 256, "got %lu\n", len); + + pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; + ret = BCryptVerifySignature(key, &pad, hash, sizeof(hash), sig, len, BCRYPT_PAD_PKCS1); + ok(ret == STATUS_INVALID_SIGNATURE, "BCryptVerifySignature failed: %#lx, len %ld\n", ret, len); + + pad.pszAlgId = NULL; + ret = BCryptVerifySignature(key, &pad, hash, sizeof(hash), sig, len, BCRYPT_PAD_PKCS1); + ok(!ret, "BCryptVerifySignature failed: %#lx, len %ld\n", ret, len); + pad_pss.pszAlgId = BCRYPT_SHA384_ALGORITHM; pad_pss.cbSalt = 48; memset(sig_pss, 0, sizeof(sig_pss)); @@ -2872,6 +2887,10 @@ static void test_RSA_SIGN(void) ret = BCryptExportKey(key, NULL, BCRYPT_RSAPRIVATE_BLOB, buf2, sizeof(buf2), &size, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); + pad.pszAlgId = NULL; + ret = BCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); + ok(ret == STATUS_INVALID_SIGNATURE, "BCryptVerifySignature failed: %#lx\n", ret); + pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; ret = BCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); ok(!ret, "BCryptVerifySignature failed: %#lx\n", ret);

1 0

Elizabeth Figura : wined3d: Remove the offscreen_rendering_mode setting.
by Alexandre Julliard May 12, 2024

May 12, 2024

Module: wine Branch: master Commit: d2f13e5d8c0ce7ca1ca587790171ba7a50e1ca6a URL: https://gitlab.winehq.org/wine/wine/-/commit/d2f13e5d8c0ce7ca1ca587790171ba… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Thu Mar 7 19:01:59 2024 -0600 wined3d: Remove the offscreen_rendering_mode setting. --- dlls/wined3d/adapter_gl.c | 110 +------------ dlls/wined3d/arb_program_shader.c | 27 +--- dlls/wined3d/context_gl.c | 330 ++++++++++++-------------------------- dlls/wined3d/glsl_shader.c | 27 +--- dlls/wined3d/resource.c | 6 +- dlls/wined3d/shader.c | 4 +- dlls/wined3d/surface.c | 73 +-------- dlls/wined3d/swapchain.c | 5 +- dlls/wined3d/texture.c | 34 +--- dlls/wined3d/utils.c | 44 ++--- dlls/wined3d/view.c | 10 -- dlls/wined3d/wined3d_gl.h | 2 - dlls/wined3d/wined3d_main.c | 1 - dlls/wined3d/wined3d_private.h | 4 - 14 files changed, 137 insertions(+), 540 deletions(-)

1 0

Brendan Shanks : winemac.drv: Fix warning in macdrv_get_pixel_formats.
by Alexandre Julliard May 12, 2024

May 12, 2024

Module: wine Branch: master Commit: e7118b750296f8b61dd6d8fbc41ead762e35f2f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/e7118b750296f8b61dd6d8fbc41ead… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed May 8 14:14:12 2024 -0700 winemac.drv: Fix warning in macdrv_get_pixel_formats. --- dlls/winemac.drv/opengl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 000ff08b29d..1c0b87d694a 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -4602,7 +4602,7 @@ static void macdrv_get_pixel_formats(struct wgl_pixel_format *formats, if (formats) { for (i = 0; i < min(max_formats, nb_formats); ++i) - describe_pixel_format(&pixel_formats[i], &formats[i]); + describe_pixel_format(&pixel_formats[i], &formats[i].pfd); } *num_formats = nb_formats; *num_onscreen_formats = nb_displayable_formats;

1 0

Elizabeth Figura : authors: Change the full form of my name.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: vkd3d Branch: master Commit: 4b3a948edcb5e83074b63aad25ecf450dcae4130 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4b3a948edcb5e83074b63aad25ecf… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed May 8 00:10:04 2024 -0500 authors: Change the full form of my name. --- .mailmap | 2 ++ AUTHORS | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap new file mode 100644 index 00000000..cd5bebc5 --- /dev/null +++ b/.mailmap @@ -0,0 +1,2 @@ +Elizabeth Figura <z.figura12(a)gmail.com> +Elizabeth Figura <zfigura(a)codeweavers.com> diff --git a/AUTHORS b/AUTHORS index 2bd9d4e7..b26c2819 100644 --- a/AUTHORS +++ b/AUTHORS @@ -10,6 +10,7 @@ Chip Davis Conor McCarthy David Gow Derek Lesho +Elizabeth Figura Ethan Lee Evan Tang Fabian Maurer @@ -36,5 +37,4 @@ Stefan Dösinger Sven Hesse Victor Chiletto Vinson Lee -Zebediah Figura Zhiyi Zhang

1 0

Giovanni Mascellani : vkd3d: Only request properties and features when the corresponding extension is available.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: vkd3d Branch: master Commit: ca35023ed08a5ded8b218f8a731597df68bf77a3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ca35023ed08a5ded8b218f8a73159… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sun May 5 15:19:35 2024 +0200 vkd3d: Only request properties and features when the corresponding extension is available. This fixes a number of validation errors. --- libs/vkd3d/device.c | 51 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 9fe4f08d..36d84339 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -869,29 +869,41 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i info->features2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2; conditional_rendering_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT; - vk_prepend_struct(&info->features2, conditional_rendering_features); + if (vulkan_info->EXT_conditional_rendering) + vk_prepend_struct(&info->features2, conditional_rendering_features); depth_clip_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT; - vk_prepend_struct(&info->features2, depth_clip_features); + if (vulkan_info->EXT_depth_clip_enable) + vk_prepend_struct(&info->features2, depth_clip_features); descriptor_indexing_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT; - vk_prepend_struct(&info->features2, descriptor_indexing_features); + if (vulkan_info->EXT_descriptor_indexing) + vk_prepend_struct(&info->features2, descriptor_indexing_features); fragment_shader_interlock_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_INTERLOCK_FEATURES_EXT; - vk_prepend_struct(&info->features2, fragment_shader_interlock_features); + if (vulkan_info->EXT_fragment_shader_interlock) + vk_prepend_struct(&info->features2, fragment_shader_interlock_features); robustness2_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT; - vk_prepend_struct(&info->features2, robustness2_features); + if (vulkan_info->EXT_robustness2) + vk_prepend_struct(&info->features2, robustness2_features); demote_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES_EXT; - vk_prepend_struct(&info->features2, demote_features); + if (vulkan_info->EXT_shader_demote_to_helper_invocation) + vk_prepend_struct(&info->features2, demote_features); buffer_alignment_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_FEATURES_EXT; - vk_prepend_struct(&info->features2, buffer_alignment_features); + if (vulkan_info->EXT_texel_buffer_alignment) + vk_prepend_struct(&info->features2, buffer_alignment_features); xfb_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT; - vk_prepend_struct(&info->features2, xfb_features); + if (vulkan_info->EXT_transform_feedback) + vk_prepend_struct(&info->features2, xfb_features); vertex_divisor_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT; - vk_prepend_struct(&info->features2, vertex_divisor_features); + if (vulkan_info->EXT_vertex_attribute_divisor) + vk_prepend_struct(&info->features2, vertex_divisor_features); timeline_semaphore_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES_KHR; - vk_prepend_struct(&info->features2, timeline_semaphore_features); + if (vulkan_info->KHR_timeline_semaphore) + vk_prepend_struct(&info->features2, timeline_semaphore_features); mutable_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT; - vk_prepend_struct(&info->features2, mutable_features); + if (vulkan_info->EXT_mutable_descriptor_type) + vk_prepend_struct(&info->features2, mutable_features); formats4444_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_4444_FORMATS_FEATURES_EXT; - vk_prepend_struct(&info->features2, formats4444_features); + if (vulkan_info->EXT_4444_formats) + vk_prepend_struct(&info->features2, formats4444_features); if (vulkan_info->KHR_get_physical_device_properties2) VK_CALL(vkGetPhysicalDeviceFeatures2KHR(physical_device, &info->features2)); @@ -901,15 +913,20 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i info->properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; maintenance3_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES; - vk_prepend_struct(&info->properties2, maintenance3_properties); + if (vulkan_info->KHR_maintenance3) + vk_prepend_struct(&info->properties2, maintenance3_properties); descriptor_indexing_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES_EXT; - vk_prepend_struct(&info->properties2, descriptor_indexing_properties); + if (vulkan_info->EXT_descriptor_indexing) + vk_prepend_struct(&info->properties2, descriptor_indexing_properties); buffer_alignment_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES_EXT; - vk_prepend_struct(&info->properties2, buffer_alignment_properties); + if (vulkan_info->EXT_texel_buffer_alignment) + vk_prepend_struct(&info->properties2, buffer_alignment_properties); xfb_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_PROPERTIES_EXT; - vk_prepend_struct(&info->properties2, xfb_properties); + if (vulkan_info->EXT_transform_feedback) + vk_prepend_struct(&info->properties2, xfb_properties); vertex_divisor_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT; - vk_prepend_struct(&info->properties2, vertex_divisor_properties); + if (vulkan_info->EXT_vertex_attribute_divisor) + vk_prepend_struct(&info->properties2, vertex_divisor_properties); subgroup_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES; if (d3d12_device_environment_is_vulkan_min_1_1(device)) vk_prepend_struct(&info->properties2, subgroup_properties);

1 0

Giovanni Mascellani : vkd3d: Move checking device extensions to a dedicated function.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: vkd3d Branch: master Commit: dbe3384609af274ba681c75b948ddc7377fedede URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dbe3384609af274ba681c75b948dd… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sun May 5 15:05:24 2024 +0200 vkd3d: Move checking device extensions to a dedicated function. --- libs/vkd3d/device.c | 110 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 63 insertions(+), 47 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 5ba201ac..da0ffa06 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1517,6 +1517,63 @@ static bool d3d12_device_supports_typed_uav_load_additional_formats(const struct return true; } +static HRESULT vkd3d_check_device_extensions(struct d3d12_device *device, + const struct vkd3d_device_create_info *create_info, VkExtensionProperties **vk_extensions, + uint32_t *vk_extension_count, uint32_t *device_extension_count, bool **user_extension_supported) +{ + const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; + const struct vkd3d_optional_device_extensions_info *optional_extensions; + VkPhysicalDevice physical_device = device->vk_physical_device; + struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; + VkResult vr; + + *device_extension_count = 0; + + if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, vk_extension_count, NULL))) < 0) + { + ERR("Failed to enumerate device extensions, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + if (!*vk_extension_count) + return S_OK; + + if (!(*vk_extensions = vkd3d_calloc(*vk_extension_count, sizeof(**vk_extensions)))) + return E_OUTOFMEMORY; + + TRACE("Enumerating %u device extensions.\n", *vk_extension_count); + if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, vk_extension_count, *vk_extensions))) < 0) + { + ERR("Failed to enumerate device extensions, vr %d.\n", vr); + vkd3d_free(*vk_extensions); + return hresult_from_vk_result(vr); + } + + optional_extensions = vkd3d_find_struct(create_info->next, OPTIONAL_DEVICE_EXTENSIONS_INFO); + if (optional_extensions && optional_extensions->extension_count) + { + if (!(*user_extension_supported = vkd3d_calloc(optional_extensions->extension_count, sizeof(bool)))) + { + vkd3d_free(*vk_extensions); + return E_OUTOFMEMORY; + } + } + else + { + *user_extension_supported = NULL; + } + + *device_extension_count = vkd3d_check_extensions(*vk_extensions, *vk_extension_count, + required_device_extensions, ARRAY_SIZE(required_device_extensions), + optional_device_extensions, ARRAY_SIZE(optional_device_extensions), + create_info->device_extensions, create_info->device_extension_count, + optional_extensions ? optional_extensions->extensions : NULL, + optional_extensions ? optional_extensions->extension_count : 0, + *user_extension_supported, vulkan_info, "device", + device->vkd3d_instance->config_flags & VKD3D_CONFIG_FLAG_VULKAN_DEBUG); + + return S_OK; +} + static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, const struct vkd3d_device_create_info *create_info, struct vkd3d_physical_device_info *physical_device_info, @@ -1525,14 +1582,13 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, const VkPhysicalDeviceSubgroupProperties *subgroup_properties = &physical_device_info->subgroup_properties; const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT *fragment_shader_interlock; - const struct vkd3d_optional_device_extensions_info *optional_extensions; VkPhysicalDeviceDescriptorIndexingFeaturesEXT *descriptor_indexing; VkPhysicalDevice physical_device = device->vk_physical_device; struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; VkExtensionProperties *vk_extensions; VkPhysicalDeviceFeatures *features; - uint32_t count; - VkResult vr; + uint32_t vk_extension_count; + HRESULT hr; /* SHUFFLE is required to implement WaveReadLaneAt with dynamically uniform index before SPIR-V 1.5 / Vulkan 1.2. */ static const VkSubgroupFeatureFlags required_subgroup_features = VK_SUBGROUP_FEATURE_ARITHMETIC_BIT @@ -1544,8 +1600,6 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, static const VkSubgroupFeatureFlags required_stages = VK_SHADER_STAGE_COMPUTE_BIT | VK_SHADER_STAGE_FRAGMENT_BIT; - *device_extension_count = 0; - vkd3d_trace_physical_device(physical_device, physical_device_info, vk_procs); vkd3d_trace_physical_device_features(physical_device_info); vkd3d_trace_physical_device_limits(physical_device_info); @@ -1636,47 +1690,9 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, device->feature_options5.RenderPassesTier = D3D12_RENDER_PASS_TIER_0; device->feature_options5.RaytracingTier = D3D12_RAYTRACING_TIER_NOT_SUPPORTED; - if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, NULL))) < 0) - { - ERR("Failed to enumerate device extensions, vr %d.\n", vr); - return hresult_from_vk_result(vr); - } - if (!count) - return S_OK; - - if (!(vk_extensions = vkd3d_calloc(count, sizeof(*vk_extensions)))) - return E_OUTOFMEMORY; - - TRACE("Enumerating %u device extensions.\n", count); - if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, vk_extensions))) < 0) - { - ERR("Failed to enumerate device extensions, vr %d.\n", vr); - vkd3d_free(vk_extensions); - return hresult_from_vk_result(vr); - } - - optional_extensions = vkd3d_find_struct(create_info->next, OPTIONAL_DEVICE_EXTENSIONS_INFO); - if (optional_extensions && optional_extensions->extension_count) - { - if (!(*user_extension_supported = vkd3d_calloc(optional_extensions->extension_count, sizeof(bool)))) - { - vkd3d_free(vk_extensions); - return E_OUTOFMEMORY; - } - } - else - { - *user_extension_supported = NULL; - } - - *device_extension_count = vkd3d_check_extensions(vk_extensions, count, - required_device_extensions, ARRAY_SIZE(required_device_extensions), - optional_device_extensions, ARRAY_SIZE(optional_device_extensions), - create_info->device_extensions, create_info->device_extension_count, - optional_extensions ? optional_extensions->extensions : NULL, - optional_extensions ? optional_extensions->extension_count : 0, - *user_extension_supported, vulkan_info, "device", - device->vkd3d_instance->config_flags & VKD3D_CONFIG_FLAG_VULKAN_DEBUG); + if (FAILED(hr = vkd3d_check_device_extensions(device, create_info, &vk_extensions, &vk_extension_count, + device_extension_count, user_extension_supported))) + return hr; fragment_shader_interlock = &physical_device_info->fragment_shader_interlock_features; if (!fragment_shader_interlock->fragmentShaderSampleInterlock @@ -1703,7 +1719,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vulkan_info->texel_buffer_alignment_properties = physical_device_info->texel_buffer_alignment_properties; - if (get_spec_version(vk_extensions, count, VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME) >= 3) + if (get_spec_version(vk_extensions, vk_extension_count, VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME) >= 3) { const VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *divisor_features; divisor_features = &physical_device_info->vertex_divisor_features;

1 0

Giovanni Mascellani : vkd3d: Init physical device information after checking available extensions.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: vkd3d Branch: master Commit: ea090a34cd2ed16ce345098209977b33304bc27b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ea090a34cd2ed16ce345098209977… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sun May 5 15:10:56 2024 +0200 vkd3d: Init physical device information after checking available extensions. --- libs/vkd3d/device.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 865eba76..9fe4f08d 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1596,6 +1596,12 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, static const VkSubgroupFeatureFlags required_stages = VK_SHADER_STAGE_COMPUTE_BIT | VK_SHADER_STAGE_FRAGMENT_BIT; + if (FAILED(hr = vkd3d_check_device_extensions(device, create_info, &vk_extensions, &vk_extension_count, + device_extension_count, user_extension_supported))) + return hr; + + vkd3d_physical_device_info_init(physical_device_info, device); + vkd3d_trace_physical_device(physical_device, physical_device_info, vk_procs); vkd3d_trace_physical_device_features(physical_device_info); vkd3d_trace_physical_device_limits(physical_device_info); @@ -1686,10 +1692,6 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, device->feature_options5.RenderPassesTier = D3D12_RENDER_PASS_TIER_0; device->feature_options5.RaytracingTier = D3D12_RAYTRACING_TIER_NOT_SUPPORTED; - if (FAILED(hr = vkd3d_check_device_extensions(device, create_info, &vk_extensions, &vk_extension_count, - device_extension_count, user_extension_supported))) - return hr; - fragment_shader_interlock = &physical_device_info->fragment_shader_interlock_features; if (!fragment_shader_interlock->fragmentShaderSampleInterlock || !fragment_shader_interlock->fragmentShaderPixelInterlock) @@ -2112,8 +2114,6 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VK_CALL(vkGetPhysicalDeviceMemoryProperties(physical_device, &device->memory_properties)); - vkd3d_physical_device_info_init(&physical_device_info, device); - if (FAILED(hr = vkd3d_init_device_caps(device, create_info, &physical_device_info, &extension_count, &user_extension_supported))) return hr;

1 0