March 2022 - Wine-Commits - list.winehq.org

Alexandre Julliard : mlang: Skip Unicode codepages in GetCharCodePages().
by Alexandre Julliard March 18, 2022

March 18, 2022

Module: wine Branch: master Commit: 1d23255e20dcda568828a26b689d14985832a4f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d23255e20dcda568828a26b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 14:46:46 2022 +0100 mlang: Skip Unicode codepages in GetCharCodePages(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50351 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/mlang.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index a34c0749ecf..fc5e227721e 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3312,7 +3312,7 @@ static HRESULT WINAPI fnIMLangFontLink2_GetCharCodePages( IMLangFontLink2* iface *ret_codepages = 0; - for (i = 0; i < ARRAY_SIZE(mlang_data); i++) + for (i = 0; i < ARRAY_SIZE(mlang_data) - 1 /* skip unicode codepages */; i++) { BOOL used_dc; CHAR buf;

1 0

Brendan Shanks : win32u: Remove workaround for Mac OS X 10.4 and 10.5.
by Alexandre Julliard March 18, 2022

March 18, 2022

Module: wine Branch: master Commit: b6b0f7411c8bc561c424f47c419fb4fa39a16661 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6b0f7411c8bc561c424f47c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Mar 17 20:07:20 2022 -0700 win32u: Remove workaround for Mac OS X 10.4 and 10.5. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/freetype.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index 77f4ef8eab3..b6063a14570 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -1773,35 +1773,7 @@ static void load_mac_fonts(void) CFStringRef path; desc = CFArrayGetValueAtIndex(descs, i); - -#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 url = CTFontDescriptorCopyAttribute(desc, kCTFontURLAttribute); -#else - /* CTFontDescriptor doesn't support kCTFontURLAttribute prior to 10.6, so - we have to go CFFontDescriptor -> CTFont -> ATSFont -> FSRef -> CFURL. */ - { - CTFontRef font; - ATSFontRef atsFont; - OSStatus status; - FSRef fsref; - - font = CTFontCreateWithFontDescriptor(desc, 0, NULL); - if (!font) continue; - - atsFont = CTFontGetPlatformFont(font, NULL); - if (!atsFont) - { - CFRelease(font); - continue; - } - - status = ATSFontGetFileReference(atsFont, &fsref); - CFRelease(font); - if (status != noErr) continue; - - url = CFURLCreateFromFSRef(NULL, &fsref); - } -#endif if (!url) continue; ext = CFURLCopyPathExtension(url);

1 0

Rémi Bernon : windows.gaming.input: Fix vector InsertAt / RemoveAt copy sizes.
by Alexandre Julliard March 18, 2022

March 18, 2022

Module: wine Branch: master Commit: d99101977d93f772ceb6ab8d05d2b33c00078788 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d99101977d93f772ceb6ab8d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 18 10:22:27 2022 +0100 windows.gaming.input: Fix vector InsertAt / RemoveAt copy sizes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/vector.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windows.gaming.input/vector.c b/dlls/windows.gaming.input/vector.c index c98c89195d1..db1a9057682 100644 --- a/dlls/windows.gaming.input/vector.c +++ b/dlls/windows.gaming.input/vector.c @@ -515,7 +515,7 @@ static HRESULT WINAPI vector_InsertAt( IVector_IInspectable *iface, UINT32 index } } - memmove( impl->elements + index + 1, impl->elements + index, impl->size++ * sizeof(*impl->elements) ); + memmove( impl->elements + index + 1, impl->elements + index, (impl->size++ - index) * sizeof(*impl->elements) ); IInspectable_AddRef( (impl->elements[index] = value) ); return S_OK; } @@ -528,7 +528,7 @@ static HRESULT WINAPI vector_RemoveAt( IVector_IInspectable *iface, UINT32 index if (index >= impl->size) return E_BOUNDS; IInspectable_Release( impl->elements[index] ); - memmove( impl->elements + index, impl->elements + index + 1, --impl->size * sizeof(*impl->elements) ); + memmove( impl->elements + index, impl->elements + index + 1, (--impl->size - index) * sizeof(*impl->elements) ); return S_OK; }

1 0

Alexandre Julliard : mlang: Store the codepage data in Unicode.
by Alexandre Julliard March 18, 2022

March 18, 2022

Module: wine Branch: master Commit: 55dc240fa801a533726afc6a8714df2687b6d9d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55dc240fa801a533726afc6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 14:58:57 2022 +0100 mlang: Store the codepage data in Unicode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/mlang.c | 426 +++++++++++++++++++++++++---------------------------- 1 file changed, 201 insertions(+), 225 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=55dc240fa801a533726a…

1 0

Alexandre Julliard : mlang: Register MIME charsets from the registry script.
by Alexandre Julliard March 18, 2022

March 18, 2022

Module: wine Branch: master Commit: 2b963bf519eb21e60080f021187999d524fb5208 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b963bf519eb21e60080f021… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 14:24:20 2022 +0100 mlang: Register MIME charsets from the registry script. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/mlang.rgs | 160 +++++++++++++++++++++++++++++++++++++++++++ loader/wine.inf.in | 187 --------------------------------------------------- 2 files changed, 160 insertions(+), 187 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2b963bf519eb21e60080…

1 0

Zebediah Figura : vkd3d-shader/hlsl: Parse the sv_vertexid semantic.
by Alexandre Julliard March 18, 2022

March 18, 2022

Module: vkd3d Branch: master Commit: 5251ecff892d212b1953a31b4e1cf0b4bcb58a79 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5251ecff892d212b1953a31… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 8 17:58:15 2022 -0600 vkd3d-shader/hlsl: Parse the sv_vertexid semantic. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(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 | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index f3650c1d..38220b18 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -100,6 +100,7 @@ bool hlsl_sm4_usage_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semant {"sv_depth", true, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_DEPTH}, {"sv_position", false, VKD3D_SHADER_TYPE_VERTEX, D3D_NAME_UNDEFINED}, + {"sv_vertexid", false, VKD3D_SHADER_TYPE_VERTEX, D3D_NAME_VERTEX_ID}, {"position", true, VKD3D_SHADER_TYPE_VERTEX, D3D_NAME_POSITION}, {"sv_position", true, VKD3D_SHADER_TYPE_VERTEX, D3D_NAME_POSITION},

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Allow offsets for scalar and vector variables.
by Alexandre Julliard March 18, 2022

March 18, 2022

Module: vkd3d Branch: master Commit: 84059d61c32950b634e44cac491ea8173705cc4d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=84059d61c32950b634e44ca… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Mar 10 12:14:05 2022 -0300 vkd3d-shader/hlsl: Allow offsets for scalar and vector variables. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> 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: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.h | 3 +-- libs/vkd3d-shader/hlsl_codegen.c | 22 +++++----------------- libs/vkd3d-shader/hlsl_sm1.c | 4 ++-- libs/vkd3d-shader/hlsl_sm4.c | 14 +++++++++----- 4 files changed, 17 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 2e8ba4af..0543e144 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -794,8 +794,7 @@ unsigned int hlsl_swizzle_from_writemask(unsigned int writemask); bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, unsigned int *offset); unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl_deref *deref); -struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, - const struct hlsl_type *type); +struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref); bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index ca3acba0..98be3aeb 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1542,11 +1542,6 @@ static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_base_type type) } } -static bool type_is_single_reg(const struct hlsl_type *type) -{ - return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; -} - bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, unsigned int *offset) { struct hlsl_ir_node *offset_node = deref->offset.node; @@ -1589,8 +1584,7 @@ unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl return 0; } -struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, - const struct hlsl_type *type) +struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref) { const struct hlsl_ir_var *var = deref->var; struct hlsl_reg ret = var->reg; @@ -1598,16 +1592,10 @@ struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_dere ret.id += offset / 4; - if (type_is_single_reg(var->data_type)) - { - assert(!offset); - ret.writemask = var->reg.writemask; - } - else - { - assert(type_is_single_reg(type)); - ret.writemask = ((1 << type->dimx) - 1) << (offset % 4); - } + ret.writemask = 0xf & (0xf << (offset % 4)); + if (var->reg.writemask) + ret.writemask = hlsl_combine_writemasks(var->reg.writemask, ret.writemask); + return ret; } diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 90ec6058..f661dbc2 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -663,7 +663,7 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b static void write_sm1_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_node *instr) { const struct hlsl_ir_load *load = hlsl_ir_load(instr); - const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &load->src, instr->data_type); + const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &load->src); struct sm1_instruction sm1_instr = { .opcode = D3DSIO_MOV, @@ -707,7 +707,7 @@ static void write_sm1_store(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * { const struct hlsl_ir_store *store = hlsl_ir_store(instr); const struct hlsl_ir_node *rhs = store->rhs.node; - const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &store->lhs, rhs->data_type); + const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &store->lhs); struct sm1_instruction sm1_instr = { .opcode = D3DSIO_MOV, diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 6996bb2d..802db3c1 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -870,6 +870,8 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, false, &reg->type, swizzle_type, &has_idx)) { + unsigned int offset = hlsl_offset_from_deref_safe(ctx, deref); + if (has_idx) { reg->idx[0] = var->semantic.index; @@ -877,11 +879,11 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r } reg->dim = VKD3D_SM4_DIMENSION_VEC4; - *writemask = (1u << data_type->dimx) - 1; + *writemask = ((1u << data_type->dimx) - 1) << (offset % 4); } else { - struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type); + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref); assert(hlsl_reg.allocated); reg->type = VKD3D_SM4_RT_INPUT; @@ -899,6 +901,8 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, true, &reg->type, swizzle_type, &has_idx)) { + unsigned int offset = hlsl_offset_from_deref_safe(ctx, deref); + if (has_idx) { reg->idx[0] = var->semantic.index; @@ -909,11 +913,11 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r reg->dim = VKD3D_SM4_DIMENSION_SCALAR; else reg->dim = VKD3D_SM4_DIMENSION_VEC4; - *writemask = (1u << data_type->dimx) - 1; + *writemask = ((1u << data_type->dimx) - 1) << (offset % 4); } else { - struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type); + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref); assert(hlsl_reg.allocated); reg->type = VKD3D_SM4_RT_OUTPUT; @@ -925,7 +929,7 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r } else { - struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type); + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref); assert(hlsl_reg.allocated); reg->type = VKD3D_SM4_RT_TEMP;

