January 2024 - Wine-Commits

Hans Leidekker : dssenh: Finalize the hash if necessary in CPVerifySignature().
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: wine Branch: master Commit: 1d0551ca49fdff68364f7cac42415cea0f586b16 URL: https://gitlab.winehq.org/wine/wine/-/commit/1d0551ca49fdff68364f7cac42415c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 12 13:14:08 2023 +0100 dssenh: Finalize the hash if necessary in CPVerifySignature(). --- dlls/dssenh/main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 6772d062fc5..365b365f53f 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -1012,5 +1012,11 @@ BOOL WINAPI CPVerifySignature( HCRYPTPROV hprov, HCRYPTHASH hhash, const BYTE *s return FALSE; } + if (!hash->finished) + { + if (BCryptFinishHash( hash->handle, hash->value, hash->len, 0 )) return FALSE; + hash->finished = TRUE; + } + return !BCryptVerifySignature( key->handle, NULL, hash->value, hash->len, (UCHAR *)sig, siglen, 0 ); }

1 0

Rémi Bernon : dinput/tests: Add a test with a virtual HID keyboard.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: wine Branch: master Commit: abee0d45021f1be3626c1c2d91fb48284b0ea272 URL: https://gitlab.winehq.org/wine/wine/-/commit/abee0d45021f1be3626c1c2d91fb48… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 19 17:37:41 2023 +0200 dinput/tests: Add a test with a virtual HID keyboard. --- dlls/dinput/tests/device8.c | 148 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index e3cd75f7c08..594a34222ce 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -2488,6 +2488,153 @@ static void test_sys_keyboard_action_format(void) ok( ref == 0, "Release returned %ld\n", ref ); } +static UINT key_down_count; +static UINT key_up_count; + +static LRESULT CALLBACK keyboard_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); + + if (msg == WM_KEYDOWN) + { + key_down_count++; + if (us_kbd) ok( wparam == 'A', "got wparam %#Ix\n", wparam ); + ok( lparam == 0x1e0001, "got lparam %#Ix\n", lparam ); + } + if (msg == WM_KEYUP) + { + key_up_count++; + if (us_kbd) ok( wparam == 'A', "got wparam %#Ix\n", wparam ); + ok( lparam == 0xc01e0001, "got lparam %#Ix\n", lparam ); + } + return DefWindowProcA( hwnd, msg, wparam, lparam ); +} + +static void test_hid_keyboard(void) +{ +#include "psh_hid_macros.h" + const unsigned char report_desc[] = + { + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_KEYBOARD), + COLLECTION(1, Application), + USAGE(1, HID_USAGE_GENERIC_KEYBOARD), + COLLECTION(1, Physical), + REPORT_ID(1, 1), + + USAGE_PAGE(1, HID_USAGE_PAGE_KEYBOARD), + USAGE_MINIMUM(1, HID_USAGE_KEYBOARD_aA), + USAGE_MAXIMUM(1, HID_USAGE_KEYBOARD_zZ), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + REPORT_SIZE(1, 1), + REPORT_COUNT(1, 32), + INPUT(1, Data|Var|Abs), + END_COLLECTION, + END_COLLECTION, + }; + C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); +#include "pop_hid_macros.h" + + const HID_DEVICE_ATTRIBUTES attributes = + { + .Size = sizeof(HID_DEVICE_ATTRIBUTES), + .VendorID = LOWORD(EXPECT_VIDPID), + .ProductID = 0x0003, + .VersionNumber = 0x0100, + }; + struct hid_device_desc desc = + { + .caps = { .InputReportByteLength = 5 }, + .attributes = attributes, + .use_report_id = 1, + }; + struct hid_expect key_press_release[] = + { + { + .code = IOCTL_HID_READ_REPORT, + .report_buf = {1,0x01,0x00,0x00,0x00}, + }, + { + .code = IOCTL_HID_READ_REPORT, + .report_buf = {1,0x00,0x00,0x00,0x00}, + }, + }; + + WCHAR device_path[MAX_PATH]; + HANDLE file; + DWORD res; + HWND hwnd; + BOOL ret; + + winetest_push_context( "keyboard" ); + + desc.report_descriptor_len = sizeof(report_desc); + memcpy( desc.report_descriptor_buf, report_desc, sizeof(report_desc) ); + fill_context( desc.context, ARRAY_SIZE(desc.context) ); + + if (!hid_device_start_( &desc, 1, 5000 /* needs a long timeout on Win7 */ )) goto done; + + swprintf( device_path, MAX_PATH, L"\\\\?\\hid#vid_%04x&pid_%04x", desc.attributes.VendorID, + desc.attributes.ProductID ); + ret = find_hid_device_path( device_path ); + ok( ret, "Failed to find HID device matching %s\n", debugstr_w( device_path ) ); + + + /* windows doesn't let us open HID keyboard devices */ + + file = CreateFileW( device_path, FILE_READ_ACCESS | FILE_WRITE_ACCESS, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL ); + todo_wine + ok( file == INVALID_HANDLE_VALUE, "CreateFileW succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_ACCESS_DENIED, "got error %lu\n", GetLastError() ); + CloseHandle( file ); + + file = CreateFileW( L"\\\\?\\root#winetest#0#{deadbeef-29ef-4538-a5fd-b69573a362c0}", 0, 0, + NULL, OPEN_EXISTING, 0, NULL ); + ok( file != INVALID_HANDLE_VALUE, "CreateFile failed, error %lu\n", GetLastError() ); + + + /* check basic keyboard input injection to window message */ + + hwnd = create_foreground_window( FALSE ); + SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)keyboard_wndproc ); + + key_down_count = 0; + key_up_count = 0; + bus_send_hid_input( file, &desc, &key_press_release[0], sizeof(key_press_release[0]) ); + + res = MsgWaitForMultipleObjects( 0, NULL, FALSE, 500, QS_KEY ); + todo_wine + ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); + msg_wait_for_events( 0, NULL, 5 ); /* process pending messages */ + todo_wine + ok( key_down_count == 1, "got key_down_count %u\n", key_down_count ); + ok( key_up_count == 0, "got key_up_count %u\n", key_up_count ); + + bus_send_hid_input( file, &desc, &key_press_release[1], sizeof(key_press_release[1]) ); + + res = MsgWaitForMultipleObjects( 0, NULL, FALSE, 500, QS_KEY ); + todo_wine + ok( !res, "MsgWaitForMultipleObjects returned %#lx\n", res ); + msg_wait_for_events( 0, NULL, 5 ); /* process pending messages */ + todo_wine + ok( key_down_count == 1, "got key_down_count %u\n", key_down_count ); + todo_wine + ok( key_up_count == 1, "got key_up_count %u\n", key_up_count ); + + DestroyWindow( hwnd ); + + + CloseHandle( file ); + +done: + hid_device_stop( &desc, 1 ); + + winetest_pop_context(); +} + START_TEST(device8) { dinput_test_init(); @@ -2517,6 +2664,7 @@ START_TEST(device8) if (!bus_device_start()) goto done; test_hid_mouse(); + test_hid_keyboard(); done: bus_device_stop();

