wine-commits February 2021

wine-commits@winehq.org

2 participants
915 discussions

Zebediah Figura : winebus.sys: Return STATUS_DELETE_PENDING rather than STATUS_CANCELLED when a device is removed.
by Alexandre Julliard 12 Feb '21

12 Feb '21

Module: wine Branch: master Commit: 141fdcc0efe923a83db9794d9855ef295bd9bece URL: https://source.winehq.org/git/wine.git/?a=commit;h=141fdcc0efe923a83db9794d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 11 18:56:50 2021 -0600 winebus.sys: Return STATUS_DELETE_PENDING rather than STATUS_CANCELLED when a device is removed. Microsoft doesn't really clearly document this, but their driver samples return it here, and so do remove locks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 396a9d07123..8d3dec4779a 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -370,7 +370,7 @@ void bus_remove_hid_device(DEVICE_OBJECT *device) while ((entry = RemoveHeadList(&ext->irp_queue)) != &ext->irp_queue) { irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); - irp->IoStatus.u.Status = STATUS_CANCELLED; + irp->IoStatus.u.Status = STATUS_DELETE_PENDING; irp->IoStatus.Information = 0; IoCompleteRequest(irp, IO_NO_INCREMENT); }

1 0

Zebediah Figura : wineusb.sys: Return STATUS_DELETE_PENDING rather than STATUS_CANCELLED when a device is removed.
by Alexandre Julliard 12 Feb '21

12 Feb '21

Module: wine Branch: master Commit: 181fe28f685453920a04d2234a9a838b7c619407 URL: https://source.winehq.org/git/wine.git/?a=commit;h=181fe28f685453920a04d223… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 11 18:56:49 2021 -0600 wineusb.sys: Return STATUS_DELETE_PENDING rather than STATUS_CANCELLED when a device is removed. Microsoft doesn't really clearly document this, but their driver samples return it here, and so do remove locks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index f70197704b1..f46f17d66f4 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -391,7 +391,7 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp) while ((entry = RemoveHeadList(&device->irp_list)) != &device->irp_list) { irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); - irp->IoStatus.Status = STATUS_CANCELLED; + irp->IoStatus.Status = STATUS_DELETE_PENDING; irp->IoStatus.Information = 0; IoCompleteRequest(irp, IO_NO_INCREMENT); }

1 0

Zebediah Figura : hidclass.sys: No longer track devices in a list.
by Alexandre Julliard 12 Feb '21

12 Feb '21

