August 2021 - Wine-Commits - list.winehq.org

Zebediah Figura : vkd3d-shader/hlsl: Write the SM4 ret instruction.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: vkd3d Branch: master Commit: 636ec273817e9b58c2bf622230a893466deb60f1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=636ec273817e9b58c2bf622… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 19 18:44:31 2021 -0500 vkd3d-shader/hlsl: Write the SM4 ret instruction. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index a66bcaa..253aa24 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -775,6 +775,16 @@ static void write_sm4_dcl_temps(struct vkd3d_bytecode_buffer *buffer, uint32_t t write_sm4_instruction(buffer, &instr); } +static void write_sm4_ret(struct vkd3d_bytecode_buffer *buffer) +{ + struct sm4_instruction instr = + { + .opcode = VKD3D_SM4_OP_RET, + }; + + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_shdr(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) { const struct hlsl_profile_info *profile = ctx->profile; @@ -813,6 +823,8 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) if (ctx->temp_count) write_sm4_dcl_temps(&buffer, ctx->temp_count); + write_sm4_ret(&buffer); + dxbc_writer_add_section(dxbc, TAG_SHDR, buffer.data, buffer.size); }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 constant buffer declarations.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: vkd3d Branch: master Commit: 5da4949f7c4aa39b5156ab6dbfa1af188ff4a748 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5da4949f7c4aa39b5156ab6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 19 18:44:28 2021 -0500 vkd3d-shader/hlsl: Write SM4 constant buffer declarations. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 116 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 894c513..029dc3d 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -549,10 +549,120 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) dxbc_writer_add_section(dxbc, TAG_RDEF, buffer.data, buffer.size); } +struct sm4_register +{ + enum vkd3d_sm4_register_type type; + uint32_t idx[2]; + unsigned int idx_count; + enum vkd3d_sm4_dimension dim; +}; + +struct sm4_instruction +{ + enum vkd3d_sm4_opcode opcode; + + struct + { + struct sm4_register reg; + unsigned int writemask; + } dst; + + struct + { + struct sm4_register reg; + unsigned int swizzle; + } srcs[2]; + unsigned int src_count; + + unsigned int has_dst; +}; + +static unsigned int sm4_swizzle_type(enum vkd3d_sm4_register_type type) +{ + switch (type) + { + case VKD3D_SM4_RT_CONSTBUFFER: + return VKD3D_SM4_SWIZZLE_VEC4; + + default: + FIXME("Unhandled register type %#x.\n", type); + return VKD3D_SM4_SWIZZLE_VEC4; + } +} + +static uint32_t sm4_encode_register(const struct sm4_register *reg) +{ + return (reg->type << VKD3D_SM4_REGISTER_TYPE_SHIFT) + | (reg->idx_count << VKD3D_SM4_REGISTER_ORDER_SHIFT) + | (reg->dim << VKD3D_SM4_DIMENSION_SHIFT); +} + +static uint32_t sm4_register_order(const struct sm4_register *reg) +{ + uint32_t order = 1; + if (reg->type == VKD3D_SM4_RT_IMMCONST) + order += reg->dim == VKD3D_SM4_DIMENSION_VEC4 ? 4 : 1; + order += reg->idx_count; + return order; +} + +static void write_sm4_instruction(struct vkd3d_bytecode_buffer *buffer, const struct sm4_instruction *instr) +{ + uint32_t token = instr->opcode; + unsigned int size = 1, i, j; + + if (instr->has_dst) + size += sm4_register_order(&instr->dst.reg); + for (i = 0; i < instr->src_count; ++i) + size += sm4_register_order(&instr->srcs[i].reg); + + token |= (size << VKD3D_SM4_INSTRUCTION_LENGTH_SHIFT); + put_u32(buffer, token); + + if (instr->has_dst) + { + token = sm4_encode_register(&instr->dst.reg); + if (instr->dst.reg.dim == VKD3D_SM4_DIMENSION_VEC4) + token |= instr->dst.writemask << VKD3D_SM4_WRITEMASK_SHIFT; + put_u32(buffer, token); + + for (j = 0; j < instr->dst.reg.idx_count; ++j) + put_u32(buffer, instr->dst.reg.idx[j]); + } + + for (i = 0; i < instr->src_count; ++i) + { + token = sm4_encode_register(&instr->srcs[i].reg); + token |= sm4_swizzle_type(instr->srcs[i].reg.type) << VKD3D_SM4_SWIZZLE_TYPE_SHIFT; + token |= instr->srcs[i].swizzle << VKD3D_SM4_SWIZZLE_SHIFT; + put_u32(buffer, token); + + for (j = 0; j < instr->srcs[i].reg.idx_count; ++j) + put_u32(buffer, instr->srcs[i].reg.idx[j]); + } +} + +static void write_sm4_dcl_constant_buffer(struct vkd3d_bytecode_buffer *buffer, const struct hlsl_buffer *cbuffer) +{ + const struct sm4_instruction instr = + { + .opcode = VKD3D_SM4_OP_DCL_CONSTANT_BUFFER, + + .srcs[0].reg.dim = VKD3D_SM4_DIMENSION_VEC4, + .srcs[0].reg.type = VKD3D_SM4_RT_CONSTBUFFER, + .srcs[0].reg.idx = {cbuffer->reg.id, (cbuffer->used_size + 3) / 4}, + .srcs[0].reg.idx_count = 2, + .srcs[0].swizzle = HLSL_SWIZZLE(X, Y, Z, W), + .src_count = 1, + }; + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_shdr(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) { const struct hlsl_profile_info *profile = ctx->profile; struct vkd3d_bytecode_buffer buffer = {0}; + const struct hlsl_buffer *cbuffer; static const uint16_t shader_types[VKD3D_SHADER_TYPE_COUNT] = { @@ -570,6 +680,12 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) put_u32(&buffer, vkd3d_make_u32((profile->major_version << 4) | profile->minor_version, shader_types[profile->type])); put_u32(&buffer, 0); /* FIXME: instruction token count */ + LIST_FOR_EACH_ENTRY(cbuffer, &ctx->buffers, struct hlsl_buffer, entry) + { + if (cbuffer->reg.allocated) + write_sm4_dcl_constant_buffer(&buffer, cbuffer); + } + dxbc_writer_add_section(dxbc, TAG_SHDR, buffer.data, buffer.size); }

1 0

Zebediah Figura : include: Update the D3D_SHADER_VARIABLE_TYPE enumeration.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: vkd3d Branch: master Commit: 486c525dc1185ed2a27c2e847135c5ece51b69f4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=486c525dc1185ed2a27c2e8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 19 18:44:26 2021 -0500 include: Update the D3D_SHADER_VARIABLE_TYPE enumeration. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3dcommon.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/vkd3d_d3dcommon.idl b/include/vkd3d_d3dcommon.idl index 0359a74..ed6f270 100644 --- a/include/vkd3d_d3dcommon.idl +++ b/include/vkd3d_d3dcommon.idl @@ -191,6 +191,12 @@ typedef enum _D3D_SHADER_VARIABLE_TYPE D3D_SVT_RWSTRUCTURED_BUFFER, D3D_SVT_APPEND_STRUCTURED_BUFFER, D3D_SVT_CONSUME_STRUCTURED_BUFFER, + D3D_SVT_MIN8FLOAT, + D3D_SVT_MIN10FLOAT, + D3D_SVT_MIN16FLOAT, + D3D_SVT_MIN12INT, + D3D_SVT_MIN16INT, + D3D_SVT_MIN16UINT, D3D_SVT_FORCE_DWORD = 0x7fffffff, } D3D_SHADER_VARIABLE_TYPE;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use vkd3d_make_u32() in more places.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: vkd3d Branch: master Commit: 62c60776b95730eb0534aabc3f630c6ac810c051 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=62c60776b95730eb0534aab… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 19 18:44:25 2021 -0500 vkd3d-shader/hlsl: Use vkd3d_make_u32() in more places. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 9f5c18d..38c7162 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -163,9 +163,9 @@ static void write_sm4_type(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b } } - type->bytecode_offset = put_u32(buffer, sm4_class(type) | (sm4_base_type(type) << 16)); - put_u32(buffer, type->dimy | (type->dimx << 16)); - put_u32(buffer, array_size | (field_count << 16)); + type->bytecode_offset = put_u32(buffer, vkd3d_make_u32(sm4_class(type), sm4_base_type(type))); + put_u32(buffer, vkd3d_make_u32(type->dimy, type->dimx)); + put_u32(buffer, vkd3d_make_u32(array_size, field_count)); put_u32(buffer, fields_offset); if (profile->major_version >= 5) @@ -207,7 +207,8 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) cbuffer_position = put_u32(&buffer, 0); put_u32(&buffer, cbuffer_count); /* bound resource count */ resource_position = put_u32(&buffer, 0); - put_u32(&buffer, (target_types[profile->type] << 16) | (profile->major_version << 8) | profile->minor_version); + put_u32(&buffer, vkd3d_make_u32(vkd3d_make_u16(profile->minor_version, profile->major_version), + target_types[profile->type])); put_u32(&buffer, 0); /* FIXME: compilation flags */ creator_position = put_u32(&buffer, 0); @@ -371,7 +372,7 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) VKD3D_SM4_LIB, }; - put_u32(&buffer, (shader_types[profile->type] << 16) | (profile->major_version << 4) | profile->minor_version); + put_u32(&buffer, vkd3d_make_u32((profile->major_version << 4) | profile->minor_version, shader_types[profile->type])); put_u32(&buffer, 0); /* FIXME: instruction token count */ dxbc_writer_add_section(dxbc, TAG_SHDR, buffer.data, buffer.size);

