wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Hans Leidekker : wpcap: Move pcap support to a new Unix library.
by Alexandre Julliard 10 May '21

10 May '21

Module: wine Branch: master Commit: 67b95d4ab7ba71e9b6a91be2f38bbf0a90563229 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67b95d4ab7ba71e9b6a91be2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 10 15:37:23 2021 +0200 wpcap: Move pcap support to a new Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/Makefile.in | 1 + dlls/wpcap/unixlib.c | 262 ++++++++++++++++++++++++++++++++++ dlls/wpcap/unixlib.h | 71 ++++++++++ dlls/wpcap/wpcap.c | 374 +++++++++++++++++++++++-------------------------- dlls/wpcap/wpcap.spec | 2 +- 5 files changed, 510 insertions(+), 200 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=67b95d4ab7ba71e9b6a9…

1 0

Louis Lenders : kernel32: Remove entry for BasepDebugDump.
by Alexandre Julliard 10 May '21

10 May '21

Module: wine Branch: master Commit: 7aba0e541e5788ba59f993b58029be8c796ce31d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7aba0e541e5788ba59f993b5… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon May 10 12:40:57 2021 +0200 kernel32: Remove entry for BasepDebugDump. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51117 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 87e67d3743d..f033cf310c0 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -191,7 +191,6 @@ # @ stub BasepCheckAppCompat # @ stub BasepCheckBadapp # @ stub BasepCheckWinSaferRestrictions -@ stub BasepDebugDump # @ stub BasepFreeActivationContextActivationBlock # @ stub BasepFreeAppCompatData # @ stub BasepMapModuleHandle

1 0

Zebediah Figura : d3dcompiler/tests: Use winetest_push_context().
by Alexandre Julliard 10 May '21

10 May '21

Module: wine Branch: master Commit: e5c50f56616722a5e9361d0aa22c10d9ed853096 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5c50f56616722a5e9361d0a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 25 15:09:33 2021 -0500 d3dcompiler/tests: Use winetest_push_context(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 160 +++++++++++++++++++-------------- 1 file changed, 91 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e5c50f56616722a5e936…

1 0

Jacek Caban : winebuild: Use clang -print-prog-name to find LLVM tools.
by Alexandre Julliard 10 May '21

10 May '21

Module: wine Branch: master Commit: ea239f6b12fc94a05b425969442c3f0ced12981f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea239f6b12fc94a05b425969… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 7 17:05:46 2021 +0200 winebuild: Use clang -print-prog-name to find LLVM tools. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/utils.c | 78 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 68 insertions(+), 10 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 411a53c7133..56e76fc35cd 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -360,9 +360,50 @@ void spawn( struct strarray args ) } } +static const char *find_clang_tool( const struct strarray clang, const char *tool ) +{ + const char *out = get_temp_file_name( "print_tool", ".out" ); + struct strarray args; + int sout = -1; + char *path, *p; + struct stat st; + size_t cnt; + + args = strarray_copy( clang ); + strarray_add_one( &args, strmake( "-print-prog-name=%s", tool ) ); + if (verbose) strarray_add_one( &args, "-v" ); + + sout = dup( fileno(stdout) ); + freopen( out, "w", stdout ); + spawn( args ); + if (sout >= 0) + { + dup2( sout, fileno(stdout) ); + close( sout ); + } + + if (stat(out, &st) || !st.st_size) return NULL; + + path = xmalloc(st.st_size + 1); + sout = open(out, O_RDONLY); + if (sout == -1) return NULL; + cnt = read(sout, path, st.st_size); + close(sout); + path[cnt] = 0; + if ((p = strchr(path, '\n'))) *p = 0; + /* clang returns passed command instead of full path if the tool could not be found */ + if (!strcmp(path, tool)) + { + free( path ); + return NULL; + } + return path; +} + /* find a build tool in the path, trying the various names */ struct strarray find_tool( const char *name, const char * const *names ) { + struct strarray ret = empty_strarray; const char *file; const char *alt_names[2]; @@ -375,25 +416,42 @@ struct strarray find_tool( const char *name, const char * const *names ) while (*names) { - if ((file = find_binary( target_alias, *names )) - || (names == alt_names && (file = find_binary( "llvm", *names )))) + if ((file = find_binary( target_alias, *names ))) break; + names++; + } + + if (!file && names == alt_names + 1) + { + if (cc_command.count) file = find_clang_tool( cc_command, "lld-link" ); + if (!file && !(file = find_binary( "llvm", name ))) { - struct strarray ret = empty_strarray; - strarray_add_one( &ret, file ); - return ret; + struct strarray clang = empty_strarray; + strarray_add_one( &clang, "clang" ); + file = find_clang_tool( clang, strmake( "llvm-%s", name )); } - names++; } - fatal_error( "cannot find the '%s' tool\n", name ); + if (!file) fatal_error( "cannot find the '%s' tool\n", name ); + + strarray_add_one( &ret, file ); + return ret; } /* find a link tool in the path */ struct strarray find_link_tool(void) { struct strarray ret = empty_strarray; - const char *file; - if (!(file = find_binary( NULL, "lld-link" ))) - fatal_error( "cannot find the 'lld-link tool\n" ); + const char *file = NULL; + + if (cc_command.count) file = find_clang_tool( cc_command, "lld-link" ); + if (!file) file = find_binary( NULL, "lld-link" ); + if (!file) + { + struct strarray clang = empty_strarray; + strarray_add_one( &clang, "clang" ); + file = find_clang_tool( clang, "lld-link" ); + } + + if (!file) fatal_error( "cannot find the 'lld-link' tool\n" ); strarray_add_one( &ret, file ); return ret; }