Module: wine Branch: master Commit: 5294ebc9a0f17efc5eba1ed5981275a500e01190 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5294ebc9a0f17efc5eba1ed5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 11 18:56:48 2021 -0600 hidclass.sys: No longer track devices in a list. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/hid.h | 7 ------- dlls/hidclass.sys/main.c | 2 -- dlls/hidclass.sys/pnp.c | 27 +-------------------------- 3 files changed, 1 insertion(+), 35 deletions(-) diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 8ffd489a0ee..889b8c625c0 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -72,12 +72,6 @@ void RingBuffer_Destroy(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; struct ReportRingBuffer* RingBuffer_Create(UINT buffer_size) DECLSPEC_HIDDEN; NTSTATUS RingBuffer_SetSize(struct ReportRingBuffer *buffer, UINT size) DECLSPEC_HIDDEN; -typedef struct _hiddevice -{ - struct list entry; - DEVICE_OBJECT *device; -} hid_device; - typedef struct _minidriver { struct list entry; @@ -88,7 +82,6 @@ typedef struct _minidriver PDRIVER_ADD_DEVICE AddDevice; PDRIVER_DISPATCH PNPDispatch; - struct list device_list; } minidriver; NTSTATUS call_minidriver(ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG in_size, void *out_buff, ULONG out_size) DECLSPEC_HIDDEN; diff --git a/dlls/hidclass.sys/main.c b/dlls/hidclass.sys/main.c index cef58217f5e..50657b80f5e 100644 --- a/dlls/hidclass.sys/main.c +++ b/dlls/hidclass.sys/main.c @@ -81,8 +81,6 @@ NTSTATUS WINAPI HidRegisterMinidriver(HID_MINIDRIVER_REGISTRATION *registration) driver->minidriver = *registration; list_add_tail(&minidriver_list, &driver->entry); - list_init(&driver->device_list); - return STATUS_SUCCESS; } diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 13b07e4e379..a50e7382466 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -72,7 +72,6 @@ static NTSTATUS get_device_id(DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCH NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { WCHAR device_id[MAX_DEVICE_ID_LEN], instance_id[MAX_DEVICE_ID_LEN]; - hid_device *hiddev; DEVICE_OBJECT *device = NULL; NTSTATUS status; minidriver *minidriver; @@ -97,18 +96,12 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) TRACE("Adding device to PDO %p, id %s\\%s.\n", PDO, debugstr_w(device_id), debugstr_w(instance_id)); minidriver = find_minidriver(driver); - hiddev = HeapAlloc(GetProcessHeap(), 0, sizeof(*hiddev)); - if (!hiddev) - return STATUS_NO_MEMORY; - - status = HID_CreateDevice(PDO, &minidriver->minidriver, &hiddev->device); + status = HID_CreateDevice(PDO, &minidriver->minidriver, &device); if (status != STATUS_SUCCESS) { ERR("Failed to create HID object (%x)\n",status); - HeapFree(GetProcessHeap(), 0, hiddev); return status; } - device = hiddev->device; ext = device->DeviceExtension; InitializeListHead(&ext->irp_queue); @@ -120,7 +113,6 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { ERR("Minidriver AddDevice failed (%x)\n",status); HID_DeleteDevice(device); - HeapFree(GetProcessHeap(), 0, hiddev); return status; } @@ -131,7 +123,6 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { ERR("Minidriver failed to get Attributes(%x)\n",status); HID_DeleteDevice(device); - HeapFree(GetProcessHeap(), 0, hiddev); return status; } @@ -146,7 +137,6 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { ERR("Cannot get Device Descriptor(%x)\n",status); HID_DeleteDevice(device); - HeapFree(GetProcessHeap(), 0, hiddev); return status; } for (i = 0; i < descriptor.bNumDescriptors; i++) @@ -157,7 +147,6 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { ERR("No Report Descriptor found in reply\n"); HID_DeleteDevice(device); - HeapFree(GetProcessHeap(), 0, hiddev); return status; } @@ -169,7 +158,6 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) ERR("Cannot get Report Descriptor(%x)\n",status); HID_DeleteDevice(device); HeapFree(GetProcessHeap(), 0, reportDescriptor); - HeapFree(GetProcessHeap(), 0, hiddev); return status; } @@ -180,12 +168,9 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { ERR("Cannot parse Report Descriptor\n"); HID_DeleteDevice(device); - HeapFree(GetProcessHeap(), 0, hiddev); return STATUS_NOT_SUPPORTED; } - list_add_tail(&(minidriver->device_list), &hiddev->entry); - ext->information.DescriptorSize = ext->preparseData->dwSize; lstrcpyW(ext->instance_id, instance_id); @@ -208,7 +193,6 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) static NTSTATUS remove_device(minidriver *minidriver, DEVICE_OBJECT *device, IRP *irp) { BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; - hid_device *hiddev; NTSTATUS rc = STATUS_NOT_SUPPORTED; rc = IoSetDeviceInterfaceState(&ext->link_name, FALSE); @@ -224,15 +208,6 @@ static NTSTATUS remove_device(minidriver *minidriver, DEVICE_OBJECT *device, IRP if (irp) rc = minidriver->PNPDispatch(device, irp); HID_DeleteDevice(device); - LIST_FOR_EACH_ENTRY(hiddev, &minidriver->device_list, hid_device, entry) - { - if (hiddev->device == device) - { - list_remove(&hiddev->entry); - HeapFree(GetProcessHeap(), 0, hiddev); - break; - } - } return rc; }

1 0

Zebediah Figura : hidclass.sys: Do not manually clean up devices on unload.
by Alexandre Julliard 12 Feb '21

12 Feb '21

Module: wine Branch: master Commit: 76daa6b70cf9e34e187736ecb08ebeedb5922dfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=76daa6b70cf9e34e187736ec… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 11 18:56:47 2021 -0600 hidclass.sys: Do not manually clean up devices on unload. We can rely on ntoskrnl to do this for us. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/hid.h | 1 - dlls/hidclass.sys/main.c | 6 ------ dlls/hidclass.sys/pnp.c | 4 ++-- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 36d13c009d7..8ffd489a0ee 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -109,7 +109,6 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDE /* Pseudo-Plug and Play support*/ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT* PDO) DECLSPEC_HIDDEN; -NTSTATUS PNP_RemoveDevice(minidriver *minidriver, DEVICE_OBJECT* device, IRP* irp) DECLSPEC_HIDDEN; /* Parsing HID Report Descriptors into preparsed data */ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) DECLSPEC_HIDDEN; diff --git a/dlls/hidclass.sys/main.c b/dlls/hidclass.sys/main.c index e169c429efb..cef58217f5e 100644 --- a/dlls/hidclass.sys/main.c +++ b/dlls/hidclass.sys/main.c @@ -48,12 +48,6 @@ static VOID WINAPI UnloadDriver(DRIVER_OBJECT *driver) md = find_minidriver(driver); if (md) { - hid_device *device, *next; - TRACE("%i devices to unload\n", list_count(&md->device_list)); - LIST_FOR_EACH_ENTRY_SAFE(device, next, &md->device_list, hid_device, entry) - { - PNP_RemoveDevice(md, device->device, NULL); - } if (md->DriverUnload) md->DriverUnload(md->minidriver.DriverObject); list_remove(&md->entry); diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 27de1e1b04b..13b07e4e379 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -205,7 +205,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) return STATUS_SUCCESS; } -NTSTATUS PNP_RemoveDevice(minidriver *minidriver, DEVICE_OBJECT *device, IRP *irp) +static NTSTATUS remove_device(minidriver *minidriver, DEVICE_OBJECT *device, IRP *irp) { BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; hid_device *hiddev; @@ -306,7 +306,7 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) } case IRP_MN_REMOVE_DEVICE: { - return PNP_RemoveDevice(minidriver, device, irp); + return remove_device(minidriver, device, irp); } default: {

1 0

Zebediah Figura : winebus.sys: Return success from IRP_MN_QUERY_CAPABILITIES.
by Alexandre Julliard 12 Feb '21

12 Feb '21

Module: wine Branch: master Commit: dece98fb59913a89e1e47ec0c31aff60f3aad664 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dece98fb59913a89e1e47ec0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 11 18:56:46 2021 -0600 winebus.sys: Return success from IRP_MN_QUERY_CAPABILITIES. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 2388033ceda..396a9d07123 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -600,16 +600,17 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) case IRP_MN_QUERY_ID: TRACE("IRP_MN_QUERY_ID\n"); status = handle_IRP_MN_QUERY_ID(device, irp); - irp->IoStatus.u.Status = status; break; case IRP_MN_QUERY_CAPABILITIES: TRACE("IRP_MN_QUERY_CAPABILITIES\n"); + status = STATUS_SUCCESS; break; default: FIXME("Unhandled function %08x\n", irpsp->MinorFunction); break; } + irp->IoStatus.u.Status = status; IoCompleteRequest(irp, IO_NO_INCREMENT); return status; }