1 0

Rémi Bernon : dinput/tests: Add a test with a virtual HID touch screen.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: wine Branch: master Commit: 4f95ad1ad13062452bac2423e0840c0d2ab1844d URL: https://gitlab.winehq.org/wine/wine/-/commit/4f95ad1ad13062452bac2423e0840c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 16 18:01:32 2023 +0100 dinput/tests: Add a test with a virtual HID touch screen. --- dlls/dinput/tests/device8.c | 270 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 270 insertions(+)

1 0

Hans Leidekker : bcrypt: Fix private data size in wow64 thunks.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: wine Branch: master Commit: 7231d4586d3ceccdf46f13bdd696d2b3ce0dc675 URL: https://gitlab.winehq.org/wine/wine/-/commit/7231d4586d3ceccdf46f13bdd696d2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 22 13:49:37 2024 +0100 bcrypt: Fix private data size in wow64 thunks. --- dlls/bcrypt/bcrypt_internal.h | 3 ++- dlls/bcrypt/gnutls.c | 14 +++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index f6556eb2aaa..f0157e86a73 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -184,11 +184,12 @@ struct key_asymmetric DSSSEED dss_seed; }; +#define PRIVATE_DATA_SIZE 3 struct key { struct object hdr; enum alg_id alg_id; - UINT64 private[3]; /* private data for backend */ + UINT64 private[PRIVATE_DATA_SIZE]; /* private data for backend */ union { struct key_symmetric s; diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 512731dfcd3..ec1f0fb09ce 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -2741,7 +2741,7 @@ struct key32 { struct object hdr; enum alg_id alg_id; - UINT64 private[2]; /* private data for backend */ + UINT64 private[PRIVATE_DATA_SIZE]; /* private data for backend */ union { struct key_symmetric32 s; @@ -2791,8 +2791,7 @@ static struct key *get_symmetric_key( struct key32 *key32, struct key *key ) { key->hdr = key32->hdr; key->alg_id = key32->alg_id; - key->private[0] = key32->private[0]; - key->private[1] = key32->private[1]; + memcpy( key->private, key32->private, sizeof(key->private) ); key->u.s.mode = key32->u.s.mode; key->u.s.block_size = key32->u.s.block_size; key->u.s.vector = ULongToPtr(key32->u.s.vector); @@ -2806,8 +2805,7 @@ static struct key *get_asymmetric_key( struct key32 *key32, struct key *key ) { key->hdr = key32->hdr; key->alg_id = key32->alg_id; - key->private[0] = key32->private[0]; - key->private[1] = key32->private[1]; + memcpy( key->private, key32->private, sizeof(key->private) ); key->u.a.bitlen = key32->u.a.bitlen; key->u.a.flags = key32->u.a.flags; key->u.a.dss_seed = key32->u.a.dss_seed; @@ -2816,14 +2814,12 @@ static struct key *get_asymmetric_key( struct key32 *key32, struct key *key ) static void put_symmetric_key32( struct key *key, struct key32 *key32 ) { - key32->private[0] = key->private[0]; - key32->private[1] = key->private[1]; + memcpy( key32->private, key->private, sizeof(key32->private) ); } static void put_asymmetric_key32( struct key *key, struct key32 *key32 ) { - key32->private[0] = key->private[0]; - key32->private[1] = key->private[1]; + memcpy( key32->private, key->private, sizeof(key32->private) ); key32->u.a.flags = key->u.a.flags; key32->u.a.dss_seed = key->u.a.dss_seed; }

