February 2024 - Wine-Commits

Alexandre Julliard : ntdll: Add a helper macro to dump a register context.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: 61564202b5ae86b1af01727bdcac5f6539dd9188 URL: https://gitlab.winehq.org/wine/wine/-/commit/61564202b5ae86b1af01727bdcac5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 20 20:27:25 2024 +0100 ntdll: Add a helper macro to dump a register context. --- dlls/ntdll/ntdll_misc.h | 38 +++++++++++++++++++++++++++++++++++ dlls/ntdll/signal_arm.c | 30 +++++++++------------------- dlls/ntdll/signal_arm64.c | 49 +++++++++------------------------------------- dlls/ntdll/signal_i386.c | 24 +++++++---------------- dlls/ntdll/signal_x86_64.c | 33 +++++++++---------------------- 5 files changed, 72 insertions(+), 102 deletions(-)

1 0

Rémi Bernon : win32u: Only consider active monitors for virtual screen rect.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: f7788fc7e75fa894fa4286928ddcd7d4b15e208b URL: https://gitlab.winehq.org/wine/wine/-/commit/f7788fc7e75fa894fa4286928ddcd7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 9 18:21:51 2024 +0100 win32u: Only consider active monitors for virtual screen rect. --- dlls/win32u/sysparams.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index edf68859aa8..824e3b57bb7 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2370,6 +2370,7 @@ RECT get_virtual_screen_rect( UINT dpi ) LIST_FOR_EACH_ENTRY( monitor, &monitors, struct monitor, entry ) { + if (!(monitor->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) continue; union_rect( &rect, &rect, &monitor->rc_monitor ); }

1 0

