May 2023 - Wine-commits - list.winehq.org

Torge Matthies : ntdll: Handle hidden file names inside get_file_info instead of after it.
by Alexandre Julliard 02 May '23

02 May '23

Module: wine Branch: master Commit: a8b6966a91453f5c6147dc2c74a337d016bbd53a URL: https://gitlab.winehq.org/wine/wine/-/commit/a8b6966a91453f5c6147dc2c74a337… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Wed Apr 12 13:35:10 2023 +0200 ntdll: Handle hidden file names inside get_file_info instead of after it. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/ntdll/unix/file.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index eca75b2d4fb..94df1d4c9c9 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1292,18 +1292,22 @@ static BOOLEAN get_dir_case_sensitivity( const char *dir ) /*********************************************************************** * is_hidden_file * - * Check if the specified file should be hidden based on its name and the show dot files option. + * Check if the specified file should be hidden based on its unix path and the show dot files option. */ -static BOOL is_hidden_file( const UNICODE_STRING *name ) +static BOOL is_hidden_file( const char *name ) { - WCHAR *p, *end; + const char *p; if (show_dot_files) return FALSE; - end = p = name->Buffer + name->Length/sizeof(WCHAR); - while (p > name->Buffer && p[-1] == '\\') p--; - while (p > name->Buffer && p[-1] != '\\') p--; - return (p < end && *p == '.'); + p = name + strlen( name ); + while (p > name && p[-1] == '/') p--; + while (p > name && p[-1] != '/') p--; + if (*p++ != '.') return FALSE; + if (!*p || *p == '/') return FALSE; /* "." directory */ + if (*p++ != '.') return FALSE; + if (!*p || *p == '/') return FALSE; /* ".." directory */ + return TRUE; } @@ -1677,6 +1681,9 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr ) } *attr |= get_file_attributes( st ); + if (is_hidden_file( path )) + *attr |= FILE_ATTRIBUTE_HIDDEN; + attr_len = xattr_get( path, SAMBA_XATTR_DOS_ATTRIB, attr_data, sizeof(attr_data)-1 ); if (attr_len != -1) *attr |= parse_samba_dos_attrib_data( attr_data, attr_len ); @@ -2252,11 +2259,6 @@ static NTSTATUS get_dir_data_entry( struct dir_data *dir_data, void *info_ptr, I if (class != FileNamesInformation) { if (st.st_dev != dir_data->id.dev) st.st_ino = 0; /* ignore inode if on a different device */ - - if (!show_dot_files && names->long_name[0] == '.' && names->long_name[1] && - (names->long_name[1] != '.' || names->long_name[2])) - attributes |= FILE_ATTRIBUTE_HIDDEN; - fill_file_info( &st, attributes, info, class ); } @@ -4218,7 +4220,6 @@ NTSTATUS WINAPI NtQueryFullAttributesFile( const OBJECT_ATTRIBUTES *attr, info->AllocationSize = std.AllocationSize; info->EndOfFile = std.EndOfFile; info->FileAttributes = basic.FileAttributes; - if (is_hidden_file( attr->ObjectName )) info->FileAttributes |= FILE_ATTRIBUTE_HIDDEN; } free( unix_name ); } @@ -4249,10 +4250,7 @@ NTSTATUS WINAPI NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC else if (!S_ISREG(st.st_mode) && !S_ISDIR(st.st_mode)) status = STATUS_INVALID_INFO_CLASS; else - { status = fill_file_info( &st, attributes, info, FileBasicInformation ); - if (is_hidden_file( attr->ObjectName )) info->FileAttributes |= FILE_ATTRIBUTE_HIDDEN; - } free( unix_name ); } else WARN( "%s not found (%x)\n", debugstr_us(attr->ObjectName), status );

1 0

Torge Matthies : ntdll: Only infer hidden attribute from file name if xattr is not present.
by Alexandre Julliard 02 May '23

02 May '23