1 0

Henri Verbeet : vkd3d-shader: Keep track of declared SPIR-V input components.
by Alexandre Julliard 12 Feb '21

12 Feb '21

Module: vkd3d Branch: master Commit: 8313225cc6bbb646d001fe9faf41f0eedfea6672 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8313225cc6bbb646d001fe9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 12 16:22:48 2021 +0100 vkd3d-shader: Keep track of declared SPIR-V input components. In particular, a shader may declare e.g. v6.x to refer to an output from the previous stage, and v6.y to refer to a builtin, or the other way around. At the same time, different hull shader phases may redeclare the same register. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 101 ++++++++++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=8313225cc6bbb646d00…

1 0

Henri Verbeet : tests: Add tessellation shader tests to test_clip_distance().
by Alexandre Julliard 12 Feb '21

12 Feb '21

Module: vkd3d Branch: master Commit: 90216bd47850c6131711ca65d6d62ca54709dc54 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=90216bd47850c6131711ca6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 12 16:22:47 2021 +0100 tests: Add tessellation shader tests to test_clip_distance(). Like the Wine d3d11 test it was originally ported from. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 303 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 286 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=90216bd47850c613171…

1 0

Henri Verbeet : vkd3d-shader: Handle non-vec4 builtins in vkd3d_dxbc_compiler_emit_hull_shader_input_initialisation().
by Alexandre Julliard 12 Feb '21

12 Feb '21

