August 2021 - Wine-commits - list.winehq.org

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 245165e47f6a3b4c23087d44f0fb821a505dd143 URL: https://source.winehq.org/git/wine.git/?a=commit;h=245165e47f6a3b4c23087d44… Author: Kim Malmo <berencamlost(a)msn.com> Date: Fri Aug 27 10:13:54 2021 +0200 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 92 +++++++++++++++++-------------------------------------------- 1 file changed, 26 insertions(+), 66 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index a5e42fd9831..f55f847a4c7 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -21,26 +21,20 @@ msgid "Security" msgstr "Sikkerhet" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "Br&ukernavn:" +msgstr "&Gruppe eller brukernavn:" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "Gul" +msgstr "Tillat" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "Nekt" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Access denied.\n" msgid "Permissions for %1" -msgstr "Tilgang nektet.\n" +msgstr "Tilgang for %1" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" @@ -3769,7 +3763,7 @@ msgstr "Spillkontrollere" #: dlls/joy.cpl/joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "Test og konfigurer spillkontrollere." #: dlls/jscript/jscript.rc:28 msgid "Error converting object to primitive type" @@ -3875,7 +3869,7 @@ msgstr "Forventet '@'" #: dlls/jscript/jscript.rc:80 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Microsoft JScript kompileringsfeil" #: dlls/jscript/jscript.rc:81 msgid "Microsoft JScript runtime error" @@ -6969,38 +6963,28 @@ msgid "Connection reset by peer.\n" msgstr "Tilkobling nullstilt av likemann.\n" #: dlls/kernel32/winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "Ikke implementert" +msgstr "Ikke implementert.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "RPC-kall feilet.\n" +msgstr "Kall feilet.\n" #: dlls/kernel32/winerror.mc:3760 msgid "No Signature found in file.\n" msgstr "Fant ingen signatur i filen.\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "Ugyldig nivå.\n" +msgstr "Ugyldig kall.\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Value is not available.\n" msgid "Resource is not currently available.\n" -msgstr "Verdi er ikke tilgjengelig.\n" +msgstr "Ressursen er for øyeblikket ikke tilgjengelig.\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy -#| msgid "Class Name:" msgid "Classic Blue" -msgstr "Klassenavn:" +msgstr "Klassisk Blå" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73 @@ -9200,32 +9184,24 @@ msgid "Provider" msgstr "Tilbyder" #: dlls/oledb32/version.rc:59 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "Velg formatet du ønsker å bruke:" +msgstr "Velg data du ønsker å koble til:" #: dlls/oledb32/version.rc:66 -#, fuzzy -#| msgid "Connections" msgid "Connection" -msgstr "Nettverksforbindelser" +msgstr "Nettverksforbindelse" #: dlls/oledb32/version.rc:69 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Specify the following to connect to ODBC data:" -msgstr "Velg formatet du ønsker å bruke:" +msgstr "Spesifiser følgende for å koble til ODBC-data:" #: dlls/oledb32/version.rc:70 msgid "1. Specify the source of data:" -msgstr "" +msgstr "1. Spesifiser datakilden:" #: dlls/oledb32/version.rc:71 -#, fuzzy -#| msgid "Please enter your name" msgid "Use &data source name" -msgstr "Skriv inn navnet ditt" +msgstr "Bruk &datakilde-navnet" #: dlls/oledb32/version.rc:74 #, fuzzy @@ -9250,64 +9226,48 @@ msgid "2. Enter information to log on to the server" msgstr "" #: dlls/oledb32/version.rc:79 -#, fuzzy -#| msgid "&User name:" msgid "User &name:" -msgstr "Br&ukernavn:" +msgstr "Bruker&navn:" #: dlls/oledb32/version.rc:83 -#, fuzzy -#| msgid "&Blank page" msgid "&Blank password" -msgstr "&Tom side" +msgstr "&Blankt passord" #: dlls/oledb32/version.rc:84 -#, fuzzy -#| msgid "Wrong password.\n" msgid "Allow &saving password" -msgstr "Feil passord.\n" +msgstr "Tillat lagring av pa%ssord" #: dlls/oledb32/version.rc:85 msgid "3. Enter the &initial catalog to use:" msgstr "" #: dlls/oledb32/version.rc:87 -#, fuzzy -#| msgid "Reset Connections" msgid "&Test Connection" -msgstr "Tilbakestill tilkoblinger" +msgstr "&Test tilkobling" #: dlls/oledb32/version.rc:92 msgid "Advanced" msgstr "Avansert" #: dlls/oledb32/version.rc:95 -#, fuzzy -#| msgid "Network share" msgid "Network settings" -msgstr "Nettverksressurs" +msgstr "Nettverksinnstillinger" #: dlls/oledb32/version.rc:96 -#, fuzzy -#| msgid "Bad impersonation level.\n" msgid "&Impersonation level:" -msgstr "Ugyldig personifiseringsnivå.\n" +msgstr "Person&ifiseringsnivå:" #: dlls/oledb32/version.rc:98 msgid "P&rotection level:" msgstr "" #: dlls/oledb32/version.rc:101 -#, fuzzy -#| msgid "Connected" msgid "Connect:" -msgstr "Tilkoblet" +msgstr "Koble til:" #: dlls/oledb32/version.rc:103 -#, fuzzy -#| msgid "seconds" msgid "seconds." -msgstr "sekunder" +msgstr "sekunder." #: dlls/oledb32/version.rc:104 #, fuzzy @@ -10371,7 +10331,7 @@ msgstr "Nedlastinger" #: dlls/shell32/shell32.rc:169 msgid "Unable to create new Folder: Permission denied." -msgstr "Kunne ikke opprette ny mappe: tilgang nektet." +msgstr "Kunne ikke opprette ny mappe: Tilgang nektet." #: dlls/shell32/shell32.rc:170 msgid "Error during creation of a new folder" @@ -13957,7 +13917,7 @@ msgstr "Ethernet" #: programs/ipconfig/ipconfig.rc:35 msgid "Connection-specific DNS suffix" -msgstr "TIlkoblingsspesifikt DNS-suffiks" +msgstr "Tilkoblingsspesifikt DNS-suffiks" #: programs/ipconfig/ipconfig.rc:36 msgid "IPv4 address"

