January 2024 - Wine-commits

Conor McCarthy : vkd3d: Use mutable descriptors if available.
by Alexandre Julliard 09 Jan '24

09 Jan '24

Module: vkd3d Branch: master Commit: b0d1fb7d987b603b6709128729d77a785f5532d3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b0d1fb7d987b603b6709128729d77… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Dec 14 14:58:19 2023 +1000 vkd3d: Use mutable descriptors if available. The mutable descriptor type allows six descriptor sets to be replaced with one set for CBV/SRV/UAV heaps. --- README | 2 +- configure.ac | 2 +- libs/vkd3d/command.c | 3 ++- libs/vkd3d/device.c | 40 +++++++++++++++++++++++++++++++++++++++- libs/vkd3d/resource.c | 22 ++++++++++++++++++---- libs/vkd3d/state.c | 23 +++++++++++++++++++++-- libs/vkd3d/vkd3d_private.h | 1 + 7 files changed, 83 insertions(+), 10 deletions(-)

1 0

Alexandre Julliard : krnl386: Use NtContinue to restore the full context.
by Alexandre Julliard 08 Jan '24

08 Jan '24

Module: wine Branch: master Commit: de3bc7d511909e4bf4b384e395e8bef91587050c URL: https://gitlab.winehq.org/wine/wine/-/commit/de3bc7d511909e4bf4b384e395e8be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 6 22:12:53 2024 +0100 krnl386: Use NtContinue to restore the full context. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56152 --- dlls/krnl386.exe16/kernel16_private.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/krnl386.exe16/kernel16_private.h b/dlls/krnl386.exe16/kernel16_private.h index a70dfeeec9f..cd08c40128f 100644 --- a/dlls/krnl386.exe16/kernel16_private.h +++ b/dlls/krnl386.exe16/kernel16_private.h @@ -335,17 +335,15 @@ static inline DWORD stack32_pop( CONTEXT *context ) __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") \ "movl %esp,%ebp\n\t" \ __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") \ - "leal -(0x2cc+4)(%esp),%esp\n\t" /* sizeof(CONTEXT) + space for %eax */ \ - "movl %eax,-4(%ebp)\n\t" \ + "leal -0x2cc(%esp),%esp\n\t" /* sizeof(CONTEXT) */ \ "pushl %esp\n\t" /* context */ \ "call " __ASM_STDCALL("RtlCaptureContext",4) "\n\t" \ - "movl -4(%ebp),%eax\n\t" \ - "movl %eax,0xb0(%esp)\n\t" /* context->Eax */ \ + "movl %esp,%esi\n\t" \ "pushl %esp\n\t" /* context */ \ "call " __ASM_STDCALL("__regs_" #name,4) "\n\t" \ - "pushl %esp\n\t" /* context */ \ - "pushl $-2\n\t" /* GetCurrentThread() */ \ - "call " __ASM_STDCALL("NtSetContextThread",8) "\n\t" \ + "pushl $0\n\t" /* alertable */ \ + "pushl %esi\n\t" /* context */ \ + "call " __ASM_STDCALL("NtContinue",8) "\n\t" \ "ret" ) /* fake ret to make copy protections happy */ #endif /* __WINE_KERNEL16_PRIVATE_H */

1 0

Alexandre Julliard : krnl386: Align the stack before calling the entry point.
by Alexandre Julliard 08 Jan '24

08 Jan '24

Module: wine Branch: master Commit: 7748c76e35993e433bf46faa37b268055f55626e URL: https://gitlab.winehq.org/wine/wine/-/commit/7748c76e35993e433bf46faa37b268… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 8 10:35:28 2024 +0100 krnl386: Align the stack before calling the entry point. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56152 --- dlls/krnl386.exe16/kernel16_private.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/kernel16_private.h b/dlls/krnl386.exe16/kernel16_private.h index cd08c40128f..9cf60d068a7 100644 --- a/dlls/krnl386.exe16/kernel16_private.h +++ b/dlls/krnl386.exe16/kernel16_private.h @@ -339,7 +339,8 @@ static inline DWORD stack32_pop( CONTEXT *context ) "pushl %esp\n\t" /* context */ \ "call " __ASM_STDCALL("RtlCaptureContext",4) "\n\t" \ "movl %esp,%esi\n\t" \ - "pushl %esp\n\t" /* context */ \ + "andl $~3,%esp\n\t" \ + "pushl %esi\n\t" /* context */ \ "call " __ASM_STDCALL("__regs_" #name,4) "\n\t" \ "pushl $0\n\t" /* alertable */ \ "pushl %esi\n\t" /* context */ \