Module: vkd3d Branch: master Commit: 3a710385f3fb213c6872a17997d72b4fcbbf6615 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3a710385f3fb213c6872a17… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 12 16:22:46 2021 +0100 vkd3d-shader: Handle non-vec4 builtins in vkd3d_dxbc_compiler_emit_hull_shader_input_initialisation(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 49 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 106c298..72bb61f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6268,16 +6268,18 @@ static void vkd3d_dxbc_compiler_emit_hull_shader_barrier(struct vkd3d_dxbc_compi static void vkd3d_dxbc_compiler_emit_hull_shader_input_initialisation(struct vkd3d_dxbc_compiler *compiler) { + uint32_t type_id, length_id, register_index_id, src_array_id, dst_array_id, vicp_id, tmp_id; const struct vkd3d_shader_signature *signature = compiler->input_signature; + uint32_t src_type_id, dst_type_id, src_id, dst_id, point_index_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t type_id, length_id, index_id, src_id, dst_id, vicp_id; const struct vkd3d_shader_signature_element *element; enum vkd3d_shader_input_sysval_semantic sysval; const struct vkd3d_spirv_builtin *builtin; - unsigned int register_count, i; + unsigned int register_count, i, j; struct vkd3d_shader_register r; struct vkd3d_symbol symbol; struct rb_entry *entry; + uint32_t indices[2]; for (i = 0, register_count = 0; i < signature->element_count; ++i) { @@ -6303,26 +6305,51 @@ static void vkd3d_dxbc_compiler_emit_hull_shader_input_initialisation(struct vkd entry = rb_get(&compiler->symbol_table, &symbol); vicp_id = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry)->id; - index_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, element->register_index); - dst_id = vkd3d_spirv_build_op_in_bounds_access_chain1(builder, type_id, vicp_id, index_id); + register_index_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, element->register_index); + dst_array_id = vkd3d_spirv_build_op_in_bounds_access_chain1(builder, type_id, vicp_id, register_index_id); if (element->sysval_semantic) { sysval = vkd3d_siv_from_sysval(element->sysval_semantic); builtin = get_spirv_builtin_for_sysval(compiler, sysval); - src_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, + src_array_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, SpvStorageClassInput, compiler->input_control_point_count); + + if (builtin->component_count == 4) + { + vkd3d_spirv_build_op_copy_memory(builder, dst_array_id, src_array_id, SpvMemoryAccessMaskNone); + } + else + { + tmp_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_FLOAT, builtin->component_count); + src_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassInput, tmp_id); + dst_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassPrivate, tmp_id); + + for (j = 0; j < compiler->input_control_point_count; ++j) + { + point_index_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, j); + src_id = vkd3d_spirv_build_op_in_bounds_access_chain1(builder, + src_type_id, src_array_id, point_index_id); + + indices[0] = point_index_id; + indices[1] = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0); + dst_id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, + dst_type_id, dst_array_id, indices, 2); + + vkd3d_spirv_build_op_copy_memory(builder, dst_id, src_id, SpvMemoryAccessMaskNone); + } + } } else { - src_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, + src_array_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, SpvStorageClassInput, VKD3D_SHADER_COMPONENT_FLOAT, 4, compiler->input_control_point_count); - vkd3d_spirv_add_iface_variable(builder, src_id); - vkd3d_spirv_build_op_decorate1(builder, src_id, SpvDecorationLocation, element->register_index); - vkd3d_spirv_build_op_name(builder, src_id, "v%u", element->register_index); - } + vkd3d_spirv_add_iface_variable(builder, src_array_id); + vkd3d_spirv_build_op_decorate1(builder, src_array_id, SpvDecorationLocation, element->register_index); + vkd3d_spirv_build_op_name(builder, src_array_id, "v%u", element->register_index); - vkd3d_spirv_build_op_copy_memory(builder, dst_id, src_id, SpvMemoryAccessMaskNone); + vkd3d_spirv_build_op_copy_memory(builder, dst_array_id, src_array_id, SpvMemoryAccessMaskNone); + } } }

1 0

Zebediah Figura : vkd3d-shader: Use struct vkd3d_shader_location in struct hlsl_ctx.
by Alexandre Julliard 12 Feb '21

12 Feb '21