1 0

Michael Stefaniuc : d3dx10: Remove redundant NULL check before heap_free().
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 460ca9a9b5ef0fd667cac3281eea8aac15076909 URL: https://source.winehq.org/git/wine.git/?a=commit;h=460ca9a9b5ef0fd667cac328… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Aug 25 22:39:07 2021 +0200 d3dx10: Remove redundant NULL check before heap_free(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/texture.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 8d30aef8648..32215b0a99a 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -709,8 +709,7 @@ end: IWICFormatConverter_Release(converter); if (dds_frame) IWICDdsFrameDecode_Release(dds_frame); - if (buffer) - heap_free(buffer); + heap_free(buffer); if (frame) IWICBitmapFrameDecode_Release(frame); if (decoder)

1 0

Nikolay Sivov : d3d10/effect: Warn only when ignored default variable value is specified.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 624b33bfb83715a5431753e1f94e28dfad5af64a URL: https://source.winehq.org/git/wine.git/?a=commit;h=624b33bfb83715a5431753e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 26 08:32:11 2021 +0300 d3d10/effect: Warn only when ignored default variable value is specified. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3b3d48c50a8..9312cfec6f6 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1814,10 +1814,10 @@ static HRESULT parse_fx10_technique(const char *data, size_t data_size, return S_OK; } -static HRESULT parse_fx10_variable(const char *data, size_t data_size, +static HRESULT parse_fx10_numeric_variable(const char *data, size_t data_size, const char **ptr, struct d3d10_effect_variable *v) { - DWORD offset; + DWORD offset, default_value_offset; unsigned int i; HRESULT hr; @@ -1837,11 +1837,14 @@ static HRESULT parse_fx10_variable(const char *data, size_t data_size, read_dword(ptr, &v->buffer_offset); TRACE("Variable offset in buffer: %#x.\n", v->buffer_offset); - skip_dword_unknown("variable", ptr, 1); + read_dword(ptr, &default_value_offset); read_dword(ptr, &v->flag); TRACE("Variable flag: %#x.\n", v->flag); + if (default_value_offset) + FIXME("Set default variable value.\n"); + read_dword(ptr, &v->annotation_count); TRACE("Variable has %u annotations.\n", v->annotation_count); @@ -2230,7 +2233,7 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, v->buffer = l; v->effect = l->effect; - if (FAILED(hr = parse_fx10_variable(data, data_size, ptr, v))) + if (FAILED(hr = parse_fx10_numeric_variable(data, data_size, ptr, v))) return hr; /*