1 0

Henri Verbeet : vkd3d: Use debugstr_hresult() in vkd3d_init_null_resources().
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: vkd3d Branch: master Commit: e4cc4a336ebe0c84cf411a3e50104dcae6d130df URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e4cc4a336ebe0c84cf411a3e50104… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 17:56:58 2024 +0100 vkd3d: Use debugstr_hresult() in vkd3d_init_null_resources(). --- libs/vkd3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f9e50335..a360b0ef 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -4923,7 +4923,7 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, return vkd3d_init_null_resources_data(null_resources, device); fail: - ERR("Failed to initialize NULL resources, hr %#x.\n", hr); + ERR("Failed to initialise NULL resources, hr %s.\n", debugstr_hresult(hr)); vkd3d_destroy_null_resources(null_resources, device); return hr; }

1 0

Henri Verbeet : vkd3d: Use debugstr_hresult() in d3d12_device_init().
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: vkd3d Branch: master Commit: e965701776c0ce8cadd46dd97d3430a6cd999410 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e965701776c0ce8cadd46dd97d343… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 18:05:31 2024 +0100 vkd3d: Use debugstr_hresult() in d3d12_device_init(). --- libs/vkd3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 80fa9d35..88cf9aa1 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -4404,7 +4404,7 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, if (device->use_vk_heaps && FAILED(hr = vkd3d_create_thread(device->vkd3d_instance, device_worker_main, device, &device->worker_thread))) { - WARN("Failed to create worker thread, hr %#x.\n", hr); + WARN("Failed to create worker thread, hr %s.\n", debugstr_hresult(hr)); goto out_cleanup_descriptor_heap_layouts; }

1 0