Module: vkd3d Branch: master Commit: 3bf0e40b9d8f185f6df8b087a7b5edd52a10cadf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3bf0e40b9d8f185f6df8b08… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 12 10:48:56 2021 -0600 vkd3d-shader: Use struct vkd3d_shader_location in struct hlsl_ctx. 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.c | 10 +++++----- libs/vkd3d-shader/hlsl.h | 4 +--- libs/vkd3d-shader/hlsl.l | 12 +++++------- libs/vkd3d-shader/hlsl.y | 6 +++--- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 4597be1..a129e84 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1482,16 +1482,16 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, struct vkd3d_shader_message_cont ctx->message_context = message_context; - ctx->line_no = ctx->column = 1; - if (!(ctx->source_file = vkd3d_strdup(""))) - return false; if (!(ctx->source_files = vkd3d_malloc(sizeof(*ctx->source_files)))) + return false; + if (!(ctx->source_files[0] = vkd3d_strdup(""))) { - vkd3d_free((void *)ctx->source_file); + vkd3d_free(ctx->source_files); return false; } - ctx->source_files[0] = ctx->source_file; ctx->source_files_count = 1; + ctx->location.source_name = ctx->source_files[0]; + ctx->location.line = ctx->location.column = 1; ctx->matrix_majority = HLSL_COLUMN_MAJOR; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 59bf314..067aae8 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -395,9 +395,7 @@ struct hlsl_ctx { const char **source_files; unsigned int source_files_count; - const char *source_file; - unsigned int line_no; - unsigned int column; + struct vkd3d_shader_location location; enum parse_status status; struct vkd3d_shader_message_context *message_context; diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index 38b4bf1..a0e0bed 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -209,8 +209,8 @@ row_major {return KW_ROW_MAJOR; } {NEWLINE} { struct hlsl_ctx *ctx = yyget_extra(yyscanner); - ctx->line_no++; - ctx->column = 1; + ++ctx->location.line; + ctx->location.column = 1; } ^# { @@ -238,7 +238,7 @@ row_major {return KW_ROW_MAJOR; } <pp_pragma>{NEWLINE} { struct hlsl_ctx *ctx = yyget_extra(yyscanner); - FIXME("Unsupported preprocessor #pragma directive at line %u.\n", ctx->line_no); + FIXME("Unsupported preprocessor #pragma directive at line %u.\n", ctx->location.line); BEGIN(INITIAL); } <pp_pragma>{ANY} {} @@ -279,10 +279,8 @@ row_major {return KW_ROW_MAJOR; } static void update_location(struct hlsl_ctx *ctx, YYLTYPE *lloc) { - lloc->source_name = ctx->source_file; - lloc->line = ctx->line_no; - lloc->column = ctx->column; - ctx->column += yyget_leng(ctx->scanner); + *lloc = ctx->location; + ctx->location.column += yyget_leng(ctx->scanner); } int hlsl_lexer_compile(struct hlsl_ctx *ctx, const char *text, const char *entrypoint) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 15c9c9c..d7201f5 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1762,8 +1762,8 @@ preproc_directive: const char **new_array = NULL; TRACE("Updating line information to file %s, line %u.\n", debugstr_a($2), $1); - ctx->line_no = $1; - if (strcmp($2, ctx->source_file)) + ctx->location.line = $1; + if (strcmp($2, ctx->location.source_name)) new_array = vkd3d_realloc(ctx->source_files, sizeof(*ctx->source_files) * (ctx->source_files_count + 1)); @@ -1771,7 +1771,7 @@ preproc_directive: { ctx->source_files = new_array; ctx->source_files[ctx->source_files_count++] = $2; - ctx->source_file = $2; + ctx->location.source_name = $2; } else {

1 0

Zebediah Figura : vkd3d-shader: Replace struct source_location with struct vkd3d_shader_location.
by Alexandre Julliard 12 Feb '21

12 Feb '21

Module: vkd3d Branch: master Commit: 3a975c2215e10c2c934953a9e6d93f0797e35e20 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3a975c2215e10c2c934953a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 12 10:48:55 2021 -0600 vkd3d-shader: Replace struct source_location with struct vkd3d_shader_location. 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.c | 28 +++++++++++++++------------- libs/vkd3d-shader/hlsl.h | 41 +++++++++++++++++------------------------ libs/vkd3d-shader/hlsl.l | 4 ++-- libs/vkd3d-shader/hlsl.y | 32 ++++++++++++++++---------------- 4 files changed, 50 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=3a975c2215e10c2c934…

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
92
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2021