1 0

Nikolay Sivov : mfreadwrite/tests: Skip tests if D3D9 is unusable.
by Alexandre Julliard 08 Jan '24

08 Jan '24

Module: wine Branch: master Commit: dcd8551142b557bb5994dce159aa44aac98e60cf URL: https://gitlab.winehq.org/wine/wine/-/commit/dcd8551142b557bb5994dce159aa44… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 8 15:16:33 2024 +0100 mfreadwrite/tests: Skip tests if D3D9 is unusable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/tests/mfplat.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index ce74a451b52..c3544a31ac6 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -1374,9 +1374,13 @@ static void test_reader_d3d9(void) UINT token; ULONG refcount; - window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); - ok(!!d3d9, "Failed to create a D3D9 object.\n"); + if (!d3d9) + { + skip("Failed to create a D3D9 object, skipping tests.\n"); + return; + } + window = create_window(); if (!(d3d9_device = create_d3d9_device(d3d9, window))) { skip("Failed to create a D3D9 device, skipping tests.\n");

1 0

Nikolay Sivov : mf/tests: Skip tests if D3D9 is unusable.
by Alexandre Julliard 08 Jan '24

08 Jan '24

Module: wine Branch: master Commit: 7e30b443678bb3ef2236dc6bff4e08255c89fb9a URL: https://gitlab.winehq.org/wine/wine/-/commit/7e30b443678bb3ef2236dc6bff4e08… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 8 15:21:00 2024 +0100 mf/tests: Skip tests if D3D9 is unusable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 84f5e69ac25..3dd0d9b076d 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3756,6 +3756,13 @@ static void test_topology_loader_evr(void) ok(hr == S_OK, "Failed to create activate object, hr %#lx.\n", hr); hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); + if (FAILED(hr)) + { + skip("Failed to create an EVR sink, skipping tests.\n"); + DestroyWindow(window); + IMFActivate_Release(activate); + return; + } ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaSink_GetStreamSinkById(sink, 0, &stream_sink);

1 0

Alex Henrie : winspool: Keep driver_9x in scope while it is in use.
by Alexandre Julliard 08 Jan '24

08 Jan '24

Module: wine Branch: master Commit: 20e3b7b8596b94ad614456fe5de21fa28e7d0098 URL: https://gitlab.winehq.org/wine/wine/-/commit/20e3b7b8596b94ad614456fe5de21f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jan 8 08:27:47 2024 -0700 winspool: Keep driver_9x in scope while it is in use. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54387 --- dlls/winspool.drv/info.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index c1c3b8bf629..45521809f15 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -636,7 +636,7 @@ static BOOL add_printer_driver( const WCHAR *name, const WCHAR *ppd_dir ) DRIVER_INFO_3W di3; unsigned int i; BOOL res = FALSE; - WCHAR raw[] = L"RAW", driver_nt[] = L"wineps.drv"; + WCHAR raw[] = L"RAW", driver_nt[] = L"wineps.drv", driver_9x[] = L"wineps16.drv"; if (!ppd) return FALSE; if (!RtlDosPathNameToNtPathName_U( ppd, &nt_ppd, NULL, NULL )) goto end; @@ -661,7 +661,6 @@ static BOOL add_printer_driver( const WCHAR *name, const WCHAR *ppd_dir ) di3.pEnvironment = (WCHAR *)all_printenv[i]->envname; if (all_printenv[i]->driverversion == 0) { - WCHAR driver_9x[] = L"wineps16.drv"; /* We use wineps16.drv as driver for 16 bit */ di3.pDriverPath = driver_9x; di3.pConfigFile = driver_9x;