1 0

Nikolay Sivov : d3d10/effect: Clear up unknown fields in effect header.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 03c88ad6220f77fd32cf2b069e55bf53e908b02c URL: https://source.winehq.org/git/wine.git/?a=commit;h=03c88ad6220f77fd32cf2b06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 26 08:32:12 2021 +0300 d3d10/effect: Clear up unknown fields in effect header. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 9312cfec6f6..fe494e952d6 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2442,7 +2442,7 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_size) { const char *ptr = data; - DWORD unknown; + DWORD unused; if (!require_space(0, 19, sizeof(DWORD), data_size)) { @@ -2464,14 +2464,13 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s TRACE("Object count: %u\n", e->local_variable_count); read_dword(&ptr, &e->sharedbuffers_count); - TRACE("Sharedbuffers count: %u\n", e->sharedbuffers_count); + TRACE("Pool buffer count: %u\n", e->sharedbuffers_count); - /* Number of variables in shared buffers? */ - read_dword(&ptr, &unknown); - FIXME("Unknown 0: %u\n", unknown); + read_dword(&ptr, &unused); + TRACE("Pool variable count: %u\n", unused); read_dword(&ptr, &e->sharedobjects_count); - TRACE("Sharedobjects count: %u\n", e->sharedobjects_count); + TRACE("Pool objects count: %u\n", e->sharedobjects_count); read_dword(&ptr, &e->technique_count); TRACE("Technique count: %u\n", e->technique_count); @@ -2479,8 +2478,8 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s read_dword(&ptr, &e->index_offset); TRACE("Index offset: %#x\n", e->index_offset); - read_dword(&ptr, &unknown); - FIXME("Unknown 1: %u\n", unknown); + read_dword(&ptr, &unused); + TRACE("String count: %u\n", unused); read_dword(&ptr, &e->texture_count); TRACE("Texture count: %u\n", e->texture_count);

1 0