1 0

Esme Povirk : slc: Return a non-zero handle from SLOpen.
by Alexandre Julliard 10 May '21

10 May '21

Module: wine Branch: master Commit: ab017a7c368c0c3cf51b0a27215433dd0f7685a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab017a7c368c0c3cf51b0a27… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 8 14:21:25 2021 -0500 slc: Return a non-zero handle from SLOpen. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/slc/slc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/slc/slc.c b/dlls/slc/slc.c index b246a7dfc1a..d36ce88c4fd 100644 --- a/dlls/slc/slc.c +++ b/dlls/slc/slc.c @@ -74,5 +74,10 @@ HRESULT WINAPI SLOpen(HSLC *handle) { FIXME("(%p) stub\n", handle ); + if (!handle) + return E_INVALIDARG; + + *handle = (HSLC)0xdeadbeef; + return S_OK; }

1 0

Alexandre Julliard : packaging: Add Fedora 34.
by Alexandre Julliard 10 May '21

10 May '21

Module: tools Branch: master Commit: ab5bb8007268784fa0674d0e949f088f11a9e3d0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ab5bb8007268784fa0674d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 8 18:01:10 2021 +0200 packaging: Add Fedora 34. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/obs-sync | 3 ++- packaging/obs/rsync-filter | 1 + packaging/obs/yum.conf | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 4ab9f4b..3b8843d 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -45,6 +45,7 @@ add_rpm () test -d $dstdir || mkdir -p $dstdir for arch in $rpm_archs do + rm -f $dstdir/$arch/$wine_pkg-$rpmver-*.$arch.rpm $dstdir/$arch/$winehq_pkg-$rpmver-*.$arch.rpm rsync -aq $src/$arch/$wine_pkg-$rpmver-*.$arch.rpm $dstdir/$arch/ files=$dstdir/$arch/$wine_pkg-$rpmver-*.$arch.rpm if test $arch != src @@ -180,7 +181,7 @@ publish_files () cd $basedir -distros="32 33 buster bullseye bionic focal groovy hirsute" +distros="32 33 34 buster bullseye bionic focal groovy hirsute" dry_run= while [ $# -ge 1 ] diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index 823558e..2410ed1 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -1,6 +1,7 @@ + /fedora + /fedora/32 + /fedora/33 ++ /fedora/34 - /fedora/* + /debian diff --git a/packaging/obs/yum.conf b/packaging/obs/yum.conf index 390123d..e199453 100644 --- a/packaging/obs/yum.conf +++ b/packaging/obs/yum.conf @@ -11,3 +11,7 @@ baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/… [fedora-33] name = Fedora 33 baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/… + +[fedora-34] +name = Fedora 34 +baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/Fedora_34

1 0

Zebediah Figura : vkd3d-shader: Allocate semantic registers.
by Alexandre Julliard 10 May '21

10 May '21

Module: vkd3d Branch: master Commit: 7da320e522d7509beddd9911a2d87f76aa38c330 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7da320e522d7509beddd991… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 27 12:14:21 2021 -0500 vkd3d-shader: Allocate semantic registers. 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> --- include/vkd3d_d3d9types.h | 15 ++++++ libs/vkd3d-shader/hlsl_codegen.c | 99 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+) diff --git a/include/vkd3d_d3d9types.h b/include/vkd3d_d3d9types.h index ba7dcbf..1f88644 100644 --- a/include/vkd3d_d3d9types.h +++ b/include/vkd3d_d3d9types.h @@ -164,5 +164,20 @@ typedef enum _D3DSHADER_PARAM_REGISTER_TYPE D3DSPR_FORCE_DWORD = 0x7fffffff, } D3DSHADER_PARAM_REGISTER_TYPE; +typedef enum _D3DSHADER_MISCTYPE_OFFSETS +{ + D3DSMO_POSITION = 0x0, + D3DSMO_FACE = 0x1, +} D3DSHADER_MISCTYPE_OFFSETS; + +typedef enum _D3DVS_RASTOUT_OFFSETS +{ + D3DSRO_POSITION = 0x0, + D3DSRO_FOG = 0x1, + D3DSRO_POINT_SIZE = 0x2, + + D3DSRO_FORCE_DWORD = 0x7fffffff, +} D3DVS_RASTOUT_OFFSETS; + #endif /* _d3d9TYPES_H_ */ #endif /* __VKD3D_D3D9TYPES_H */ diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 787d336..9f2c278 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -948,6 +948,104 @@ static void allocate_temp_registers(struct hlsl_ir_function_decl *entry_func) allocate_temp_registers_recurse(entry_func->body, &liveness); } +static bool sm1_register_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semantic *semantic, bool output, + D3DSHADER_PARAM_REGISTER_TYPE *type, unsigned int *reg) +{ + unsigned int i; + + static const struct + { + const char *semantic; + bool output; + enum vkd3d_shader_type shader_type; + unsigned int major_version; + D3DSHADER_PARAM_REGISTER_TYPE type; + DWORD offset; + } + register_table[] = + { + {"color", true, VKD3D_SHADER_TYPE_PIXEL, 2, D3DSPR_COLOROUT}, + {"depth", true, VKD3D_SHADER_TYPE_PIXEL, 2, D3DSPR_DEPTHOUT}, + {"sv_depth", true, VKD3D_SHADER_TYPE_PIXEL, 2, D3DSPR_DEPTHOUT}, + {"sv_target", true, VKD3D_SHADER_TYPE_PIXEL, 2, D3DSPR_COLOROUT}, + {"color", false, VKD3D_SHADER_TYPE_PIXEL, 2, D3DSPR_INPUT}, + {"texcoord", false, VKD3D_SHADER_TYPE_PIXEL, 2, D3DSPR_TEXTURE}, + + {"color", true, VKD3D_SHADER_TYPE_PIXEL, 3, D3DSPR_COLOROUT}, + {"depth", true, VKD3D_SHADER_TYPE_PIXEL, 3, D3DSPR_DEPTHOUT}, + {"sv_depth", true, VKD3D_SHADER_TYPE_PIXEL, 3, D3DSPR_DEPTHOUT}, + {"sv_target", true, VKD3D_SHADER_TYPE_PIXEL, 3, D3DSPR_COLOROUT}, + {"sv_position", false, VKD3D_SHADER_TYPE_PIXEL, 3, D3DSPR_MISCTYPE, D3DSMO_POSITION}, + {"vface", false, VKD3D_SHADER_TYPE_PIXEL, 3, D3DSPR_MISCTYPE, D3DSMO_FACE}, + {"vpos", false, VKD3D_SHADER_TYPE_PIXEL, 3, D3DSPR_MISCTYPE, D3DSMO_POSITION}, + + {"color", true, VKD3D_SHADER_TYPE_VERTEX, 1, D3DSPR_ATTROUT}, + {"fog", true, VKD3D_SHADER_TYPE_VERTEX, 1, D3DSPR_RASTOUT, D3DSRO_FOG}, + {"position", true, VKD3D_SHADER_TYPE_VERTEX, 1, D3DSPR_RASTOUT, D3DSRO_POSITION}, + {"psize", true, VKD3D_SHADER_TYPE_VERTEX, 1, D3DSPR_RASTOUT, D3DSRO_POINT_SIZE}, + {"sv_position", true, VKD3D_SHADER_TYPE_VERTEX, 1, D3DSPR_RASTOUT, D3DSRO_POSITION}, + {"texcoord", true, VKD3D_SHADER_TYPE_VERTEX, 1, D3DSPR_TEXCRDOUT}, + + {"color", true, VKD3D_SHADER_TYPE_VERTEX, 2, D3DSPR_ATTROUT}, + {"fog", true, VKD3D_SHADER_TYPE_VERTEX, 2, D3DSPR_RASTOUT, D3DSRO_FOG}, + {"position", true, VKD3D_SHADER_TYPE_VERTEX, 2, D3DSPR_RASTOUT, D3DSRO_POSITION}, + {"psize", true, VKD3D_SHADER_TYPE_VERTEX, 2, D3DSPR_RASTOUT, D3DSRO_POINT_SIZE}, + {"sv_position", true, VKD3D_SHADER_TYPE_VERTEX, 2, D3DSPR_RASTOUT, D3DSRO_POSITION}, + {"texcoord", true, VKD3D_SHADER_TYPE_VERTEX, 2, D3DSPR_TEXCRDOUT}, + }; + + for (i = 0; i < ARRAY_SIZE(register_table); ++i) + { + if (!ascii_strcasecmp(semantic->name, register_table[i].semantic) + && output == register_table[i].output + && ctx->profile->type == register_table[i].shader_type + && ctx->profile->major_version == register_table[i].major_version) + { + *type = register_table[i].type; + if (register_table[i].type == D3DSPR_MISCTYPE || register_table[i].type == D3DSPR_RASTOUT) + *reg = register_table[i].offset; + else + *reg = semantic->index; + return true; + } + } + + return false; +} + +static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, unsigned int *counter, bool output) +{ + assert(var->semantic.name); + + if (ctx->profile->major_version < 4) + { + D3DSHADER_PARAM_REGISTER_TYPE type; + unsigned int reg; + + if (!sm1_register_from_semantic(ctx, &var->semantic, output, &type, &reg)) + { + var->reg.allocated = true; + var->reg.id = (*counter)++; + var->reg.writemask = (1 << var->data_type->dimx) - 1; + TRACE("Allocated %s to %s.\n", var->name, debug_register(output ? 'o' : 'v', var->reg, var->data_type)); + } + } +} + +static void allocate_semantic_registers(struct hlsl_ctx *ctx) +{ + unsigned int input_counter = 0, output_counter = 0; + struct hlsl_ir_var *var; + + LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) + { + if (var->is_input_semantic && var->last_read) + allocate_semantic_register(ctx, var, &input_counter, false); + if (var->is_output_semantic && var->first_write) + allocate_semantic_register(ctx, var, &output_counter, true); + } +} + struct bytecode_buffer { uint32_t *data; @@ -1381,6 +1479,7 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun allocate_temp_registers(entry_func); if (ctx->profile->major_version < 4) allocate_const_registers(ctx, entry_func); + allocate_semantic_registers(ctx); if (ctx->failed) return VKD3D_ERROR_INVALID_SHADER;