1 0

Fabian Maurer : vkd3d: Unlock mutex in error case in d3d12_command_queue_CopyTileMappings.
by Alexandre Julliard 08 Jan '24

08 Jan '24

Module: vkd3d Branch: master Commit: 49d5aecaa71bfd0bb2c9ea6f93532bc7b09957fe URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/49d5aecaa71bfd0bb2c9ea6f93532… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 6 21:25:26 2024 +0100 vkd3d: Unlock mutex in error case in d3d12_command_queue_CopyTileMappings. --- libs/vkd3d/command.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 549f6a45..013b5d07 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -6512,7 +6512,7 @@ static void STDMETHODCALLTYPE d3d12_command_queue_CopyTileMappings(ID3D12Command if (!(op = d3d12_command_queue_op_array_require_space(&command_queue->op_queue))) { ERR("Failed to add op.\n"); - return; + goto unlock_mutex; } op->opcode = VKD3D_CS_OP_COPY_MAPPINGS; op->u.copy_mappings.dst_resource = dst_resource_impl; @@ -6524,6 +6524,7 @@ static void STDMETHODCALLTYPE d3d12_command_queue_CopyTileMappings(ID3D12Command d3d12_command_queue_submit_locked(command_queue); +unlock_mutex: vkd3d_mutex_unlock(&command_queue->op_mutex); }

1 0

Henri Verbeet : vkd3d-shader/hlsl: Store swizzles as a uint32_t.
by Alexandre Julliard 08 Jan '24

08 Jan '24

Module: vkd3d Branch: master Commit: fafe2a1dbadefd5a8a88e89ca3e5d5f49bcb057b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fafe2a1dbadefd5a8a88e89ca3e5d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 6 18:20:25 2023 +0100 vkd3d-shader/hlsl: Store swizzles as a uint32_t. --- libs/vkd3d-shader/hlsl.c | 16 +++++++++------- libs/vkd3d-shader/hlsl.h | 12 ++++++------ libs/vkd3d-shader/hlsl.y | 5 +++-- libs/vkd3d-shader/hlsl_codegen.c | 10 +++++----- 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index da3bbda1..d40a8e67 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1505,7 +1505,7 @@ struct hlsl_ir_node *hlsl_new_resource_store(struct hlsl_ctx *ctx, const struct return &store->node; } -struct hlsl_ir_node *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned int components, +struct hlsl_ir_node *hlsl_new_swizzle(struct hlsl_ctx *ctx, uint32_t s, unsigned int components, struct hlsl_ir_node *val, const struct vkd3d_shader_location *loc) { struct hlsl_ir_swizzle *swizzle; @@ -2432,7 +2432,7 @@ const char *debug_hlsl_writemask(unsigned int writemask) return vkd3d_dbg_sprintf(".%s", string); } -const char *debug_hlsl_swizzle(unsigned int swizzle, unsigned int size) +const char *debug_hlsl_swizzle(uint32_t swizzle, unsigned int size) { static const char components[] = {'x', 'y', 'z', 'w'}; char string[5]; @@ -3147,9 +3147,10 @@ void hlsl_add_function(struct hlsl_ctx *ctx, char *name, struct hlsl_ir_function rb_put(&ctx->functions, func->name, &func->entry); } -unsigned int hlsl_map_swizzle(unsigned int swizzle, unsigned int writemask) +uint32_t hlsl_map_swizzle(uint32_t swizzle, unsigned int writemask) { - unsigned int i, ret = 0; + uint32_t ret = 0; + unsigned int i; /* Leave replicate swizzles alone; some instructions need them. */ if (swizzle == HLSL_SWIZZLE(X, X, X, X) @@ -3169,7 +3170,7 @@ unsigned int hlsl_map_swizzle(unsigned int swizzle, unsigned int writemask) return ret; } -unsigned int hlsl_swizzle_from_writemask(unsigned int writemask) +uint32_t hlsl_swizzle_from_writemask(unsigned int writemask) { static const unsigned int swizzles[16] = { @@ -3210,9 +3211,10 @@ unsigned int hlsl_combine_writemasks(unsigned int first, unsigned int second) return ret; } -unsigned int hlsl_combine_swizzles(unsigned int first, unsigned int second, unsigned int dim) +uint32_t hlsl_combine_swizzles(uint32_t first, uint32_t second, unsigned int dim) { - unsigned int ret = 0, i; + uint32_t ret = 0; + unsigned int i; for (i = 0; i < dim; ++i) { unsigned int s = hlsl_swizzle_get_component(second, i); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 21b2fe38..8c64f0c9 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -65,7 +65,7 @@ #define HLSL_SWIZZLE_MASK (0x3u) #define HLSL_SWIZZLE_SHIFT(idx) (2u * (idx)) -static inline unsigned int hlsl_swizzle_get_component(unsigned int swizzle, unsigned int idx) +static inline unsigned int hlsl_swizzle_get_component(uint32_t swizzle, unsigned int idx) { return (swizzle >> HLSL_SWIZZLE_SHIFT(idx)) & HLSL_SWIZZLE_MASK; } @@ -622,7 +622,7 @@ struct hlsl_ir_swizzle { struct hlsl_ir_node node; struct hlsl_src val; - DWORD swizzle; + uint32_t swizzle; }; struct hlsl_ir_index @@ -1250,7 +1250,7 @@ struct hlsl_ir_node *hlsl_new_resource_store(struct hlsl_ctx *ctx, const struct struct hlsl_ir_node *coords, struct hlsl_ir_node *value, const struct vkd3d_shader_location *loc); struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, struct hlsl_struct_field *fields, size_t field_count); -struct hlsl_ir_node *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned int components, +struct hlsl_ir_node *hlsl_new_swizzle(struct hlsl_ctx *ctx, uint32_t s, unsigned int components, struct hlsl_ir_node *val, const struct vkd3d_shader_location *loc); struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *template, struct hlsl_type *type, const struct vkd3d_shader_location *loc); @@ -1304,10 +1304,10 @@ bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2 const struct hlsl_type *hlsl_get_multiarray_element_type(const struct hlsl_type *type); unsigned int hlsl_get_multiarray_size(const struct hlsl_type *type); -unsigned int hlsl_combine_swizzles(unsigned int first, unsigned int second, unsigned int dim); +uint32_t hlsl_combine_swizzles(uint32_t first, uint32_t second, unsigned int dim); unsigned int hlsl_combine_writemasks(unsigned int first, unsigned int second); -unsigned int hlsl_map_swizzle(unsigned int swizzle, unsigned int writemask); -unsigned int hlsl_swizzle_from_writemask(unsigned int writemask); +uint32_t hlsl_map_swizzle(uint32_t swizzle, unsigned int writemask); +uint32_t hlsl_swizzle_from_writemask(unsigned int writemask); struct hlsl_type *hlsl_deref_get_type(struct hlsl_ctx *ctx, const struct hlsl_deref *deref); enum hlsl_regset hlsl_deref_get_regset(struct hlsl_ctx *ctx, const struct hlsl_deref *deref); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ed053f16..a9959c63 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1717,7 +1717,7 @@ static enum hlsl_ir_expr_op op_from_assignment(enum parse_assign_op op) return ops[op]; } -static bool invert_swizzle(unsigned int *swizzle, unsigned int *writemask, unsigned int *ret_width) +static bool invert_swizzle(uint32_t *swizzle, unsigned int *writemask, unsigned int *ret_width) { unsigned int i, j, bit = 0, inverted = 0, width, new_writemask = 0, new_swizzle = 0; @@ -1791,8 +1791,9 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct hlsl_blo else if (lhs->type == HLSL_IR_SWIZZLE) { struct hlsl_ir_swizzle *swizzle = hlsl_ir_swizzle(lhs); - unsigned int width, s = swizzle->swizzle; struct hlsl_ir_node *new_swizzle; + uint32_t s = swizzle->swizzle; + unsigned int width; if (lhs->data_type->class == HLSL_CLASS_MATRIX) hlsl_fixme(ctx, &lhs->loc, "Matrix assignment with a writemask."); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 88cbef61..f161f248 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1519,7 +1519,7 @@ static void copy_propagation_set_value(struct hlsl_ctx *ctx, struct copy_propaga static bool copy_propagation_replace_with_single_instr(struct hlsl_ctx *ctx, const struct copy_propagation_state *state, const struct hlsl_ir_load *load, - unsigned int swizzle, struct hlsl_ir_node *instr) + uint32_t swizzle, struct hlsl_ir_node *instr) { const unsigned int instr_component_count = hlsl_type_component_count(instr->data_type); const struct hlsl_deref *deref = &load->src; @@ -1527,7 +1527,7 @@ static bool copy_propagation_replace_with_single_instr(struct hlsl_ctx *ctx, struct hlsl_ir_node *new_instr = NULL; unsigned int time = load->node.index; unsigned int start, count, i; - unsigned int ret_swizzle = 0; + uint32_t ret_swizzle = 0; if (!hlsl_component_index_range_from_deref(ctx, deref, &start, &count)) return false; @@ -1573,7 +1573,7 @@ static bool copy_propagation_replace_with_single_instr(struct hlsl_ctx *ctx, static bool copy_propagation_replace_with_constant_vector(struct hlsl_ctx *ctx, const struct copy_propagation_state *state, const struct hlsl_ir_load *load, - unsigned int swizzle, struct hlsl_ir_node *instr) + uint32_t swizzle, struct hlsl_ir_node *instr) { const unsigned int instr_component_count = hlsl_type_component_count(instr->data_type); const struct hlsl_deref *deref = &load->src; @@ -2239,7 +2239,7 @@ static bool fold_swizzle_chains(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr if (next_instr->type == HLSL_IR_SWIZZLE) { struct hlsl_ir_node *new_swizzle; - unsigned int combined_swizzle; + uint32_t combined_swizzle; combined_swizzle = hlsl_combine_swizzles(hlsl_ir_swizzle(next_instr)->swizzle, swizzle->swizzle, instr->data_type->dimx); @@ -3145,7 +3145,7 @@ static bool lower_int_dot(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, stru for (i = 0; i < dimx; ++i) { - unsigned int s = hlsl_swizzle_from_writemask(1 << i); + uint32_t s = hlsl_swizzle_from_writemask(1 << i); if (!(comps[i] = hlsl_new_swizzle(ctx, s, 1, mult, &instr->loc))) return false;

1 0

Henri Verbeet : vkd3d-shader/hlsl: Store modifier flags as a uint32_t.
by Alexandre Julliard 08 Jan '24

08 Jan '24

Module: vkd3d Branch: master Commit: 3344c4e93d5b1848804a9b16fdcbb1e568463c29 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3344c4e93d5b1848804a9b16fdcbb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 6 19:36:35 2023 +0100 vkd3d-shader/hlsl: Store modifier flags as a uint32_t. --- libs/vkd3d-shader/hlsl.c | 6 +++--- libs/vkd3d-shader/hlsl.h | 10 +++++----- libs/vkd3d-shader/hlsl.y | 26 +++++++++++++------------- libs/vkd3d-shader/hlsl_codegen.c | 12 ++++++------ 4 files changed, 27 insertions(+), 27 deletions(-)

1 0

Henri Verbeet : vkd3d: Implement support for static border colours.
by Alexandre Julliard 08 Jan '24

08 Jan '24

Module: vkd3d Branch: master Commit: 9060baacec548afa81610d7aef2ecd245bcd8e6e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9060baacec548afa81610d7aef2ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 3 18:53:00 2024 +0100 vkd3d: Implement support for static border colours. --- libs/vkd3d/resource.c | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 356c2f09..79db794d 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -3662,11 +3662,27 @@ static VkSamplerAddressMode vk_address_mode_from_d3d12(const struct d3d12_device } } +static VkBorderColor vk_border_colour_from_d3d12(D3D12_STATIC_BORDER_COLOR colour) +{ + switch (colour) + { + case D3D12_STATIC_BORDER_COLOR_TRANSPARENT_BLACK: + return VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK; + case D3D12_STATIC_BORDER_COLOR_OPAQUE_BLACK: + return VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK; + case D3D12_STATIC_BORDER_COLOR_OPAQUE_WHITE: + return VK_BORDER_COLOR_FLOAT_OPAQUE_WHITE; + default: + FIXME("Unhandled border colour %#x.\n", colour); + return VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK; + } +} + static VkResult d3d12_create_sampler(struct d3d12_device *device, D3D12_FILTER filter, D3D12_TEXTURE_ADDRESS_MODE address_u, D3D12_TEXTURE_ADDRESS_MODE address_v, D3D12_TEXTURE_ADDRESS_MODE address_w, float mip_lod_bias, unsigned int max_anisotropy, - D3D12_COMPARISON_FUNC comparison_func, float min_lod, float max_lod, - VkSampler *vk_sampler) + D3D12_COMPARISON_FUNC comparison_func, D3D12_STATIC_BORDER_COLOR border_colour, + float min_lod, float max_lod, VkSampler *vk_sampler) { const struct vkd3d_vk_device_procs *vk_procs; struct VkSamplerCreateInfo sampler_desc; @@ -3696,6 +3712,11 @@ static VkResult d3d12_create_sampler(struct d3d12_device *device, D3D12_FILTER f sampler_desc.maxLod = max_lod; sampler_desc.borderColor = VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK; sampler_desc.unnormalizedCoordinates = VK_FALSE; + + if (address_u == D3D12_TEXTURE_ADDRESS_MODE_BORDER || address_v == D3D12_TEXTURE_ADDRESS_MODE_BORDER + || address_w == D3D12_TEXTURE_ADDRESS_MODE_BORDER) + sampler_desc.borderColor = vk_border_colour_from_d3d12(border_colour); + if ((vr = VK_CALL(vkCreateSampler(device->vk_device, &sampler_desc, NULL, vk_sampler))) < 0) WARN("Failed to create Vulkan sampler, vr %d.\n", vr); @@ -3725,9 +3746,9 @@ void d3d12_desc_create_sampler(struct d3d12_desc *sampler, view->v.u.vk_sampler = VK_NULL_HANDLE; view->v.format = NULL; - if (d3d12_create_sampler(device, desc->Filter, desc->AddressU, - desc->AddressV, desc->AddressW, desc->MipLODBias, desc->MaxAnisotropy, - desc->ComparisonFunc, desc->MinLOD, desc->MaxLOD, &view->v.u.vk_sampler) < 0) + if (d3d12_create_sampler(device, desc->Filter, desc->AddressU, desc->AddressV, + desc->AddressW, desc->MipLODBias, desc->MaxAnisotropy, desc->ComparisonFunc, + D3D12_STATIC_BORDER_COLOR_TRANSPARENT_BLACK, desc->MinLOD, desc->MaxLOD, &view->v.u.vk_sampler) < 0) { vkd3d_view_decref(view, device); return; @@ -3741,14 +3762,9 @@ HRESULT vkd3d_create_static_sampler(struct d3d12_device *device, { VkResult vr; - if (desc->AddressU == D3D12_TEXTURE_ADDRESS_MODE_BORDER - || desc->AddressV == D3D12_TEXTURE_ADDRESS_MODE_BORDER - || desc->AddressW == D3D12_TEXTURE_ADDRESS_MODE_BORDER) - FIXME("Ignoring border %#x.\n", desc->BorderColor); - - vr = d3d12_create_sampler(device, desc->Filter, desc->AddressU, - desc->AddressV, desc->AddressW, desc->MipLODBias, desc->MaxAnisotropy, - desc->ComparisonFunc, desc->MinLOD, desc->MaxLOD, vk_sampler); + vr = d3d12_create_sampler(device, desc->Filter, desc->AddressU, desc->AddressV, + desc->AddressW, desc->MipLODBias, desc->MaxAnisotropy, desc->ComparisonFunc, + desc->BorderColor, desc->MinLOD, desc->MaxLOD, vk_sampler); return hresult_from_vk_result(vr); }

1 0