1 0

Julian Rüger : German translation for release 6.13.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: website Branch: master Commit: e8af1f8cf19a2e426be4d5a13a5d9412bf1db491 URL: https://source.winehq.org/git/website.git/?a=commit;h=e8af1f8cf19a2e426be4d… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Aug 23 14:03:52 2021 +0200 German translation for release 6.13. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2021072001.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2021072001.xml b/news/de/2021072001.xml new file mode 100644 index 00000000..c964fb5c --- /dev/null +++ b/news/de/2021072001.xml @@ -0,0 +1,17 @@ +<news> +<date>20. Juli 2021</date> +<title>Wine 6.13 freigegeben</title> +<body> + Die Entwicklungsversion 6.13 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/6.13">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Korrektes Theming von Scrollleisten.</li> + <li>Fortschritte Richtung PE-Konversion von WinSock.</li> + <li>Vorbereitungsarbeit für eine GDI-Syscall-Schnittstelle.</li> + <li>Kleinere Fortschritte der PE-Konversion von IPHLPAPI.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> + +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/6.x/wine-6.13.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 6.15.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: website Branch: master Commit: 270b80c1a91d55a5774fa1bd9692c9d9bf87fab8 URL: https://source.winehq.org/git/website.git/?a=commit;h=270b80c1a91d55a5774fa… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Aug 23 14:11:44 2021 +0200 German translation for release 6.15. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2021081301.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/de/2021081301.xml b/news/de/2021081301.xml new file mode 100644 index 00000000..f8714f08 --- /dev/null +++ b/news/de/2021081301.xml @@ -0,0 +1,18 @@ +<news> +<date>13. August 2021</date> +<title>Wine 6.15 freigegeben</title> +<body> + Die Entwicklungsversion 6.15 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/6.15">Neuerungen (en)</a> in dieser Version: +<ul> + <li>WinSock-Bibliothek (WS2_32) nach PE konvertiert.</li> + <li>Unterstützung von Performance-Daten in der Registrierung.</li> + <li>Weitere 32->64-Bit-Thunks für NTDLL-Aufrufe.</li> + <li>Verbesserter Umgang mit Fließkommastatus in der C-Laufzeit.</li> + <li>Weitere Vorbereitung auf die GDI-Syscall-Schnittstelle.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> + +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/6.x/wine-6.15.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 6.14.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: website Branch: master Commit: 71b903a9e3ff256dc6614fc4a1162b633be7b6a4 URL: https://source.winehq.org/git/website.git/?a=commit;h=71b903a9e3ff256dc6614… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Aug 23 14:06:52 2021 +0200 German translation for release 6.14. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2021073001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2021073001.xml b/news/de/2021073001.xml new file mode 100644 index 00000000..c3d4ba44 --- /dev/null +++ b/news/de/2021073001.xml @@ -0,0 +1,16 @@ +<news> +<date>30. Juli 2021</date> +<title>Wine 6.14 freigegeben</title> +<body> + Die Entwicklungsversion 6.14 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/6.14">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Mono-Engine auf Version 6.3.0 aktualisiert, inkl. Neuerungen des Upstream-Projekts.</li> + <li>32->64-Bit-Thunks in WoW64-DLL implementiert.</li> + <li>Weitere Vorbereitung auf die GDI-Syscall-Schnittstelle.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> + +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/6.x/wine-6.14.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Francois Gouget : winetest: Add support for Windows 10 21H1.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: tools Branch: master Commit: c4e7c4c25975028fb7cae6778694e2c4bc98efa8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c4e7c4c25975028fb7cae67… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Aug 22 14:52:12 2021 +0200 winetest: Add support for Windows 10 21H1. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 2 +- winetest/winetest.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index a11c3de..2ee5d5b 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -426,7 +426,7 @@ my %platform_order = ( win1709 => 1709, win1803 => 1803, win1809 => 1809, win1903 => 1903, win1909 => 1909, win2004 => 2004, - win2009 => 2009, + win2009 => 2009, win21H1 => 2101, win10 => 2100, # for backward compatibility wine => 3000, linux => 3001, mac => 3001, bsd => 3002, solaris => 3003 diff --git a/winetest/winetest.conf b/winetest/winetest.conf index 5ac2261..3db146a 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -50,7 +50,7 @@ $fixed_threshold = 0.99; { name => "Win1709+", ids => [ "win1709", "win1803", "win1809", "win1903" ] }, { name => "Win1909+", ids => [ "win1909" ] }, { name => "Win10", ids => [ "win2009", "win10" ] }, # win10 for backward compatibility - { name => "Win10L", ids => [ "win2004" ] }, + { name => "Win10L", ids => [ "win2004", "win21H1" ] }, { name => "Other", ids => [ "unknown" ] }, { name => "Linux", ids => [ "linux" ] }, { name => "Mac", ids => [ "mac" ] },

