May 2021 - Wine-Commits - list.winehq.org

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

May 10, 2021

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 May 10, 2021

May 10, 2021

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

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

May 10, 2021

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

Hans Leidekker : wpcap: Use CRT memory allocators.
by Alexandre Julliard May 10, 2021

May 10, 2021

Module: wine Branch: master Commit: 7a774f75697eace8a419a18d8a1e107e3b226007 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a774f75697eace8a419a18d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 10 15:37:26 2021 +0200 wpcap: Use CRT memory allocators. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/wpcap.c | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index cb064512e08..3c959a9dbd7 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -26,7 +26,6 @@ #define USE_WS_PREFIX #include "winsock2.h" -#include "wine/heap.h" #include "wine/debug.h" #include "unixlib.h" @@ -34,22 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wpcap); const struct pcap_funcs *pcap_funcs = NULL; -static inline WCHAR *heap_strdupAtoW(const char *str) -{ - LPWSTR ret = NULL; - - if(str) { - DWORD len; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = heap_alloc(len*sizeof(WCHAR)); - if(ret) - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - } - - return ret; -} - int CDECL wine_pcap_activate( void *handle ) { TRACE( "%p\n", handle ); @@ -124,6 +107,17 @@ void CDECL wine_pcap_dump( unsigned char *user, const void *hdr, const unsigned pcap_funcs->dump( user, hdr, packet ); } +static inline WCHAR *strdupAW( const char *str ) +{ + WCHAR *ret = NULL; + if (str) + { + int len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + if ((ret = malloc( len * sizeof(WCHAR) ))) MultiByteToWideChar( CP_ACP, 0, str, -1, ret, len ); + } + return ret; +} + void * CDECL wine_pcap_dump_open( void *handle, const char *filename ) { void *dumper; @@ -132,15 +126,15 @@ void * CDECL wine_pcap_dump_open( void *handle, const char *filename ) TRACE( "%p, %s\n", handle, debugstr_a(filename) ); - if (!(filenameW = heap_strdupAtoW( filename ))) return NULL; + if (!(filenameW = strdupAW( filename ))) return NULL; unix_path = wine_get_unix_file_name( filenameW ); - heap_free( filenameW ); + free( filenameW ); if (!unix_path) return NULL; TRACE( "unix_path %s\n", debugstr_a(unix_path) ); dumper = pcap_funcs->dump_open( handle, unix_path ); - heap_free( unix_path ); + RtlFreeHeap( GetProcessHeap(), 0, unix_path ); return dumper; }

1 0

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

May 10, 2021

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

Alexandre Julliard : packaging: Add Fedora 34.
by Alexandre Julliard May 10, 2021

May 10, 2021

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 May 10, 2021

May 10, 2021

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: Write SM1 constant definitions.
by Alexandre Julliard May 10, 2021

May 10, 2021