1 0

Conor McCarthy : vkd3d: Back descriptor heaps with Vulkan descriptor sets if descriptor indexing is available.
by Alexandre Julliard March 18, 2022

March 18, 2022

Module: vkd3d Branch: master Commit: 2b71ea406f494e9068c110a99b4ff655b667fc1e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2b71ea406f494e9068c110a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Feb 22 01:18:59 2022 +1000 vkd3d: Back descriptor heaps with Vulkan descriptor sets if descriptor indexing is available. The existing implementation using virtual descriptor heaps, where Vk descriptor sets are created for the bindings in the root descriptor tables, is inefficient when multiple command lists are used with large descriptor heaps. It also cannot support updating a descriptor set after it is bound. This patch creates Vk sets for each D3D12 heap. Because D3D12 heaps can contain CBV, SRV and UAV descriptors in the same heap, multiple Vk sets are needed for each heap, however the total number of populated descriptors is never more than (heap size + UAV counter count). A new 'virtual_heaps' config option is introduced to make the old implementation available when needed. It's not always possible to determine if this is necessary when the device is created. Up to nine Vk descriptor sets may be used. It's theoretically possible to reduce this to eight by placing immutable samplers in the push descriptor set layout, but contradictions in earlier versions of the Vulkan spec made driver support inconsistent. The documentation was corrected in version 1.2.203. This patch also adds support for UAV counter descriptor arrays. It's not practical to add this in a separate patch due to complications with combining the old UAV counter implementation with the new descriptor heap implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47713 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47154 Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- README | 3 + include/private/vkd3d_common.h | 4 + include/vkd3d_windows.h | 1 + libs/vkd3d/command.c | 151 +++++++++++++++++++++++++++- libs/vkd3d/device.c | 159 ++++++++++++++++++++++++++++- libs/vkd3d/resource.c | 197 ++++++++++++++++++++++++++++++++++++ libs/vkd3d/state.c | 222 +++++++++++++++++++++++++++++++++++++++-- libs/vkd3d/vkd3d_private.h | 56 +++++++++++ tests/d3d12.c | 13 ++- 9 files changed, 787 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=2b71ea406f494e9068c…