1 0

Zebediah Figura : vkd3d-shader: Avoid using the term "varying" for all semantics.
by Alexandre Julliard 10 May '21

10 May '21

Module: vkd3d Branch: master Commit: 0c3b1d1d890c780cd29c035eafb220bd052b7ea7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0c3b1d1d890c780cd29c035… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 27 12:14:20 2021 -0500 vkd3d-shader: Avoid using the term "varying" for all semantics. It's not particularly accurate; "varying" only refers to the interface between two consecutive shader stages. Replace it with "semantic" in most cases. 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> --- Makefile.am | 4 +- libs/vkd3d-shader/hlsl.h | 4 +- libs/vkd3d-shader/hlsl_codegen.c | 43 +++++++++++----------- ...ader_test => hlsl-struct-semantics.shader_test} | 0 4 files changed, 25 insertions(+), 26 deletions(-) diff --git a/Makefile.am b/Makefile.am index cbf75ad..542b66e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,7 +65,7 @@ vkd3d_shader_tests = \ tests/hlsl-return-void.shader_test \ tests/hlsl-static-initializer.shader_test \ tests/hlsl-struct-assignment.shader_test \ - tests/hlsl-struct-varying.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 \ @@ -262,7 +262,7 @@ XFAIL_TESTS = \ tests/hlsl-return-void.shader_test \ tests/hlsl-static-initializer.shader_test \ tests/hlsl-struct-assignment.shader_test \ - tests/hlsl-struct-varying.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.h b/libs/vkd3d-shader/hlsl.h index c698983..9081ef3 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -229,8 +229,8 @@ struct hlsl_ir_var unsigned int first_write, last_read; struct hlsl_reg reg; - uint32_t is_input_varying : 1; - uint32_t is_output_varying : 1; + uint32_t is_input_semantic : 1; + uint32_t is_output_semantic : 1; uint32_t is_uniform : 1; uint32_t is_param : 1; }; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 180259f..787d336 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -76,8 +76,8 @@ static void prepend_input_copy(struct hlsl_ctx *ctx, struct list *instrs, struct struct hlsl_semantic new_semantic; struct hlsl_ir_constant *offset; struct hlsl_ir_store *store; - struct hlsl_ir_var *varying; struct hlsl_ir_load *load; + struct hlsl_ir_var *input; if (!(name = vkd3d_string_buffer_get(&ctx->string_buffers))) { @@ -92,7 +92,7 @@ static void prepend_input_copy(struct hlsl_ctx *ctx, struct list *instrs, struct return; } new_semantic.index = semantic->index; - if (!(varying = hlsl_new_var(vkd3d_strdup(name->buffer), type, var->loc, &new_semantic, 0, NULL))) + if (!(input = hlsl_new_var(vkd3d_strdup(name->buffer), type, var->loc, &new_semantic, 0, NULL))) { vkd3d_string_buffer_release(&ctx->string_buffers, name); vkd3d_free((void *)new_semantic.name); @@ -100,12 +100,12 @@ static void prepend_input_copy(struct hlsl_ctx *ctx, struct list *instrs, struct return; } vkd3d_string_buffer_release(&ctx->string_buffers, name); - varying->is_input_varying = 1; - varying->is_param = var->is_param; - list_add_before(&var->scope_entry, &varying->scope_entry); - list_add_tail(&ctx->extern_vars, &varying->extern_entry); + input->is_input_semantic = 1; + input->is_param = var->is_param; + list_add_before(&var->scope_entry, &input->scope_entry); + list_add_tail(&ctx->extern_vars, &input->extern_entry); - if (!(load = hlsl_new_var_load(varying, var->loc))) + if (!(load = hlsl_new_var_load(input, var->loc))) { ctx->failed = true; return; @@ -144,9 +144,8 @@ static void prepend_input_struct_copy(struct hlsl_ctx *ctx, struct list *instrs, } } -/* Split input varyings into two variables representing the varying and temp - * registers, and copy the former to the latter, so that writes to input - * varyings work. */ +/* Split inputs into two variables representing the semantic and temp registers, + * and copy the former to the latter, so that writes to input variables work. */ static void prepend_input_var_copy(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_var *var) { if (var->data_type->type == HLSL_CLASS_STRUCT) @@ -162,7 +161,7 @@ static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct struct hlsl_semantic new_semantic; struct hlsl_ir_constant *offset; struct hlsl_ir_store *store; - struct hlsl_ir_var *varying; + struct hlsl_ir_var *output; struct hlsl_ir_load *load; if (!(name = vkd3d_string_buffer_get(&ctx->string_buffers))) @@ -178,7 +177,7 @@ static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct return; } new_semantic.index = semantic->index; - if (!(varying = hlsl_new_var(vkd3d_strdup(name->buffer), type, var->loc, &new_semantic, 0, NULL))) + if (!(output = hlsl_new_var(vkd3d_strdup(name->buffer), type, var->loc, &new_semantic, 0, NULL))) { vkd3d_free((void *)new_semantic.name); vkd3d_string_buffer_release(&ctx->string_buffers, name); @@ -186,10 +185,10 @@ static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct return; } vkd3d_string_buffer_release(&ctx->string_buffers, name); - varying->is_output_varying = 1; - varying->is_param = var->is_param; - list_add_before(&var->scope_entry, &varying->scope_entry); - list_add_tail(&ctx->extern_vars, &varying->extern_entry); + output->is_output_semantic = 1; + output->is_param = var->is_param; + list_add_before(&var->scope_entry, &output->scope_entry); + list_add_tail(&ctx->extern_vars, &output->extern_entry); if (!(offset = hlsl_new_uint_constant(ctx, field_offset * 4, var->loc))) { @@ -205,7 +204,7 @@ static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct } list_add_after(&offset->node.entry, &load->node.entry); - if (!(store = hlsl_new_store(varying, NULL, &load->node, 0, var->loc))) + if (!(store = hlsl_new_store(output, NULL, &load->node, 0, var->loc))) { ctx->failed = true; return; @@ -230,9 +229,9 @@ static void append_output_struct_copy(struct hlsl_ctx *ctx, struct list *instrs, } } -/* Split output varyings into two variables representing the temp and varying +/* Split outputs into two variables representing the temp and semantic * registers, and copy the former to the latter, so that reads from output - * varyings work. */ + * variables work. */ static void append_output_var_copy(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_var *var) { if (var->data_type->type == HLSL_CLASS_STRUCT) @@ -618,9 +617,9 @@ static void compute_liveness(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - if (var->is_uniform || var->is_input_varying) + if (var->is_uniform || var->is_input_semantic) var->first_write = 1; - else if (var->is_output_varying) + else if (var->is_output_semantic) var->last_read = UINT_MAX; } @@ -744,7 +743,7 @@ static const char *debug_register(char class, struct hlsl_reg reg, const struct static void allocate_variable_temp_register(struct hlsl_ir_var *var, struct liveness *liveness) { - if (var->is_input_varying || var->is_output_varying || var->is_uniform) + if (var->is_input_semantic || var->is_output_semantic || var->is_uniform) return; if (!var->reg.allocated && var->last_read) diff --git a/tests/hlsl-struct-varying.shader_test b/tests/hlsl-struct-semantics.shader_test similarity index 100% rename from tests/hlsl-struct-varying.shader_test rename to tests/hlsl-struct-semantics.shader_test