Module: vkd3d Branch: master Commit: 16e549e5798b769073c0d510f447504290d8f27e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=16e549e5798b769073c0d51… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 27 12:14:17 2021 -0500 vkd3d-shader: Write SM1 constant definitions. 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> --- include/vkd3d_d3d9types.h | 41 +++++++++++++ libs/vkd3d-shader/hlsl.h | 11 ++++ libs/vkd3d-shader/hlsl_codegen.c | 121 +++++++++++++++++++++++++++++++++++---- 3 files changed, 162 insertions(+), 11 deletions(-) diff --git a/include/vkd3d_d3d9types.h b/include/vkd3d_d3d9types.h index 7a8c15f..ba7dcbf 100644 --- a/include/vkd3d_d3d9types.h +++ b/include/vkd3d_d3d9types.h @@ -27,6 +27,19 @@ ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 )) #endif +#define D3DSI_INSTLENGTH_SHIFT 24 + +#define D3DSP_REGTYPE_SHIFT 28 +#define D3DSP_REGTYPE_SHIFT2 8 +#define D3DSP_REGTYPE_MASK (0x7 << D3DSP_REGTYPE_SHIFT) +#define D3DSP_REGTYPE_MASK2 0x00001800 + +#define D3DSP_WRITEMASK_0 0x00010000 +#define D3DSP_WRITEMASK_1 0x00020000 +#define D3DSP_WRITEMASK_2 0x00040000 +#define D3DSP_WRITEMASK_3 0x00080000 +#define D3DSP_WRITEMASK_ALL 0x000f0000 + #define D3DPS_VERSION(major, minor) (0xffff0000 | ((major) << 8) | (minor)) #define D3DVS_VERSION(major, minor) (0xfffe0000 | ((major) << 8) | (minor)) @@ -123,5 +136,33 @@ typedef enum _D3DSHADER_INSTRUCTION_OPCODE_TYPE D3DSIO_FORCE_DWORD = 0x7fffffff, } D3DSHADER_INSTRUCTION_OPCODE_TYPE; +typedef enum _D3DSHADER_PARAM_REGISTER_TYPE +{ + D3DSPR_TEMP = 0x00, + D3DSPR_INPUT = 0x01, + D3DSPR_CONST = 0x02, + D3DSPR_ADDR = 0x03, + D3DSPR_TEXTURE = 0x03, + D3DSPR_RASTOUT = 0x04, + D3DSPR_ATTROUT = 0x05, + D3DSPR_TEXCRDOUT = 0x06, + D3DSPR_OUTPUT = 0x06, + D3DSPR_CONSTINT = 0x07, + D3DSPR_COLOROUT = 0x08, + D3DSPR_DEPTHOUT = 0x09, + D3DSPR_SAMPLER = 0x0a, + D3DSPR_CONST2 = 0x0b, + D3DSPR_CONST3 = 0x0c, + D3DSPR_CONST4 = 0x0d, + D3DSPR_CONSTBOOL = 0x0e, + D3DSPR_LOOP = 0x0f, + D3DSPR_TEMPFLOAT16 = 0x10, + D3DSPR_MISCTYPE = 0x11, + D3DSPR_LABEL = 0x12, + D3DSPR_PREDICATE = 0x13, + + D3DSPR_FORCE_DWORD = 0x7fffffff, +} D3DSHADER_PARAM_REGISTER_TYPE; + #endif /* _d3d9TYPES_H_ */ #endif /* __VKD3D_D3D9TYPES_H */ diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 0c755f4..d65c25e 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -407,6 +407,11 @@ struct hlsl_profile_info bool software; }; +struct hlsl_vec4 +{ + float f[4]; +}; + struct hlsl_ctx { const struct hlsl_profile_info *profile; @@ -440,6 +445,12 @@ struct hlsl_ctx } builtin_types; struct list static_initializers; + + struct hlsl_constant_defs + { + struct hlsl_vec4 *values; + size_t count, size; + } constant_defs; }; enum hlsl_error_level diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 0fd1f6b..b3e59bc 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -804,8 +804,9 @@ static void allocate_temp_registers_recurse(struct list *instrs, struct liveness } } -static void allocate_const_registers_recurse(struct list *instrs, struct liveness *liveness) +static void allocate_const_registers_recurse(struct hlsl_ctx *ctx, struct list *instrs, struct liveness *liveness) { + struct hlsl_constant_defs *defs = &ctx->constant_defs; struct hlsl_ir_node *instr; LIST_FOR_EACH_ENTRY(instr, instrs, struct hlsl_ir_node, entry) @@ -815,28 +816,84 @@ static void allocate_const_registers_recurse(struct list *instrs, struct livenes case HLSL_IR_CONSTANT: { struct hlsl_ir_constant *constant = hlsl_ir_constant(instr); + const struct hlsl_type *type = instr->data_type; + unsigned int reg_size = type->reg_size; + unsigned int x, y, i, writemask; - if (instr->data_type->reg_size > 1) - constant->reg = allocate_range(liveness, 1, UINT_MAX, instr->data_type->reg_size); + if (reg_size > 1) + constant->reg = allocate_range(liveness, 1, UINT_MAX, reg_size); else - constant->reg = allocate_register(liveness, 1, UINT_MAX, instr->data_type->dimx); - TRACE("Allocated constant @%u to %s.\n", instr->index, - debug_register('c', constant->reg, instr->data_type)); + constant->reg = allocate_register(liveness, 1, UINT_MAX, type->dimx); + TRACE("Allocated constant @%u to %s.\n", instr->index, debug_register('c', constant->reg, type)); + + if (!vkd3d_array_reserve((void **)&defs->values, &defs->size, + constant->reg.id + reg_size, sizeof(*defs->values))) + { + ctx->failed = true; + return; + } + defs->count = max(defs->count, constant->reg.id + reg_size); + + assert(type->type <= HLSL_CLASS_LAST_NUMERIC); + + if (!(writemask = constant->reg.writemask)) + writemask = (1u << type->dimx) - 1; + + for (y = 0; y < type->dimy; ++y) + { + for (x = 0, i = 0; x < 4; ++x) + { + float f; + + if (!(writemask & (1u << x))) + continue; + + switch (type->base_type) + { + case HLSL_TYPE_BOOL: + f = constant->value.b[i++]; + break; + + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + f = constant->value.f[i++]; + break; + + case HLSL_TYPE_INT: + f = constant->value.i[i++]; + break; + + case HLSL_TYPE_UINT: + f = constant->value.u[i++]; + break; + + case HLSL_TYPE_DOUBLE: + FIXME("Double constant.\n"); + return; + + default: + assert(0); + return; + } + defs->values[constant->reg.id + y].f[x] = f; + } + } + break; } case HLSL_IR_IF: { struct hlsl_ir_if *iff = hlsl_ir_if(instr); - allocate_const_registers_recurse(&iff->then_instrs, liveness); - allocate_const_registers_recurse(&iff->else_instrs, liveness); + allocate_const_registers_recurse(ctx, &iff->then_instrs, liveness); + allocate_const_registers_recurse(ctx, &iff->else_instrs, liveness); break; } case HLSL_IR_LOOP: { struct hlsl_ir_loop *loop = hlsl_ir_loop(instr); - allocate_const_registers_recurse(&loop->body, liveness); + allocate_const_registers_recurse(ctx, &loop->body, liveness); break; } @@ -851,6 +908,8 @@ static void allocate_const_registers(struct hlsl_ctx *ctx, struct hlsl_ir_functi struct liveness liveness = {0}; struct hlsl_ir_var *var; + allocate_const_registers_recurse(ctx, entry_func->body, &liveness); + LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { if (var->is_uniform && var->last_read) @@ -865,8 +924,6 @@ static void allocate_const_registers(struct hlsl_ctx *ctx, struct hlsl_ir_functi TRACE("Allocated %s to %s.\n", var->name, debug_register('c', var->reg, var->data_type)); } } - - allocate_const_registers_recurse(entry_func->body, &liveness); } /* Simple greedy temporary register allocation pass that just assigns a unique @@ -904,6 +961,18 @@ static unsigned int put_dword(struct bytecode_buffer *buffer, uint32_t value) return index; } +/* Returns the token index. */ +static unsigned int put_float(struct bytecode_buffer *buffer, float value) +{ + union + { + float f; + uint32_t u; + } u; + u.f = value; + return put_dword(buffer, u.u); +} + static void set_dword(struct bytecode_buffer *buffer, unsigned int index, uint32_t value) { if (buffer->status) @@ -1186,6 +1255,34 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct bytecode_buffer *buf set_dword(buffer, size_offset, D3DSIO_COMMENT | ((buffer->count - (ctab_start - 1)) << 16)); } +static uint32_t sm1_encode_register_type(D3DSHADER_PARAM_REGISTER_TYPE type) +{ + return ((type << D3DSP_REGTYPE_SHIFT) & D3DSP_REGTYPE_MASK) + | ((type << D3DSP_REGTYPE_SHIFT2) & D3DSP_REGTYPE_MASK2); +} + +static void write_sm1_constant_defs(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer) +{ + unsigned int i, x; + + for (i = 0; i < ctx->constant_defs.count; ++i) + { + uint32_t token = D3DSIO_DEF; + + if (ctx->profile->major_version > 1) + token |= 5 << D3DSI_INSTLENGTH_SHIFT; + put_dword(buffer, token); + + token = (1u << 31); + token |= sm1_encode_register_type(D3DSPR_CONST); + token |= D3DSP_WRITEMASK_ALL; + token |= i; + put_dword(buffer, token); + for (x = 0; x < 4; ++x) + put_float(buffer, ctx->constant_defs.values[i].f[x]); + } +} + static int write_sm1_shader(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out) { @@ -1196,6 +1293,8 @@ static int write_sm1_shader(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl * write_sm1_uniforms(ctx, &buffer, entry_func); + write_sm1_constant_defs(ctx, &buffer); + put_dword(&buffer, D3DSIO_END); if (!(ret = buffer.status))