Nikolay Sivov : d3d10/effect: Store explicit bind point value for constant buffers and object variables.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 6cd12a9a432f0ed17de7ba98da5e4fa5bede4e4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cd12a9a432f0ed17de7ba98… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 26 08:32:13 2021 +0300 d3d10/effect: Store explicit bind point value for constant buffers and object variables. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 751c39dc895..5e406110988 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -199,6 +199,7 @@ struct d3d10_effect_variable DWORD annotation_count; DWORD flag; DWORD data_size; + DWORD explicit_bind_point; struct d3d10_effect *effect; struct d3d10_effect_variable *elements; struct d3d10_effect_variable *members; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index fe494e952d6..acc7199138b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1165,6 +1165,8 @@ static HRESULT parse_fx10_variable_head(const char *data, size_t data_size, } set_variable_vtbl(v); + v->explicit_bind_point = ~0u; + return copy_variableinfo_from_type(v); } @@ -1927,7 +1929,8 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, } TRACE("Variable semantic: %s.\n", debugstr_a(v->semantic)); - skip_dword_unknown("local variable", ptr, 1); + read_dword(ptr, &v->explicit_bind_point); + TRACE("Variable explicit bind point %#x.\n", v->explicit_bind_point); switch (v->type->basetype) { @@ -2191,7 +2194,8 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, read_dword(ptr, &l->type->member_count); TRACE("Local buffer member count: %#x.\n", l->type->member_count); - skip_dword_unknown("local buffer", ptr, 1); + read_dword(ptr, &l->explicit_bind_point); + TRACE("Local buffer explicit bind point: %#x.\n", l->explicit_bind_point); read_dword(ptr, &l->annotation_count); TRACE("Local buffer has %u annotations.\n", l->annotation_count);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Avoid crashing when emitting a dereference with non-constant offset.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: vkd3d Branch: master Commit: ac88631755646d7e471056aa878cbba4a933727e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ac88631755646d7e471056a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 24 01:18:07 2021 -0500 vkd3d-shader/hlsl: Avoid crashing when emitting a dereference with non-constant offset. Some places assert() that the register is allocated. 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: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index c2aeb7b..2759201 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1200,7 +1200,7 @@ struct hlsl_reg hlsl_reg_from_deref(const struct hlsl_deref *deref, const struct if (offset_node && offset_node->type != HLSL_IR_CONSTANT) { FIXME("Dereference with non-constant offset of type %s.\n", hlsl_node_type_to_string(offset_node->type)); - return ret; + offset_node = NULL; } ret = var->reg;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 store instructions.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: vkd3d Branch: master Commit: 4232231dd3bc8e3854c1630dea6b5c9dac5ef19d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4232231dd3bc8e3854c1630… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 24 01:18:08 2021 -0500 vkd3d-shader/hlsl: Write SM4 store instructions. 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_sm4.c | 116 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 114 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 1592767..2e304c5 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -591,6 +591,7 @@ static unsigned int sm4_swizzle_type(enum vkd3d_sm4_register_type type) { case VKD3D_SM4_RT_CONSTBUFFER: case VKD3D_SM4_RT_INPUT: + case VKD3D_SM4_RT_TEMP: return VKD3D_SM4_SWIZZLE_VEC4; default: @@ -599,6 +600,64 @@ static unsigned int sm4_swizzle_type(enum vkd3d_sm4_register_type type) } } +static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *reg, + unsigned int *writemask, const struct hlsl_deref *deref, const struct hlsl_type *data_type) +{ + const struct hlsl_ir_var *var = deref->var; + + if (var->is_output_semantic) + { + bool has_idx; + + if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, true, &reg->type, &has_idx)) + { + if (has_idx) + { + reg->idx[0] = var->semantic.index; + reg->idx_count = 1; + } + + if (reg->type == VKD3D_SM4_RT_DEPTHOUT) + reg->dim = VKD3D_SM4_DIMENSION_SCALAR; + else + reg->dim = VKD3D_SM4_DIMENSION_VEC4; + *writemask = (1u << data_type->dimx) - 1; + } + else + { + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(deref, data_type); + + assert(hlsl_reg.allocated); + reg->type = VKD3D_SM4_RT_OUTPUT; + reg->dim = VKD3D_SM4_DIMENSION_VEC4; + reg->idx[0] = hlsl_reg.id; + reg->idx_count = 1; + *writemask = hlsl_reg.writemask; + } + } + else + { + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(deref, data_type); + + assert(hlsl_reg.allocated); + reg->type = VKD3D_SM4_RT_TEMP; + reg->dim = VKD3D_SM4_DIMENSION_VEC4; + reg->idx[0] = hlsl_reg.id; + reg->idx_count = 1; + *writemask = hlsl_reg.writemask; + } +} + +static void sm4_register_from_node(struct sm4_register *reg, unsigned int *writemask, const struct hlsl_ir_node *instr) +{ + assert(instr->reg.allocated); + reg->type = VKD3D_SM4_RT_TEMP; + reg->dim = VKD3D_SM4_DIMENSION_VEC4; + reg->idx[0] = instr->reg.id; + reg->idx_count = 1; + *writemask = instr->reg.writemask; +} + static uint32_t sm4_encode_register(const struct sm4_register *reg) { return (reg->type << VKD3D_SM4_REGISTER_TYPE_SHIFT) @@ -785,11 +844,40 @@ static void write_sm4_ret(struct vkd3d_bytecode_buffer *buffer) write_sm4_instruction(buffer, &instr); } -static void write_sm4_shdr(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) +static void write_sm4_store(struct hlsl_ctx *ctx, + struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_store *store) +{ + const struct hlsl_ir_node *rhs = store->rhs.node; + struct sm4_instruction instr; + unsigned int writemask; + + if (store->lhs.var->data_type->type == HLSL_CLASS_MATRIX) + { + hlsl_fixme(ctx, store->node.loc, "Store to a matrix variable.\n"); + return; + } + + memset(&instr, 0, sizeof(instr)); + instr.opcode = VKD3D_SM4_OP_MOV; + + sm4_register_from_deref(ctx, &instr.dst.reg, &writemask, &store->lhs, rhs->data_type); + instr.dst.writemask = hlsl_combine_writemasks(writemask, store->writemask); + instr.has_dst = 1; + + sm4_register_from_node(&instr.srcs[0].reg, &writemask, rhs); + instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dst.writemask); + instr.src_count = 1; + + write_sm4_instruction(buffer, &instr); +} + +static void write_sm4_shdr(struct hlsl_ctx *ctx, + const struct hlsl_ir_function_decl *entry_func, struct dxbc_writer *dxbc) { const struct hlsl_profile_info *profile = ctx->profile; struct vkd3d_bytecode_buffer buffer = {0}; const struct hlsl_buffer *cbuffer; + const struct hlsl_ir_node *instr; const struct hlsl_ir_var *var; size_t token_count_position; @@ -824,6 +912,30 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) if (ctx->temp_count) write_sm4_dcl_temps(&buffer, ctx->temp_count); + LIST_FOR_EACH_ENTRY(instr, entry_func->body, struct hlsl_ir_node, entry) + { + if (instr->data_type) + { + if (instr->data_type->type == HLSL_CLASS_MATRIX) + { + FIXME("Matrix operations need to be lowered.\n"); + break; + } + + assert(instr->data_type->type == HLSL_CLASS_SCALAR || instr->data_type->type == HLSL_CLASS_VECTOR); + } + + switch (instr->type) + { + case HLSL_IR_STORE: + write_sm4_store(ctx, &buffer, hlsl_ir_store(instr)); + break; + + default: + FIXME("Unhandled instruction type %s.\n", hlsl_node_type_to_string(instr->type)); + } + } + write_sm4_ret(&buffer); set_u32(&buffer, token_count_position, bytecode_get_size(&buffer) / sizeof(uint32_t)); @@ -842,7 +954,7 @@ int hlsl_sm4_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun write_sm4_signature(ctx, &dxbc, false); write_sm4_signature(ctx, &dxbc, true); write_sm4_rdef(ctx, &dxbc); - write_sm4_shdr(ctx, &dxbc); + write_sm4_shdr(ctx, entry_func, &dxbc); if (!(ret = ctx->result)) ret = dxbc_writer_write(&dxbc, out);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 load instructions.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: vkd3d Branch: master Commit: 51b8c46b9d81d7f1ba75d4211f0e22952e9e8f82 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=51b8c46b9d81d7f1ba75d42… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 24 01:18:09 2021 -0500 vkd3d-shader/hlsl: Write SM4 load 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: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl_sm4.c | 60 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 59 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index fc1714f..1bbe1c5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -274,7 +274,6 @@ XFAIL_TESTS = \ tests/hlsl-static-initializer.shader_test \ tests/hlsl-storage-qualifiers.shader_test \ tests/hlsl-struct-assignment.shader_test \ - tests/hlsl-struct-semantics.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 2e304c5..723b600 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -605,7 +605,42 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r { const struct hlsl_ir_var *var = deref->var; - if (var->is_output_semantic) + if (var->is_uniform) + { + reg->type = VKD3D_SM4_RT_CONSTBUFFER; + reg->idx[0] = var->buffer->reg.id; + reg->idx[1] = var->buffer_offset / 4; + reg->idx_count = 2; + *writemask = ((1u << data_type->dimx) - 1) << (var->buffer_offset & 3); + } + else if (var->is_input_semantic) + { + bool has_idx; + + if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, false, &reg->type, &has_idx)) + { + if (has_idx) + { + reg->idx[0] = var->semantic.index; + reg->idx_count = 1; + } + + reg->dim = VKD3D_SM4_DIMENSION_VEC4; + *writemask = (1u << data_type->dimx) - 1; + } + else + { + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(deref, data_type); + + assert(hlsl_reg.allocated); + reg->type = VKD3D_SM4_RT_INPUT; + reg->dim = VKD3D_SM4_DIMENSION_VEC4; + reg->idx[0] = hlsl_reg.id; + reg->idx_count = 1; + *writemask = hlsl_reg.writemask; + } + } + else if (var->is_output_semantic) { bool has_idx; @@ -844,6 +879,25 @@ static void write_sm4_ret(struct vkd3d_bytecode_buffer *buffer) write_sm4_instruction(buffer, &instr); } +static void write_sm4_load(struct hlsl_ctx *ctx, + struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_load *load) +{ + struct sm4_instruction instr; + unsigned int writemask; + + memset(&instr, 0, sizeof(instr)); + instr.opcode = VKD3D_SM4_OP_MOV; + + sm4_register_from_node(&instr.dst.reg, &instr.dst.writemask, &load->node); + instr.has_dst = 1; + + sm4_register_from_deref(ctx, &instr.srcs[0].reg, &writemask, &load->src, load->node.data_type); + instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dst.writemask); + instr.src_count = 1; + + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_store(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_store *store) { @@ -927,6 +981,10 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, switch (instr->type) { + case HLSL_IR_LOAD: + write_sm4_load(ctx, &buffer, hlsl_ir_load(instr)); + break; + case HLSL_IR_STORE: write_sm4_store(ctx, &buffer, hlsl_ir_store(instr)); break;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 swizzle instructions.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: vkd3d Branch: master Commit: 32fd18837b37aac1a3fedc3d0ade91559ccedfae URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=32fd18837b37aac1a3fedc3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 24 01:18:10 2021 -0500 vkd3d-shader/hlsl: Write SM4 swizzle 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: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 723b600..73bac7b 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -925,6 +925,26 @@ static void write_sm4_store(struct hlsl_ctx *ctx, write_sm4_instruction(buffer, &instr); } +static void write_sm4_swizzle(struct hlsl_ctx *ctx, + struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_swizzle *swizzle) +{ + struct sm4_instruction instr; + unsigned int writemask; + + memset(&instr, 0, sizeof(instr)); + instr.opcode = VKD3D_SM4_OP_MOV; + + sm4_register_from_node(&instr.dst.reg, &instr.dst.writemask, &swizzle->node); + instr.has_dst = 1; + + sm4_register_from_node(&instr.srcs[0].reg, &writemask, swizzle->val.node); + instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_combine_swizzles(hlsl_swizzle_from_writemask(writemask), + swizzle->swizzle, swizzle->node.data_type->dimx), instr.dst.writemask); + instr.src_count = 1; + + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_shdr(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl *entry_func, struct dxbc_writer *dxbc) { @@ -989,6 +1009,10 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, write_sm4_store(ctx, &buffer, hlsl_ir_store(instr)); break; + case HLSL_IR_SWIZZLE: + write_sm4_swizzle(ctx, &buffer, hlsl_ir_swizzle(instr)); + break; + default: FIXME("Unhandled instruction type %s.\n", hlsl_node_type_to_string(instr->type)); }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 constant instructions.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: vkd3d Branch: master Commit: ebfb8be1c60c0a30cea366b0d9093d2fe8911d51 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ebfb8be1c60c0a30cea366b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 24 01:18:11 2021 -0500 vkd3d-shader/hlsl: Write SM4 constant 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: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 8 -------- libs/vkd3d-shader/hlsl_sm4.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1bbe1c5..9d0410a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -277,14 +277,6 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ - tests/swizzle-0.shader_test \ - tests/swizzle-1.shader_test \ - tests/swizzle-2.shader_test \ - tests/swizzle-3.shader_test \ - tests/swizzle-4.shader_test \ - tests/swizzle-5.shader_test \ - tests/swizzle-6.shader_test \ - tests/swizzle-7.shader_test \ tests/trigonometry.shader_test \ tests/writemask-assignop-0.shader_test \ tests/writemask-assignop-1.shader_test \ diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 73bac7b..27058fe 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -560,6 +560,7 @@ struct sm4_register uint32_t idx[2]; unsigned int idx_count; enum vkd3d_sm4_dimension dim; + uint32_t immconst_uint[4]; }; struct sm4_instruction @@ -589,6 +590,9 @@ static unsigned int sm4_swizzle_type(enum vkd3d_sm4_register_type type) { switch (type) { + case VKD3D_SM4_RT_IMMCONST: + return VKD3D_SM4_SWIZZLE_NONE; + case VKD3D_SM4_RT_CONSTBUFFER: case VKD3D_SM4_RT_INPUT: case VKD3D_SM4_RT_TEMP: @@ -743,6 +747,17 @@ static void write_sm4_instruction(struct vkd3d_bytecode_buffer *buffer, const st for (j = 0; j < instr->srcs[i].reg.idx_count; ++j) put_u32(buffer, instr->srcs[i].reg.idx[j]); + + if (instr->srcs[i].reg.type == VKD3D_SM4_RT_IMMCONST) + { + put_u32(buffer, instr->srcs[i].reg.immconst_uint[0]); + if (instr->srcs[i].reg.dim == VKD3D_SM4_DIMENSION_VEC4) + { + put_u32(buffer, instr->srcs[i].reg.immconst_uint[1]); + put_u32(buffer, instr->srcs[i].reg.immconst_uint[2]); + put_u32(buffer, instr->srcs[i].reg.immconst_uint[3]); + } + } } for (j = 0; j < instr->idx_count; ++j) @@ -879,6 +894,30 @@ static void write_sm4_ret(struct vkd3d_bytecode_buffer *buffer) write_sm4_instruction(buffer, &instr); } +static void write_sm4_constant(struct hlsl_ctx *ctx, + struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_constant *constant) +{ + const unsigned int dimx = constant->node.data_type->dimx; + struct sm4_instruction instr; + unsigned int i; + + memset(&instr, 0, sizeof(instr)); + instr.opcode = VKD3D_SM4_OP_MOV; + + sm4_register_from_node(&instr.dst.reg, &instr.dst.writemask, &constant->node); + instr.has_dst = 1; + + instr.srcs[0].reg.dim = (dimx > 1) ? VKD3D_SM4_DIMENSION_VEC4 : VKD3D_SM4_DIMENSION_SCALAR; + instr.srcs[0].reg.type = VKD3D_SM4_RT_IMMCONST; + instr.srcs[0].reg.idx[0] = constant->reg.id; + instr.srcs[0].reg.idx_count = 1; + for (i = 0; i < dimx; ++i) + instr.srcs[0].reg.immconst_uint[i] = constant->value.u[i]; + instr.src_count = 1, + + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_load *load) { @@ -1001,6 +1040,10 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, switch (instr->type) { + case HLSL_IR_CONSTANT: + write_sm4_constant(ctx, &buffer, hlsl_ir_constant(instr)); + break; + case HLSL_IR_LOAD: write_sm4_load(ctx, &buffer, hlsl_ir_load(instr)); break;

1 0