Module: wine Branch: master Commit: d433986924c142ab807363b0146160b2b6986a42 URL: https://gitlab.winehq.org/wine/wine/-/commit/d433986924c142ab807363b0146160… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Wed Apr 12 13:35:10 2023 +0200 ntdll: Only infer hidden attribute from file name if xattr is not present. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/ntdll/tests/file.c | 2 +- dlls/ntdll/unix/file.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index beaa4734931..cdd924a7226 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4107,7 +4107,7 @@ static void test_dotfile_file_attributes(void) status = nt_get_file_attrs(filename, &attrs); ok( status == STATUS_SUCCESS, "got %#lx\n", status ); ok( attrs & FILE_ATTRIBUTE_SYSTEM, "got attributes %#lx\n", attrs ); - todo_wine ok( !(attrs & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", attrs ); + ok( !(attrs & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", attrs ); status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileBasicInformation ); ok( status == STATUS_SUCCESS, "got %#lx\n", status ); diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 94df1d4c9c9..cb269a0e126 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1681,14 +1681,13 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr ) } *attr |= get_file_attributes( st ); - if (is_hidden_file( path )) - *attr |= FILE_ATTRIBUTE_HIDDEN; - attr_len = xattr_get( path, SAMBA_XATTR_DOS_ATTRIB, attr_data, sizeof(attr_data)-1 ); if (attr_len != -1) *attr |= parse_samba_dos_attrib_data( attr_data, attr_len ); else { + if (is_hidden_file( path )) + *attr |= FILE_ATTRIBUTE_HIDDEN; if (errno == ENOTSUP) return ret; #ifdef ENODATA if (errno == ENODATA) return ret;

1 0

Torge Matthies : ntdll: Set xattr in NtCreateFile if inferred and requested attributes don't match.
by Alexandre Julliard 02 May '23

02 May '23