1 0

Zebediah Figura : vkd3d-shader: Return the current buffer offset from put_dword() and put_string().
by Alexandre Julliard May 10, 2021

May 10, 2021

Module: vkd3d Branch: master Commit: d0ab65c7a193608d59cd0daa2d7f0059b10d8038 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d0ab65c7a193608d59cd0da… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 27 12:14:16 2021 -0500 vkd3d-shader: Return the current buffer offset from put_dword() and put_string(). 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_codegen.c | 42 ++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 2c07171..0fd1f6b 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -886,17 +886,22 @@ struct bytecode_buffer int status; }; -static void put_dword(struct bytecode_buffer *buffer, uint32_t value) +/* Returns the token index. */ +static unsigned int put_dword(struct bytecode_buffer *buffer, uint32_t value) { + unsigned int index = buffer->count; + if (buffer->status) - return; + return index; if (!vkd3d_array_reserve((void **)&buffer->data, &buffer->size, buffer->count + 1, sizeof(*buffer->data))) { buffer->status = VKD3D_ERROR_OUT_OF_MEMORY; - return; + return index; } buffer->data[buffer->count++] = value; + + return index; } static void set_dword(struct bytecode_buffer *buffer, unsigned int index, uint32_t value) @@ -908,23 +913,26 @@ static void set_dword(struct bytecode_buffer *buffer, unsigned int index, uint32 buffer->data[index] = value; } -static void put_string(struct bytecode_buffer *buffer, const char *str) +/* Returns the token index. */ +static unsigned int put_string(struct bytecode_buffer *buffer, const char *str) { + unsigned int index = buffer->count; size_t len = strlen(str) + 1; unsigned int token_count = (len + 3) / sizeof(*buffer->data); if (buffer->status) - return; + return index; if (!vkd3d_array_reserve((void **)&buffer->data, &buffer->size, buffer->count + token_count, sizeof(*buffer->data))) { buffer->status = E_OUTOFMEMORY; - return; + return index; } buffer->data[buffer->count + token_count - 1] = 0xabababab; memcpy(buffer->data + buffer->count, str, len); buffer->count += token_count; + return index; } static uint32_t sm1_version(enum vkd3d_shader_type type, unsigned int major, unsigned int minor) @@ -1051,8 +1059,7 @@ static void write_sm1_type(struct bytecode_buffer *buffer, struct hlsl_type *typ { LIST_FOR_EACH_ENTRY(field, array_type->e.elements, struct hlsl_struct_field, entry) { - field->name_bytecode_offset = buffer->count; - put_string(buffer, field->name); + field->name_bytecode_offset = put_string(buffer, field->name); write_sm1_type(buffer, field->type, ctab_start); } @@ -1066,8 +1073,7 @@ static void write_sm1_type(struct bytecode_buffer *buffer, struct hlsl_type *typ } } - type->bytecode_offset = buffer->count; - put_dword(buffer, sm1_class(type) | (sm1_base_type(type) << 16)); + type->bytecode_offset = put_dword(buffer, sm1_class(type) | (sm1_base_type(type) << 16)); put_dword(buffer, type->dimy | (type->dimx << 16)); put_dword(buffer, array_size | (field_count << 16)); put_dword(buffer, fields_offset); @@ -1104,7 +1110,7 @@ static void sm1_sort_externs(struct hlsl_ctx *ctx) static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, struct hlsl_ir_function_decl *entry_func) { - unsigned int ctab_start, vars_start; + unsigned int ctab_start, vars_start, size_offset, creator_offset, offset; unsigned int uniform_count = 0; struct hlsl_ir_var *var; @@ -1133,13 +1139,11 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct bytecode_buffer *buf sm1_sort_externs(ctx); - put_dword(buffer, 0); /* COMMENT tag + size */ + size_offset = put_dword(buffer, 0); put_dword(buffer, MAKEFOURCC('C','T','A','B')); - ctab_start = buffer->count; - - put_dword(buffer, sizeof(D3DXSHADER_CONSTANTTABLE)); /* size of this header */ - put_dword(buffer, 0); /* creator */ + ctab_start = put_dword(buffer, sizeof(D3DXSHADER_CONSTANTTABLE)); + creator_offset = put_dword(buffer, 0); put_dword(buffer, sm1_version(ctx->profile->type, ctx->profile->major_version, ctx->profile->minor_version)); put_dword(buffer, uniform_count); put_dword(buffer, sizeof(D3DXSHADER_CONSTANTTABLE)); /* offset of constants */ @@ -1176,10 +1180,10 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct bytecode_buffer *buf } } - set_dword(buffer, ctab_start + 1, (buffer->count - ctab_start) * sizeof(*buffer->data)); - put_string(buffer, vkd3d_shader_get_version(NULL, NULL)); + offset = put_string(buffer, vkd3d_shader_get_version(NULL, NULL)); + set_dword(buffer, creator_offset, (offset - ctab_start) * sizeof(*buffer->data)); - set_dword(buffer, ctab_start - 2, D3DSIO_COMMENT | ((buffer->count - (ctab_start - 1)) << 16)); + set_dword(buffer, size_offset, D3DSIO_COMMENT | ((buffer->count - (ctab_start - 1)) << 16)); } static int write_sm1_shader(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func,

1 0

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

May 10, 2021

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