Rémi Bernon : win32u: Only consider active monitors in monitor_from_rect.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: 76326ed3693d4484721d8a5777a043298b5591b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/76326ed3693d4484721d8a5777a043… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 9 18:21:51 2024 +0100 win32u: Only consider active monitors in monitor_from_rect. --- dlls/win32u/sysparams.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 824e3b57bb7..87c37cd2e72 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -3564,10 +3564,11 @@ HMONITOR monitor_from_rect( const RECT *rect, UINT flags, UINT dpi ) LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry) { - RECT intersect; - RECT monitor_rect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), - system_dpi ); + RECT intersect, monitor_rect; + if (!(monitor->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) continue; + + monitor_rect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), system_dpi ); if (intersect_rect( &intersect, &monitor_rect, &r )) { /* check for larger intersecting area */

1 0

Ivo Ivanov : hidclass.sys: Use the correct string for container_id.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: 2497a534844b4ad527abbe7bf33fb584aea60dfa URL: https://gitlab.winehq.org/wine/wine/-/commit/2497a534844b4ad527abbe7bf33fb5… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Sat Feb 17 18:47:05 2024 +0200 hidclass.sys: Use the correct string for container_id. --- dlls/hidclass.sys/pnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 39714abc6b1..e2bdd82f567 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -441,7 +441,7 @@ static WCHAR *query_container_id(DEVICE_OBJECT *device) WCHAR *dst; if ((dst = ExAllocatePool(PagedPool, size))) - memcpy(dst, ext->instance_id, size); + memcpy(dst, ext->container_id, size); return dst; }

1 0

Alexandre Julliard : ntdll: Share exception dispatch implementation across platforms.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: 8bd411da0a678e57dbeef9302f64fe7fed84db61 URL: https://gitlab.winehq.org/wine/wine/-/commit/8bd411da0a678e57dbeef9302f64fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 20 20:27:46 2024 +0100 ntdll: Share exception dispatch implementation across platforms. --- dlls/ntdll/exception.c | 76 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/ntdll_misc.h | 4 +-- dlls/ntdll/signal_arm.c | 65 ++------------------------------------- dlls/ntdll/signal_arm64.c | 66 ++-------------------------------------- dlls/ntdll/signal_i386.c | 65 ++------------------------------------- dlls/ntdll/signal_x86_64.c | 66 ++-------------------------------------- 6 files changed, 88 insertions(+), 254 deletions(-)

1 0

Alexandre Julliard : ntdll: Default to the SEH channel on x86-64.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: 2e63272f2fcfc32521e744e342dd16d3179a2121 URL: https://gitlab.winehq.org/wine/wine/-/commit/2e63272f2fcfc32521e744e342dd16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 20 15:14:49 2024 +0100 ntdll: Default to the SEH channel on x86-64. The unwind info is now printed from unwind.c. --- dlls/ntdll/signal_x86_64.c | 71 +++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 36 deletions(-)

1 0

Rémi Bernon : win32u: Deduce monitor device flags from their adapter.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: e4ff578bcc294cf05ca000d5f3b3cf3c4936fa52 URL: https://gitlab.winehq.org/wine/wine/-/commit/e4ff578bcc294cf05ca000d5f3b3cf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 9 18:12:21 2024 +0100 win32u: Deduce monitor device flags from their adapter. --- dlls/win32u/sysparams.c | 47 +++++++++------------------------------- dlls/wineandroid.drv/init.c | 1 - dlls/winemac.drv/cocoa_display.m | 1 - dlls/winemac.drv/display.c | 1 - dlls/winemac.drv/macdrv_cocoa.h | 5 ----- dlls/winewayland.drv/display.c | 7 ++---- dlls/winex11.drv/xinerama.c | 3 --- dlls/winex11.drv/xrandr.c | 5 ----- include/wine/gdi_driver.h | 1 - 9 files changed, 12 insertions(+), 59 deletions(-)

1 0

Rémi Bernon : win32u: Only consider active monitors for clone detection.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: db391c37a9bfba0a89321be02ca6a641dec41cf9 URL: https://gitlab.winehq.org/wine/wine/-/commit/db391c37a9bfba0a89321be02ca6a6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 9 18:21:51 2024 +0100 win32u: Only consider active monitors for clone detection. --- dlls/win32u/sysparams.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 693d8839028..edf68859aa8 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1746,14 +1746,15 @@ static BOOL update_display_cache_from_registry(void) if (adapter->dev.state_flags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) { if (!IsRectEmpty(&monitor->rc_monitor)) monitor->dev.state_flags |= DISPLAY_DEVICE_ACTIVE; - } - LIST_FOR_EACH_ENTRY(monitor2, &monitors, struct monitor, entry) - { - if (EqualRect(&monitor2->rc_monitor, &monitor->rc_monitor)) + LIST_FOR_EACH_ENTRY( monitor2, &monitors, struct monitor, entry ) { - monitor->is_clone = TRUE; - break; + if (!(monitor2->dev.state_flags & DISPLAY_DEVICE_ACTIVE)) continue; + if (EqualRect( &monitor2->rc_monitor, &monitor->rc_monitor )) + { + monitor->is_clone = TRUE; + break; + } } }

1 0

Brendan Shanks : ntdll: On x86_64, don't access %gs in signal_start_thread().
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: e628eb2c6ff84ff347d78b0c7a601665a51dbcef URL: https://gitlab.winehq.org/wine/wine/-/commit/e628eb2c6ff84ff347d78b0c7a6016… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Feb 20 21:49:36 2024 -0800 ntdll: On x86_64, don't access %gs in signal_start_thread(). %gs is not set until call_init_thunk(). Also, adjust other TEB accesses to be consistent with the surrounding functions. Fixes a crash on macOS introduced by 7ae488a2bb58501684c6475d4942277b852475fc ("ntdll: Don't hardcode xstate size in syscall frame.") --- dlls/ntdll/unix/signal_i386.c | 4 ++-- dlls/ntdll/unix/signal_x86_64.c | 21 +++------------------ 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 93bcf607f41..3ac12a35db6 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1618,7 +1618,7 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, "movl 0x18(%ebp),%edx\n\t" /* teb */ "pushl 0(%edx)\n\t" /* teb->Tib.ExceptionList */ "subl $0x280,%esp\n\t" /* sizeof(struct syscall_frame) */ - "subl %fs:0x204,%esp\n\t" /* x86_thread_data()->xstate_features_size */ + "subl 0x204(%edx),%esp\n\t" /* x86_thread_data()->xstate_features_size */ "andl $~63,%esp\n\t" "leal 8(%ebp),%eax\n\t" "movl %eax,0x38(%esp)\n\t" /* frame->syscall_cfa */ @@ -2547,7 +2547,7 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "orl %eax,%eax\n\t" "jnz 1f\n\t" "leal -0x280(%esp),%eax\n\t" /* sizeof(struct syscall_frame) */ - "subl %fs:0x204,%eax\n\t" /* x86_thread_data()->xstate_features_size */ + "subl 0x204(%ecx),%eax\n\t" /* x86_thread_data()->xstate_features_size */ "andl $~63,%eax\n\t" "movl %eax,0x1f8(%ecx)\n" /* x86_thread_data()->syscall_frame */ /* switch to kernel stack */ diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 501ae14cae5..01bbd2e3572 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1584,12 +1584,7 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, "movq %rsi,-0x38(%rbp)\n\t" /* ret_ptr */ "movq %rdx,-0x40(%rbp)\n\t" /* ret_len */ "subq $0x308,%rsp\n\t" /* sizeof(struct syscall_frame) + exception */ -#ifdef __APPLE__ - "movq %gs:0x30,%rsi\n\t" - "movl 0x33c(%rsi),%esi\n\t" -#else - "movl %gs:0x33c,%esi\n\t" /* amd64_thread_data()->xstate_features_size */ -#endif + "movl 0x33c(%r8),%esi\n\t" /* amd64_thread_data()->xstate_features_size */ "subq %rsi,%rsp\n\t" "andq $~63,%rsp\n\t" "leaq 0x10(%rbp),%rax\n\t" @@ -1629,12 +1624,7 @@ __ASM_GLOBAL_FUNC( user_mode_callback_return, __ASM_CFI(".cfi_rel_offset %r13,-0x18\n\t") __ASM_CFI(".cfi_rel_offset %r14,-0x20\n\t") __ASM_CFI(".cfi_rel_offset %r15,-0x28\n\t") -#ifdef __APPLE__ - "movq %gs:0x30,%rax\n\t" - "movl 0x33c(%rax),%eax\n\t" -#else - "movl %gs:0x33c,%eax\n\t" /* amd64_thread_data()->xstate_features_size */ -#endif + "movl 0x33c(%rcx),%eax\n\t" /* amd64_thread_data()->xstate_features_size */ "movq 0x300(%r10,%rax),%rax\n\t" /* exception list */ "movq %rax,0(%rcx)\n\t" /* teb->Tib.ExceptionList */ "movq -0x38(%rbp),%r10\n\t" /* ret_ptr */ @@ -2600,12 +2590,7 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "orq %r8,%r8\n\t" "jnz 1f\n\t" "leaq -0x300(%rsp),%r8\n\t" /* sizeof(struct syscall_frame) */ -#ifdef __APPLE__ - "movq %gs:0x30,%rax\n\t" - "movl 0x33c(%rax),%eax\n\t" -#else - "movl %gs:0x33c,%eax\n\t" /* amd64_thread_data()->xstate_features_size */ -#endif + "movl 0x33c(%rcx),%eax\n\t" /* amd64_thread_data()->xstate_features_size */ "subq %rax,%r8\n\t" "andq $~63,%r8\n\t" "movq %r8,0x328(%rcx)\n" /* amd64_thread_data()->syscall_frame */

1 0

Conor McCarthy : vkd3d-shader/dxil: Handle resource descriptor additional tag/value pairs.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: vkd3d Branch: master Commit: d9c68ee481367d90da949cbd41b09ceb4b6a3823 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d9c68ee481367d90da949cbd41b09… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Feb 16 14:37:43 2024 +1000 vkd3d-shader/dxil: Handle resource descriptor additional tag/value pairs. These are tag/value pairs, and the current code only works if an element type or element stride pair is present at index zero. --- libs/vkd3d-shader/dxil.c | 165 ++++++++++++++++++++++++++++++----------------- 1 file changed, 107 insertions(+), 58 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 9b609168..2ca3aa95 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -199,10 +199,12 @@ enum dxil_resource_kind RESOURCE_KIND_FEEDBACKTEXTURE2DARRAY = 18, }; -enum dxil_resource_type +enum dxil_resource_tag { - RESOURCE_TYPE_NON_RAW_STRUCTURED = 0, - RESOURCE_TYPE_RAW_STRUCTURED = 1, + RESOURCE_TAG_ELEMENT_TYPE = 0, + RESOURCE_TAG_ELEMENT_STRIDE = 1, + RESOURCE_TAG_SAMPLER_FEEDBACK_KIND = 2, + RESOURCE_TAG_ENABLE_ATOMIC_64 = 3, }; enum dxil_component_type @@ -6673,15 +6675,97 @@ static enum vkd3d_data_type vkd3d_data_type_from_dxil_component_type(enum dxil_c return data_type; } +struct resource_additional_values +{ + enum vkd3d_data_type data_type; + unsigned int byte_stride; +}; + +static bool resources_load_additional_values(struct resource_additional_values *info, + const struct sm6_metadata_node *node, enum dxil_resource_kind kind, struct sm6_parser *sm6) +{ + unsigned int i, operand_count, tag, value; + + info->data_type = VKD3D_DATA_UNUSED; + info->byte_stride = 0; + + if (node->operand_count & 1) + { + WARN("Operand count is not even.\n"); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, + "Operand count for resource descriptor tag/value pairs is not even."); + } + operand_count = node->operand_count & ~1u; + + for (i = 0; i < operand_count; i += 2) + { + if (!sm6_metadata_get_uint_value(sm6, node->operands[i], &tag) + || !sm6_metadata_get_uint_value(sm6, node->operands[i + 1], &value)) + { + WARN("Failed to load tag/value pair at index %u.\n", i); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "Resource descriptor tag/value pair at index %u is not an integer pair.", i); + return false; + } + + switch (tag) + { + case RESOURCE_TAG_ELEMENT_TYPE: + if (value && kind != RESOURCE_KIND_TYPEDBUFFER && !resource_kind_is_texture(kind)) + { + WARN("Invalid type %u for an untyped resource.\n", value); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "An untyped resource has type %u.", value); + return false; + } + info->data_type = vkd3d_data_type_from_dxil_component_type(value, sm6); + break; + + case RESOURCE_TAG_ELEMENT_STRIDE: + if (value && kind != RESOURCE_KIND_STRUCTUREDBUFFER) + { + WARN("Invalid stride %u for an unstructured resource.\n", value); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "An unstructured resource has a byte stride."); + return false; + } + info->byte_stride = value; + break; + + case RESOURCE_TAG_SAMPLER_FEEDBACK_KIND: + /* MinMip = 0, MipRegionUsed = 1 */ + FIXME("Unhandled sampler feedback kind %u.\n", value); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "Sampler feedback kind %u is unhandled.", value); + break; + + case RESOURCE_TAG_ENABLE_ATOMIC_64: + if (value) + { + FIXME("Unsupported 64-bit atomic ops.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, + "64-bit atomic ops on resources are not supported."); + } + break; + + default: + FIXME("Unhandled tag %u, value %u.\n", tag, value); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, + "Tag %u for resource descriptor additional value %u is unhandled.", tag, value); + break; + } + } + + return true; +} + static struct vkd3d_shader_resource *sm6_parser_resources_load_common_info(struct sm6_parser *sm6, const struct sm6_metadata_value *type_value, bool is_uav, enum dxil_resource_kind kind, const struct sm6_metadata_value *m, struct vkd3d_shader_instruction *ins) { + struct resource_additional_values resource_values; enum vkd3d_shader_resource_type resource_type; - enum dxil_resource_type dxil_resource_type; - const struct sm6_metadata_node *node; - enum vkd3d_data_type data_type; - unsigned int i, values[2]; + unsigned int i; if (!(resource_type = shader_resource_type_from_dxil_resource_kind(kind))) { @@ -6707,72 +6791,37 @@ static struct vkd3d_shader_resource *sm6_parser_resources_load_common_info(struc return NULL; } - node = m->u.node; - - if (node->operand_count < 2) - { - WARN("Invalid operand count %u.\n", node->operand_count); - vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND_COUNT, - "Invalid operand count %u for a resource descriptor.", node->operand_count); + if (!resources_load_additional_values(&resource_values, m->u.node, kind, sm6)) return NULL; - } - if (node->operand_count > 2) - { - WARN("Ignoring %u extra operands.\n", node->operand_count - 2); - vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, - "Ignoring %u extra operands for a resource descriptor.", node->operand_count - 2); - } - - for (i = 0; i < 2; ++i) - { - if (!sm6_metadata_get_uint_value(sm6, node->operands[i], &values[i])) - { - WARN("Failed to load uint value at index %u.\n", i); - vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, - "A resource descriptor operand metadata value is not an integer."); - return NULL; - } - } - if ((dxil_resource_type = values[0]) == RESOURCE_TYPE_NON_RAW_STRUCTURED) + if (kind == RESOURCE_KIND_TYPEDBUFFER || resource_kind_is_texture(kind)) { - if (kind != RESOURCE_KIND_TYPEDBUFFER && !resource_kind_is_texture(kind)) + if (resource_values.data_type == VKD3D_DATA_UNUSED) { - WARN("Unhandled resource kind %u.\n", kind); + WARN("No data type defined.\n"); vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, - "Resource kind %u for a typed resource is unhandled.", kind); - return NULL; + "A typed resource has no data type."); } - data_type = vkd3d_data_type_from_dxil_component_type(values[1], sm6); ins->handler_idx = is_uav ? VKD3DSIH_DCL_UAV_TYPED : VKD3DSIH_DCL; for (i = 0; i < VKD3D_VEC4_SIZE; ++i) - ins->declaration.semantic.resource_data_type[i] = data_type; + ins->declaration.semantic.resource_data_type[i] = resource_values.data_type; ins->declaration.semantic.resource_type = resource_type; ins->declaration.semantic.resource.reg.write_mask = VKD3DSP_WRITEMASK_ALL; return &ins->declaration.semantic.resource; } - else if (dxil_resource_type == RESOURCE_TYPE_RAW_STRUCTURED) + else if (kind == RESOURCE_KIND_RAWBUFFER) { - if (kind == RESOURCE_KIND_RAWBUFFER) - { - ins->handler_idx = is_uav ? VKD3DSIH_DCL_UAV_RAW : VKD3DSIH_DCL_RESOURCE_RAW; - ins->declaration.raw_resource.resource.reg.write_mask = 0; - - return &ins->declaration.raw_resource.resource; - } - - if (kind != RESOURCE_KIND_STRUCTUREDBUFFER) - { - WARN("Unhandled resource kind %u.\n", kind); - vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, - "Resource kind %u for a raw or structured buffer is unhandled.", kind); - return NULL; - } + ins->handler_idx = is_uav ? VKD3DSIH_DCL_UAV_RAW : VKD3DSIH_DCL_RESOURCE_RAW; + ins->declaration.raw_resource.resource.reg.write_mask = 0; + return &ins->declaration.raw_resource.resource; + } + else if (kind == RESOURCE_KIND_STRUCTUREDBUFFER) + { ins->handler_idx = is_uav ? VKD3DSIH_DCL_UAV_STRUCTURED : VKD3DSIH_DCL_RESOURCE_STRUCTURED; - ins->declaration.structured_resource.byte_stride = values[1]; + ins->declaration.structured_resource.byte_stride = resource_values.byte_stride; ins->declaration.structured_resource.resource.reg.write_mask = 0; /* TODO: 16-bit resources. */ @@ -6788,9 +6837,9 @@ static struct vkd3d_shader_resource *sm6_parser_resources_load_common_info(struc } else { - FIXME("Unhandled resource type %u.\n", dxil_resource_type); + FIXME("Unhandled resource kind %u.\n", kind); vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_RESOURCES, - "Resource type %u is unhandled.", dxil_resource_type); + "Resource kind %u is unhandled.", kind); } return NULL;

1 0