Module: wine Branch: master Commit: 824547805559ee4993b8113436161638f3cd7990 URL: https://gitlab.winehq.org/wine/wine/-/commit/824547805559ee4993b81134361616… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Wed Apr 12 13:35:10 2023 +0200 ntdll: Set xattr in NtCreateFile if inferred and requested attributes don't match. And make sure it doesn't get deleted. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53826 Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/ntdll/tests/file.c | 2 +- dlls/ntdll/unix/file.c | 28 ++++++++++++++++++++-------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index cdd924a7226..b96b2e5b072 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4094,7 +4094,7 @@ static void test_dotfile_file_attributes(void) status = nt_get_file_attrs(filename, &attrs); ok( status == STATUS_SUCCESS, "got %#lx\n", status ); - todo_wine ok( !(attrs & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", attrs ); + ok( !(attrs & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", attrs ); status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileBasicInformation ); ok( status == STATUS_SUCCESS, "got %#lx\n", status ); diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index cb269a0e126..0263d53716b 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1604,11 +1604,11 @@ static int fd_get_file_info( int fd, unsigned int options, struct stat *st, ULON } -static int fd_set_dos_attrib( int fd, UINT attr ) +static int fd_set_dos_attrib( int fd, UINT attr, BOOL force_set ) { /* we only store the HIDDEN and SYSTEM attributes */ attr &= XATTR_ATTRIBS_MASK; - if (attr != 0) + if (force_set || attr != 0) { /* encode the attributes in Samba 3 ASCII format. Samba 4 has extended * this format with more features, but retains compatibility with the @@ -1622,7 +1622,7 @@ static int fd_set_dos_attrib( int fd, UINT attr ) /* set the stat info and file attributes for a file (by file descriptor) */ -static NTSTATUS fd_set_file_info( int fd, UINT attr ) +static NTSTATUS fd_set_file_info( int fd, UINT attr, BOOL force_set_xattr ) { struct stat st; @@ -1641,7 +1641,11 @@ static NTSTATUS fd_set_file_info( int fd, UINT attr ) } if (fchmod( fd, st.st_mode ) == -1) return errno_to_status( errno ); - if (fd_set_dos_attrib( fd, attr ) == -1 && errno != ENOTSUP) + /* if the file has multiple names, we can't be sure that it is safe to not + set the extended attribute, since any of the names could start with a dot */ + force_set_xattr = force_set_xattr || st.st_nlink > 1; + + if (fd_set_dos_attrib( fd, attr, force_set_xattr ) == -1 && errno != ENOTSUP) WARN( "Failed to set extended attribute " SAMBA_XATTR_DOS_ATTRIB ". errno %d (%s)\n", errno, strerror( errno ) ); @@ -3967,6 +3971,7 @@ NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU OBJECT_ATTRIBUTES new_attr; UNICODE_STRING nt_name; char *unix_name; + BOOL name_hidden = FALSE; BOOL created = FALSE; unsigned int status; @@ -4009,6 +4014,7 @@ NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU if (status == STATUS_SUCCESS) { + name_hidden = is_hidden_file( unix_name ); status = open_unix_file( handle, unix_name, access, &new_attr, attributes, sharing, disposition, options, ea_buffer, ea_length ); free( unix_name ); @@ -4036,14 +4042,15 @@ NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU break; } - if (io->Information == FILE_CREATED && (attributes & XATTR_ATTRIBS_MASK)) + if (io->Information == FILE_CREATED && + ((attributes & XATTR_ATTRIBS_MASK) || name_hidden)) { int fd, needs_close; /* set any DOS extended attributes */ if (!server_get_unix_fd( *handle, 0, &fd, &needs_close, NULL, NULL )) { - if (fd_set_dos_attrib( fd, attributes ) == -1 && errno != ENOTSUP) + if (fd_set_dos_attrib( fd, attributes, TRUE ) == -1 && errno != ENOTSUP) WARN( "Failed to set extended attribute " SAMBA_XATTR_DOS_ATTRIB ". errno %d (%s)", errno, strerror( errno ) ); if (needs_close) close( fd ); @@ -4565,20 +4572,25 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, { const FILE_BASIC_INFORMATION *info = ptr; LARGE_INTEGER mtime, atime; + char *unix_name; if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) return io->u.Status = status; + if (server_get_unix_name( handle, &unix_name )) unix_name = NULL; + mtime.QuadPart = info->LastWriteTime.QuadPart == -1 ? 0 : info->LastWriteTime.QuadPart; atime.QuadPart = info->LastAccessTime.QuadPart == -1 ? 0 : info->LastAccessTime.QuadPart; if (atime.QuadPart || mtime.QuadPart) status = set_file_times( fd, &mtime, &atime ); - if (status == STATUS_SUCCESS && info->FileAttributes) - status = fd_set_file_info( fd, info->FileAttributes ); + if (status == STATUS_SUCCESS) + status = fd_set_file_info( fd, info->FileAttributes, + unix_name && is_hidden_file( unix_name )); if (needs_close) close( fd ); + free( unix_name ); } else status = STATUS_INVALID_PARAMETER_3; break;

1 0

Henri Verbeet : vkd3d-shader: Get rid of the unused vkd3d_shader_src_param_entry structure.
by Alexandre Julliard 02 May '23

02 May '23