1 0

Georg Lehmann : winex11.drv: Only return vulkan functions if the host function is available.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: 71f7915650c5d779747ca0286086e69aff99b2dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=71f7915650c5d779747ca028… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Aug 20 13:24:47 2021 +0200 winex11.drv: Only return vulkan functions if the host function is available. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/vulkan.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index bdc287afeea..1bbdba2ce1d 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -435,12 +435,25 @@ static VkResult X11DRV_vkGetDeviceGroupSurfacePresentModesKHR(VkDevice device, return pvkGetDeviceGroupSurfacePresentModesKHR(device, x11_surface->surface, flags); } +static const char *wine_vk_native_fn_name(const char *name) +{ + if (!strcmp(name, "vkCreateWin32SurfaceKHR")) + return "vkCreateXlibSurfaceKHR"; + if (!strcmp(name, "vkGetPhysicalDeviceWin32PresentationSupportKHR")) + return "vkGetPhysicalDeviceXlibPresentationSupportKHR"; + + return name; +} + static void *X11DRV_vkGetDeviceProcAddr(VkDevice device, const char *name) { void *proc_addr; TRACE("%p, %s\n", device, debugstr_a(name)); + if (!pvkGetDeviceProcAddr(device, wine_vk_native_fn_name(name))) + return NULL; + if ((proc_addr = X11DRV_get_vk_device_proc_addr(name))) return proc_addr; @@ -453,6 +466,9 @@ static void *X11DRV_vkGetInstanceProcAddr(VkInstance instance, const char *name) TRACE("%p, %s\n", instance, debugstr_a(name)); + if (!pvkGetInstanceProcAddr(instance, wine_vk_native_fn_name(name))) + return NULL; + if ((proc_addr = X11DRV_get_vk_instance_proc_addr(instance, name))) return proc_addr;

1 0

Georg Lehmann : winemac.drv: Only return vulkan functions if the host function is available.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: 6dee57f30ec65975ce6ecd689d5b6c3a2cc8d0ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dee57f30ec65975ce6ecd68… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Aug 20 13:24:48 2021 +0200 winemac.drv: Only return vulkan functions if the host function is available. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/vulkan.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index 21ebcc56519..f546e3ccfa5 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -420,12 +420,32 @@ static VkResult macdrv_vkEnumerateInstanceExtensionProperties(const char *layer_ return res; } +static const char *wine_vk_native_fn_name(const char *name) +{ + const char *create_surface_name = + pvkCreateMetalSurfaceEXT ? "vkCreateMetalSurfaceEXT" : "vkCreateMacOSSurfaceMVK"; + + if (!strcmp(name, "vkCreateWin32SurfaceKHR")) + return create_surface_name; + /* We just need something where non-NULL is returned if the correct extension is enabled. + * So since there is no native equivalent of this function check for the create + * surface function. + */ + if (!strcmp(name, "vkGetPhysicalDeviceWin32PresentationSupportKHR")) + return create_surface_name; + + return name; +} + static void *macdrv_vkGetDeviceProcAddr(VkDevice device, const char *name) { void *proc_addr; TRACE("%p, %s\n", device, debugstr_a(name)); + if (!pvkGetDeviceProcAddr(device, wine_vk_native_fn_name(name))) + return NULL; + if ((proc_addr = macdrv_get_vk_device_proc_addr(name))) return proc_addr; @@ -438,6 +458,9 @@ static void *macdrv_vkGetInstanceProcAddr(VkInstance instance, const char *name) TRACE("%p, %s\n", instance, debugstr_a(name)); + if (!pvkGetInstanceProcAddr(instance, wine_vk_native_fn_name(name))) + return NULL; + if ((proc_addr = macdrv_get_vk_instance_proc_addr(instance, name))) return proc_addr;

1 0