1 0

Zebediah Figura : vkd3d-shader: Parse the semantic index in hlsl_parse().
by Alexandre Julliard 10 May '21

10 May '21

Module: vkd3d Branch: master Commit: 445165823edb924acb5c8452837a87826af84cbc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=445165823edb924acb5c845… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 27 12:14:19 2021 -0500 vkd3d-shader: Parse the semantic index in hlsl_parse(). 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 | 27 +++++++++++-------- libs/vkd3d-shader/hlsl.h | 15 ++++++++--- libs/vkd3d-shader/hlsl.y | 34 ++++++++++++++---------- libs/vkd3d-shader/hlsl_codegen.c | 56 ++++++++++++++++++++++++++-------------- 4 files changed, 85 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=445165823edb924acb5…

1 0

Zebediah Figura : vkd3d-shader: Only mark entry point parameters as uniform, input, or output.
by Alexandre Julliard 10 May '21

10 May '21

Module: vkd3d Branch: master Commit: 549be35c0aff6aa78f1dc9a08df89ce8de16db2c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=549be35c0aff6aa78f1dc9a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 27 12:14:18 2021 -0500 vkd3d-shader: Only mark entry point parameters as uniform, input, or output. In fact, don't even mark them directly; only mark the synthetic variables. 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.c | 38 ++++++++++++++------------------- libs/vkd3d-shader/hlsl.h | 6 ++++-- libs/vkd3d-shader/hlsl.y | 22 ++------------------ libs/vkd3d-shader/hlsl_codegen.c | 45 ++++++++++++++++++++++++++-------------- 4 files changed, 51 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=549be35c0aff6aa78f1…

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
77
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 May 2021