Module: vkd3d Branch: master Commit: 73dc62aebf5b907f389f383e2178b4270ff461b9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/73dc62aebf5b907f389f383e2178b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 20 12:30:22 2023 +0200 vkd3d-shader: Get rid of the unused vkd3d_shader_src_param_entry structure. --- libs/vkd3d-shader/dxbc.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index e5bc67d9..983bee8e 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -89,12 +89,6 @@ int dxbc_writer_write(struct dxbc_writer *dxbc, struct vkd3d_shader_code *out) return vkd3d_shader_serialize_dxbc(dxbc->section_count, dxbc->sections, out, NULL); } -struct vkd3d_shader_src_param_entry -{ - struct list entry; - struct vkd3d_shader_src_param param; -}; - static bool require_space(size_t offset, size_t count, size_t size, size_t data_size) { return !count || (data_size - offset) / count >= size;

1 0

Henri Verbeet : Release 1.7.
by Alexandre Julliard 02 May '23

02 May '23

Module: vkd3d Branch: vkd3d-1.7.x Commit: 57d92a15cf93d9448f2deb91a8614f9c4c085216 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/57d92a15cf93d9448f2deb91a8614… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 14 17:29:04 2023 +0100 Release 1.7. --- ANNOUNCE | 76 +++++++++++++++++++++---------------- AUTHORS | 1 + COPYING | 2 +- Makefile.am | 6 +-- configure.ac | 2 +- demos/demo_xcb.h | 2 +- include/vkd3d.h | 1 + include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-utils/vkd3d_utils_main.c | 4 +- libs/vkd3d/state.c | 4 +- programs/vkd3d-compiler/main.c | 2 +- 12 files changed, 58 insertions(+), 45 deletions(-)

1 0

Zebediah Figura : tests: Test bool semantics.
by Alexandre Julliard 01 May '23

01 May '23

Module: vkd3d Branch: master Commit: 3cce4e70e90e63b162655f79e6be94b2d3d7eefc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3cce4e70e90e63b162655f79e6be9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 20 19:46:27 2023 -0500 tests: Test bool semantics. --- Makefile.am | 1 + tests/bool-semantics.shader_test | 53 ++++++++++++++++++++++++++++++++++++++++ tests/shader_runner.c | 6 +++-- 3 files changed, 58 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index b9fd06ee..b689d12e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,6 +53,7 @@ vkd3d_shader_tests = \ tests/array-parameters.shader_test \ tests/asuint.shader_test \ tests/bitwise.shader_test \ + tests/bool-semantics.shader_test \ tests/cast-broadcast.shader_test \ tests/cast-componentwise-compatible.shader_test \ tests/cast-componentwise-equal.shader_test \ diff --git a/tests/bool-semantics.shader_test b/tests/bool-semantics.shader_test new file mode 100644 index 00000000..0e42fdf9 --- /dev/null +++ b/tests/bool-semantics.shader_test @@ -0,0 +1,53 @@ +[require] +shader model >= 4.0 + +[input layout] +0 r32g32b32a32 uint apple +0 r32g32 int sv_position + +[vertex buffer 0] +format r32 uint +0 1 0x80000000 0xffffffff -2 -2 +0 1 0x80000000 0xffffffff -2 2 +0 1 0x80000000 0xffffffff 2 -2 +0 1 0x80000000 0xffffffff 2 2 + +[vertex shader] + +struct input +{ + bool4 apple : apple; + int4 pos : sv_position; +}; + +struct output +{ + bool4 apple : apple; + int4 fapple : apple1; + float4 pos : sv_position; +}; + +void main(in struct input i, out struct output o, uint id : SV_VertexID) +{ + o.apple = i.apple; + o.fapple = i.apple; + o.pos = i.pos; +} + +[pixel shader] + +struct input +{ + bool4 apple : apple; + int4 fapple : apple1; + float4 pos : sv_position; +}; + +float4 main(struct input i) : sv_target +{ + return i.apple + i.fapple; +} + +[test] +draw triangle strip 4 +todo probe all rgba (0.0, 2.0, 2.0, 2.0) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index f1d93457..8c66ff5e 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -152,7 +152,9 @@ static DXGI_FORMAT parse_format(const char *line, enum texture_data_type *data_t formats[] = { {"r32g32b32a32 float", TEXTURE_DATA_FLOAT, 16, DXGI_FORMAT_R32G32B32A32_FLOAT}, + {"r32g32b32a32 uint", TEXTURE_DATA_UINT, 16, DXGI_FORMAT_R32G32B32A32_UINT}, {"r32g32 float", TEXTURE_DATA_FLOAT, 8, DXGI_FORMAT_R32G32_FLOAT}, + {"r32g32 int", TEXTURE_DATA_SINT, 8, DXGI_FORMAT_R32G32_SINT}, {"r32g32 uint", TEXTURE_DATA_UINT, 8, DXGI_FORMAT_R32G32_UINT}, {"r32 float", TEXTURE_DATA_FLOAT, 4, DXGI_FORMAT_R32_FLOAT}, {"r32 sint", TEXTURE_DATA_SINT, 4, DXGI_FORMAT_R32_SINT}, @@ -270,11 +272,11 @@ static void parse_resource_directive(struct resource_params *resource, const cha break; case TEXTURE_DATA_SINT: - u.i = strtol(line, &rest, 10); + u.i = strtol(line, &rest, 0); break; case TEXTURE_DATA_UINT: - u.u = strtoul(line, &rest, 10); + u.u = strtoul(line, &rest, 0); break; }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Put the hlsl_ir_constant value in a structure.
by Alexandre Julliard 01 May '23

01 May '23

Module: vkd3d Branch: master Commit: 0a44e6043e6a66dc6a54dd08892e5254435c8134 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0a44e6043e6a66dc6a54dd08892e5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 11 18:39:55 2022 -0600 vkd3d-shader/hlsl: Put the hlsl_ir_constant value in a structure. --- libs/vkd3d-shader/hlsl.c | 16 ++--- libs/vkd3d-shader/hlsl.h | 15 ++-- libs/vkd3d-shader/hlsl.y | 10 +-- libs/vkd3d-shader/hlsl_codegen.c | 37 +++++----- libs/vkd3d-shader/hlsl_constant_ops.c | 124 +++++++++++++++++----------------- libs/vkd3d-shader/tpf.c | 10 +-- 6 files changed, 106 insertions(+), 106 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Introduce an sm4_src_from_constant_value() helper.
by Alexandre Julliard 01 May '23

01 May '23

Module: vkd3d Branch: master Commit: 834497d5acf48425d89aabf3a64c8971c8aa2918 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/834497d5acf48425d89aabf3a64c8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 14 15:50:53 2023 -0500 vkd3d-shader/hlsl: Introduce an sm4_src_from_constant_value() helper. --- libs/vkd3d-shader/tpf.c | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index e45bab6c..1889ee76 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3199,6 +3199,29 @@ static void sm4_src_from_node(struct sm4_src_register *src, src->swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), map_writemask); } +static void sm4_src_from_constant_value(struct sm4_src_register *src, + const struct hlsl_constant_value *value, unsigned int width, unsigned int map_writemask) +{ + src->swizzle_type = VKD3D_SM4_SWIZZLE_NONE; + src->reg.type = VKD3D_SM4_RT_IMMCONST; + if (width == 1) + { + src->reg.dim = VKD3D_SM4_DIMENSION_SCALAR; + src->reg.immconst_uint[0] = value->u[0].u; + } + else + { + unsigned int i, j = 0; + + src->reg.dim = VKD3D_SM4_DIMENSION_VEC4; + for (i = 0; i < 4; ++i) + { + if (map_writemask & (1u << i)) + src->reg.immconst_uint[i] = value->u[j++].u; + } + } +} + static uint32_t sm4_encode_register(const struct sm4_register *reg) { return (reg->type << VKD3D_SM4_REGISTER_TYPE_SHIFT) @@ -3609,7 +3632,6 @@ static void write_sm4_constant(struct hlsl_ctx *ctx, { const unsigned int dimx = constant->node.data_type->dimx; struct sm4_instruction instr; - struct sm4_register *reg = &instr.srcs[0].reg; memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_MOV; @@ -3617,24 +3639,7 @@ static void write_sm4_constant(struct hlsl_ctx *ctx, sm4_dst_from_node(&instr.dsts[0], &constant->node); instr.dst_count = 1; - instr.srcs[0].swizzle_type = VKD3D_SM4_SWIZZLE_NONE; - reg->type = VKD3D_SM4_RT_IMMCONST; - if (dimx == 1) - { - reg->dim = VKD3D_SM4_DIMENSION_SCALAR; - reg->immconst_uint[0] = constant->value.u[0].u; - } - else - { - unsigned int i, j = 0; - - reg->dim = VKD3D_SM4_DIMENSION_VEC4; - for (i = 0; i < 4; ++i) - { - if (instr.dsts[0].writemask & (1u << i)) - reg->immconst_uint[i] = constant->value.u[j++].u; - } - } + sm4_src_from_constant_value(&instr.srcs[0], &constant->value, dimx, instr.dsts[0].writemask); instr.src_count = 1, write_sm4_instruction(buffer, &instr);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Normalize bools when loading from uniforms or vertex input.
by Alexandre Julliard 01 May '23

01 May '23

Module: vkd3d Branch: master Commit: 6e677def71960c3e0c691b4c48a32e466bb8508c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6e677def71960c3e0c691b4c48a32… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 14 15:51:21 2023 -0500 vkd3d-shader/hlsl: Normalize bools when loading from uniforms or vertex input. --- libs/vkd3d-shader/tpf.c | 40 +++++++++++++++++++++++++++++++++++++--- tests/bool-semantics.shader_test | 2 +- tests/cast-to-int.shader_test | 2 +- tests/cast-to-uint.shader_test | 2 +- tests/hlsl-bool-cast.shader_test | 2 +- 5 files changed, 41 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 1889ee76..38d5c180 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -4382,19 +4382,53 @@ static void write_sm4_jump(struct hlsl_ctx *ctx, write_sm4_instruction(buffer, &instr); } +/* Does this variable's data come directly from the API user, rather than being + * temporary or from a previous shader stage? + * I.e. is it a uniform or VS input? */ +static bool var_is_user_input(struct hlsl_ctx *ctx, const struct hlsl_ir_var *var) +{ + if (var->is_uniform) + return true; + + return var->is_input_semantic && ctx->profile->type == VKD3D_SHADER_TYPE_VERTEX; +} + static void write_sm4_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_load *load) { + const struct hlsl_type *type = load->node.data_type; struct sm4_instruction instr; memset(&instr, 0, sizeof(instr)); - instr.opcode = VKD3D_SM4_OP_MOV; sm4_dst_from_node(&instr.dsts[0], &load->node); instr.dst_count = 1; - sm4_src_from_deref(ctx, &instr.srcs[0], &load->src, load->node.data_type, instr.dsts[0].writemask); - instr.src_count = 1; + assert(type->class <= HLSL_CLASS_LAST_NUMERIC); + if (type->base_type == HLSL_TYPE_BOOL && var_is_user_input(ctx, load->src.var)) + { + struct hlsl_constant_value value; + + /* Uniform bools can be specified as anything, but internal bools always + * have 0 for false and ~0 for true. Normalize that here. */ + + instr.opcode = VKD3D_SM4_OP_MOVC; + + sm4_src_from_deref(ctx, &instr.srcs[0], &load->src, type, instr.dsts[0].writemask); + + memset(&value, 0xff, sizeof(value)); + sm4_src_from_constant_value(&instr.srcs[1], &value, type->dimx, instr.dsts[0].writemask); + memset(&value, 0, sizeof(value)); + sm4_src_from_constant_value(&instr.srcs[2], &value, type->dimx, instr.dsts[0].writemask); + instr.src_count = 3; + } + else + { + instr.opcode = VKD3D_SM4_OP_MOV; + + sm4_src_from_deref(ctx, &instr.srcs[0], &load->src, type, instr.dsts[0].writemask); + instr.src_count = 1; + } write_sm4_instruction(buffer, &instr); } diff --git a/tests/bool-semantics.shader_test b/tests/bool-semantics.shader_test index 0e42fdf9..bcbd9f9b 100644 --- a/tests/bool-semantics.shader_test +++ b/tests/bool-semantics.shader_test @@ -50,4 +50,4 @@ float4 main(struct input i) : sv_target [test] draw triangle strip 4 -todo probe all rgba (0.0, 2.0, 2.0, 2.0) +probe all rgba (0.0, 2.0, 2.0, 2.0) diff --git a/tests/cast-to-int.shader_test b/tests/cast-to-int.shader_test index 4c5d0e2f..fe8c79a3 100644 --- a/tests/cast-to-int.shader_test +++ b/tests/cast-to-int.shader_test @@ -20,7 +20,7 @@ uniform 1 int -2 uniform 2 int -2 uniform 3 float -3.6 draw quad -todo probe all rgba (0.5, 0.5, 0.5, 0.5) +probe all rgba (0.5, 0.5, 0.5, 0.5) [pixel shader] diff --git a/tests/cast-to-uint.shader_test b/tests/cast-to-uint.shader_test index 66f7267e..4ffc041a 100644 --- a/tests/cast-to-uint.shader_test +++ b/tests/cast-to-uint.shader_test @@ -20,7 +20,7 @@ uniform 1 int 2 uniform 2 int -2 uniform 3 float -3.6 draw quad -todo probe all rgba (0.5, 0.5, 0.5, 0.5) +probe all rgba (0.5, 0.5, 0.5, 0.5) [pixel shader] diff --git a/tests/hlsl-bool-cast.shader_test b/tests/hlsl-bool-cast.shader_test index b0913bb8..09ca12e2 100644 --- a/tests/hlsl-bool-cast.shader_test +++ b/tests/hlsl-bool-cast.shader_test @@ -45,4 +45,4 @@ float4 main() : sv_target [test] uniform 0 uint4 0x00000001 0x00000002 0x80000000 0x00000000 draw quad -todo probe all rgba (2.0, 2.0, 2.0, 0.0) +probe all rgba (2.0, 2.0, 2.0, 0.0)

1 0

Ethan Lee : tests: Add tests for sign() intrinsic.
by Alexandre Julliard 01 May '23

01 May '23

Module: vkd3d Branch: master Commit: 109f7094bc75e7b6ec7ee5be86997008df2bd6bf URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/109f7094bc75e7b6ec7ee5be86997… Author: Ethan Lee <flibitijibibo(a)gmail.com> Date: Fri Apr 21 16:14:46 2023 -0400 tests: Add tests for sign() intrinsic. Signed-off-by: Ethan Lee <flibitijibibo(a)gmail.com> --- Makefile.am | 1 + tests/sign.shader_test | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) diff --git a/Makefile.am b/Makefile.am index b689d12e..e3d52ac5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -157,6 +157,7 @@ vkd3d_shader_tests = \ tests/saturate.shader_test \ tests/shader-interstage-interface.shader_test \ tests/side-effects.shader_test \ + tests/sign.shader_test \ tests/sqrt.shader_test \ tests/step.shader_test \ tests/swizzle-constant-prop.shader_test \ diff --git a/tests/sign.shader_test b/tests/sign.shader_test new file mode 100644 index 00000000..dc1a557f --- /dev/null +++ b/tests/sign.shader_test @@ -0,0 +1,91 @@ +[pixel shader notimpl] +uniform float f; + +float4 main() : sv_target +{ + return sign(f); +} + +[test] +uniform 0 float4 1.0 0.0 0.0 0.0 +todo draw quad +todo probe all rgba (1.0, 1.0, 1.0, 1.0) +uniform 0 float4 -1.0 0.0 0.0 0.0 +todo draw quad +todo probe all rgba (-1.0, -1.0, -1.0, -1.0) +uniform 0 float4 0.0 0.0 0.0 0.0 +todo draw quad +todo probe all rgba (0.0, 0.0, 0.0, 0.0) + +[pixel shader notimpl] +uniform float4 f; + +float4 main() : sv_target +{ + return sign(f); +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +todo draw quad +todo probe all rgba (1.0, 1.0, 1.0, 1.0) + +[pixel shader notimpl] +uniform float2x2 f; + +float4 main() : sv_target +{ + return sign(f); +} + +[test] +uniform 0 float4 1.0 2.0 0.0 0.0 +uniform 4 float4 3.0 4.0 0.0 0.0 +todo draw quad +todo probe all rgba (1.0, 1.0, 1.0, 1.0) + +[pixel shader notimpl] +uniform int f; + +float4 main() : sv_target +{ + return sign(f); +} + +[test] +uniform 0 int4 1 0 0 0 +todo draw quad +todo probe all rgba (1, 1, 1, 1) +uniform 0 int4 -1 0 0 0 +todo draw quad +todo probe all rgba (-1, -1, -1, -1) +uniform 0 int4 0 0 0 0 +todo draw quad +todo probe all rgba (0, 0, 0, 0) + +[pixel shader notimpl] +uniform int4 f; + +float4 main() : sv_target +{ + return sign(f); +} + +[test] +uniform 0 int4 1 2 3 4 +todo draw quad +todo probe all rgba (1, 1, 1, 1) + +[pixel shader notimpl] +uniform int2x2 f; + +float4 main() : sv_target +{ + return sign(f); +} + +[test] +uniform 0 int4 1 2 0 0 +uniform 4 int4 3 4 0 0 +todo draw quad +todo probe all rgba (1, 1, 1, 1)

1 0