1 0

Francisco Casas : vkd3d-shader/hlsl: Remove redundant type check in declare_vars().
by Alexandre Julliard March 18, 2022

March 18, 2022

Module: vkd3d Branch: master Commit: a7e6d6b9d26fd0fcc0f1be9ae6c8419abdf0df84 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a7e6d6b9d26fd0fcc0f1be9… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Mar 10 12:14:11 2022 -0300 vkd3d-shader/hlsl: Remove redundant type check in declare_vars(). Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(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.y | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 521ca0a7..dc9b1439 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1612,23 +1612,17 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t continue; } - if (type->type == HLSL_CLASS_STRUCT) - { - struct_var_initializer(ctx, statements_list, var, &v->initializer); - vkd3d_free(v); - continue; - } - if (type->type > HLSL_CLASS_LAST_NUMERIC) + if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT) { FIXME("Initializers for non scalar/struct variables not supported yet.\n"); free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } - if (v->arrays.count) + + if (type->type == HLSL_CLASS_STRUCT) { - hlsl_fixme(ctx, &v->loc, "Array initializer."); - free_parse_initializer(&v->initializer); + struct_var_initializer(ctx, statements_list, var, &v->initializer); vkd3d_free(v); continue; }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 left shift instructions.
by Alexandre Julliard March 18, 2022

March 18, 2022

Module: vkd3d Branch: master Commit: 41d75fde22dea510def18153619674669b9bf15f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=41d75fde22dea510def1815… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 8 17:58:17 2022 -0600 vkd3d-shader/hlsl: Write SM4 left shift instructions. 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: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 41ea4c7f..fa845dc4 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1728,6 +1728,11 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_OP2_LSHIFT: + assert(type_is_integer(dst_type)); + write_sm4_binary_op(buffer, VKD3D_SM4_OP_ISHL, &expr->node, arg1, arg2); + break; + case HLSL_OP2_MAX: switch (dst_type->base_type) {

1 0