Conor McCarthy : vkd3d-shader/spirv: Emit DISCARD as a function call.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: vkd3d Branch: master Commit: e4660fe0e694021b7041ec3d1f6e730caa2fca5c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e4660fe0e694021b7041ec3d1f6e7… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 23 16:47:26 2024 +1000 vkd3d-shader/spirv: Emit DISCARD as a function call. --- libs/vkd3d-shader/spirv.c | 61 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 54 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ec9786ea..9286e87d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2328,6 +2328,7 @@ struct spirv_compiler uint32_t private_output_variable[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ uint32_t private_output_variable_write_mask[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ uint32_t epilogue_function_id; + uint32_t discard_function_id; uint32_t binding_idx; @@ -7626,16 +7627,39 @@ static void spirv_compiler_emit_retc(struct spirv_compiler *compiler, vkd3d_spirv_build_op_label(builder, merge_block_id); } -static void spirv_compiler_emit_kill(struct spirv_compiler *compiler, - const struct vkd3d_shader_instruction *instruction) +static uint32_t spirv_compiler_get_discard_function_id(struct spirv_compiler *compiler) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t target_id, merge_block_id; - target_id = vkd3d_spirv_alloc_id(builder); - merge_block_id = spirv_compiler_emit_conditional_branch(compiler, instruction, target_id); + if (!compiler->discard_function_id) + compiler->discard_function_id = vkd3d_spirv_alloc_id(builder); - vkd3d_spirv_build_op_label(builder, target_id); + return compiler->discard_function_id; +} + +static void spirv_compiler_emit_discard_function(struct spirv_compiler *compiler) +{ + uint32_t void_id, bool_id, function_type_id, condition_id, target_block_id, merge_block_id; + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + + vkd3d_spirv_build_op_name(builder, compiler->discard_function_id, "discard"); + + void_id = vkd3d_spirv_get_op_type_void(builder); + bool_id = vkd3d_spirv_get_op_type_bool(builder); + function_type_id = vkd3d_spirv_get_op_type_function(builder, void_id, &bool_id, 1); + + vkd3d_spirv_build_op_function(builder, void_id, compiler->discard_function_id, + SpvFunctionControlMaskNone, function_type_id); + condition_id = vkd3d_spirv_build_op_function_parameter(builder, bool_id); + + vkd3d_spirv_build_op_label(builder, vkd3d_spirv_alloc_id(builder)); + + target_block_id = vkd3d_spirv_alloc_id(builder); + merge_block_id = vkd3d_spirv_alloc_id(builder); + vkd3d_spirv_build_op_selection_merge(builder, merge_block_id, SpvSelectionControlMaskNone); + vkd3d_spirv_build_op_branch_conditional(builder, condition_id, target_block_id, merge_block_id); + + vkd3d_spirv_build_op_label(builder, target_block_id); if (spirv_compiler_is_target_extension_supported(compiler, VKD3D_SHADER_SPIRV_EXTENSION_EXT_DEMOTE_TO_HELPER_INVOCATION)) @@ -7650,6 +7674,26 @@ static void spirv_compiler_emit_kill(struct spirv_compiler *compiler, } vkd3d_spirv_build_op_label(builder, merge_block_id); + vkd3d_spirv_build_op_return(builder); + vkd3d_spirv_build_op_function_end(builder); +} + +static void spirv_compiler_emit_discard(struct spirv_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_src_param *src = instruction->src; + uint32_t condition_id, void_id; + + /* discard is not a block terminator in VSIR, and emitting it as such in SPIR-V would cause + * a mismatch between the VSIR structure and the SPIR-V one, which would cause problems if + * structurisation is necessary. Therefore we emit it as a function call. */ + condition_id = spirv_compiler_emit_load_src(compiler, src, VKD3DSP_WRITEMASK_0); + condition_id = spirv_compiler_emit_int_to_bool(compiler, + instruction->flags, src->reg.data_type, 1, condition_id); + void_id = vkd3d_spirv_get_op_type_void(builder); + vkd3d_spirv_build_op_function_call(builder, void_id, spirv_compiler_get_discard_function_id(compiler), + &condition_id, 1); } static bool spirv_compiler_init_blocks(struct spirv_compiler *compiler, unsigned int block_count) @@ -9515,7 +9559,7 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, break; case VKD3DSIH_DISCARD: case VKD3DSIH_TEXKILL: - spirv_compiler_emit_kill(compiler, instruction); + spirv_compiler_emit_discard(compiler, instruction); break; case VKD3DSIH_LABEL: spirv_compiler_emit_label(compiler, instruction); @@ -9801,6 +9845,9 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, } } + if (compiler->discard_function_id) + spirv_compiler_emit_discard_function(compiler); + if (compiler->epilogue_function_id) { vkd3d_spirv_build_op_name(builder, compiler->epilogue_function_id, "epilogue");

1 0

Henri Verbeet : vkd3d: Use debugstr_hresult() in vkd3d_create_vk_device().
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: vkd3d Branch: master Commit: 8dc1239e145dba1021ee5396be4ca4571e356827 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8dc1239e145dba1021ee5396be4ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 18:04:26 2024 +0100 vkd3d: Use debugstr_hresult() in vkd3d_create_vk_device(). --- libs/vkd3d/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 3c544bf9..80fa9d35 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2071,7 +2071,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, if (FAILED(hr = vkd3d_load_vk_device_procs(&device->vk_procs, vk_procs, vk_device))) { - ERR("Failed to load device procs, hr %#x.\n", hr); + ERR("Failed to load device procs, hr %s.\n", debugstr_hresult(hr)); if (device->vk_procs.vkDestroyDevice) device->vk_procs.vkDestroyDevice(vk_device, NULL); return hr; @@ -2081,7 +2081,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, if (FAILED(hr = d3d12_device_create_vkd3d_queues(device, &device_queue_info))) { - ERR("Failed to create queues, hr %#x.\n", hr); + ERR("Failed to create queues, hr %s.\n", debugstr_hresult(hr)); device->vk_procs.vkDestroyDevice(vk_device, NULL); return hr; }

1 0

Henri Verbeet : vkd3d-shader/ir: Store control point counts in struct vsir_program.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: vkd3d Branch: master Commit: 98c6e85b339196d6fb4f14319b7fd84a7f771079 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/98c6e85b339196d6fb4f14319b7fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 21:35:22 2024 +0100 vkd3d-shader/ir: Store control point counts in struct vsir_program. --- libs/vkd3d-shader/spirv.c | 4 ++-- libs/vkd3d-shader/tpf.c | 8 ++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9286e87d..4441db16 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9806,8 +9806,8 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, compiler->block_names = parser->shader_desc.block_names; compiler->block_name_count = parser->shader_desc.block_name_count; - compiler->input_control_point_count = shader_desc->input_control_point_count; - compiler->output_control_point_count = shader_desc->output_control_point_count; + compiler->input_control_point_count = program->input_control_point_count; + compiler->output_control_point_count = program->output_control_point_count; if (compiler->shader_type != VKD3D_SHADER_TYPE_HULL) spirv_compiler_emit_shader_signature_outputs(compiler); diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index df10cd25..50146c2c 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -1051,7 +1051,7 @@ static void shader_sm4_read_dcl_input_primitive(struct vkd3d_shader_instruction { ins->declaration.primitive_type.type = VKD3D_PT_PATCH; ins->declaration.primitive_type.patch_vertex_count = primitive_type - VKD3D_SM5_INPUT_PT_PATCH1 + 1; - priv->p.shader_desc.input_control_point_count = ins->declaration.primitive_type.patch_vertex_count; + priv->p.program.input_control_point_count = ins->declaration.primitive_type.patch_vertex_count; } else if (primitive_type >= ARRAY_SIZE(input_primitive_type_table)) { @@ -1060,7 +1060,7 @@ static void shader_sm4_read_dcl_input_primitive(struct vkd3d_shader_instruction else { ins->declaration.primitive_type.type = input_primitive_type_table[primitive_type].vkd3d_type; - priv->p.shader_desc.input_control_point_count = input_primitive_type_table[primitive_type].control_point_count; + priv->p.program.input_control_point_count = input_primitive_type_table[primitive_type].control_point_count; } if (ins->declaration.primitive_type.type == VKD3D_PT_UNDEFINED) @@ -1174,9 +1174,9 @@ static void shader_sm5_read_control_point_count(struct vkd3d_shader_instruction >> VKD3D_SM5_CONTROL_POINT_COUNT_SHIFT; if (opcode == VKD3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT) - priv->p.shader_desc.input_control_point_count = ins->declaration.count; + priv->p.program.input_control_point_count = ins->declaration.count; else - priv->p.shader_desc.output_control_point_count = ins->declaration.count; + priv->p.program.output_control_point_count = ins->declaration.count; } static void shader_sm5_read_dcl_tessellator_domain(struct vkd3d_shader_instruction *ins, uint32_t opcode, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 887c47fc..332b39af 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1020,8 +1020,6 @@ struct vkd3d_shader_desc struct shader_signature output_signature; struct shader_signature patch_constant_signature; - unsigned int input_control_point_count, output_control_point_count; - unsigned int block_count; struct @@ -1271,6 +1269,7 @@ struct vsir_program struct vkd3d_shader_version shader_version; struct vkd3d_shader_instruction_array instructions; + unsigned int input_control_point_count, output_control_point_count; unsigned int temp_count; unsigned int ssa_count; bool use_vocp;

1 0

Henri Verbeet : vkd3d: Use debugstr_hresult() in vkd3d_instance_init().
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: vkd3d Branch: master Commit: af160ef0c4c2b656437431b08638143227753c45 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/af160ef0c4c2b656437431b086381… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 17:56:23 2024 +0100 vkd3d: Use debugstr_hresult() in vkd3d_instance_init(). --- libs/vkd3d/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 75efa41f..3c544bf9 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -594,7 +594,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, if (FAILED(hr = vkd3d_init_vk_global_procs(instance, create_info->pfn_vkGetInstanceProcAddr))) { - ERR("Failed to initialize Vulkan global procs, hr %#x.\n", hr); + ERR("Failed to initialise Vulkan global procs, hr %s.\n", debugstr_hresult(hr)); return hr; } @@ -674,7 +674,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, if (FAILED(hr = vkd3d_load_vk_instance_procs(&instance->vk_procs, vk_global_procs, vk_instance))) { - ERR("Failed to load instance procs, hr %#x.\n", hr); + ERR("Failed to load instance procs, hr %s.\n", debugstr_hresult(hr)); if (instance->vk_procs.vkDestroyInstance) instance->vk_procs.vkDestroyInstance(vk_instance, NULL); if (instance->libvulkan)

1 0