wine-commits May 2023

wine-commits@winehq.org

1 participants
775 discussions

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: 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/tests: Add test for file attributes of files with names beginning with a dot.
by Alexandre Julliard 02 May '23

02 May '23

Module: wine Branch: master Commit: 4ad7575884797335430673c47113c9ed43e09fba URL: https://gitlab.winehq.org/wine/wine/-/commit/4ad7575884797335430673c47113c9… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Wed Apr 12 13:35:10 2023 +0200 ntdll/tests: Add test for file attributes of files with names beginning with a dot. --- dlls/ntdll/tests/file.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 6186afdfb63..beaa4734931 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4051,6 +4051,97 @@ static void test_file_attribute_tag_information(void) CloseHandle( h ); } +static void rename_file( HANDLE h, const WCHAR *filename ) +{ + FILE_RENAME_INFORMATION *fri; + UNICODE_STRING ntpath; + IO_STATUS_BLOCK io; + NTSTATUS status; + BOOLEAN ret; + ULONG size; + + ret = pRtlDosPathNameToNtPathName_U( filename, &ntpath, NULL, NULL ); + ok( ret, "RtlDosPathNameToNtPathName_U failed\n" ); + + size = offsetof( FILE_RENAME_INFORMATION, FileName ) + ntpath.Length; + fri = HeapAlloc( GetProcessHeap(), 0, size ); + ok( fri != NULL, "HeapAlloc failed\n" ); + fri->ReplaceIfExists = TRUE; + fri->RootDirectory = NULL; + fri->FileNameLength = ntpath.Length; + memcpy( fri->FileName, ntpath.Buffer, ntpath.Length ); + pRtlFreeUnicodeString( &ntpath ); + + status = pNtSetInformationFile( h, &io, fri, size, FileRenameInformation ); + HeapFree( GetProcessHeap(), 0, fri ); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); +} + +static void test_dotfile_file_attributes(void) +{ + char temppath[MAX_PATH], filename[MAX_PATH]; + WCHAR temppathW[MAX_PATH], filenameW[MAX_PATH]; + FILE_BASIC_INFORMATION info = {}; + IO_STATUS_BLOCK io; + NTSTATUS status; + DWORD attrs; + HANDLE h; + + GetTempPathA( MAX_PATH, temppath ); + GetTempFileNameA( temppath, ".foo", 0, filename ); + h = CreateFileA( filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0 ); + ok( h != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + + 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 ); + + status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileBasicInformation ); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); + ok( !(info.FileAttributes & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", info.FileAttributes ); + + info.FileAttributes = FILE_ATTRIBUTE_SYSTEM; + status = pNtSetInformationFile( h, &io, &info, sizeof(info), FileBasicInformation ); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); + + 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 ); + + status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileBasicInformation ); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); + ok( info.FileAttributes & FILE_ATTRIBUTE_SYSTEM, "got attributes %#lx\n", info.FileAttributes ); + ok( !(info.FileAttributes & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", info.FileAttributes ); + + CloseHandle( h ); + + GetTempPathW( MAX_PATH, temppathW ); + GetTempFileNameW( temppathW, L"foo", 0, filenameW ); + h = CreateFileW( filenameW, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0 ); + ok( h != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); + + GetTempFileNameW( temppathW, L".foo", 0, filenameW ); + winetest_push_context("foo -> .foo"); + rename_file( h, filenameW ); + winetest_pop_context(); + + status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileBasicInformation ); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); + ok( !(info.FileAttributes & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", info.FileAttributes ); + + GetTempFileNameW( temppathW, L"foo", 0, filenameW ); + winetest_push_context(".foo -> foo"); + rename_file( h, filenameW ); + winetest_pop_context(); + + status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileBasicInformation ); + ok( status == STATUS_SUCCESS, "got %#lx\n", status ); + ok( !(info.FileAttributes & FILE_ATTRIBUTE_HIDDEN), "got attributes %#lx\n", info.FileAttributes ); + + CloseHandle( h ); +} + static void test_file_mode(void) { UNICODE_STRING file_name, pipe_dev_name, mountmgr_dev_name, mailslot_dev_name; @@ -5499,6 +5590,7 @@ START_TEST(file) test_file_id_information(); test_file_access_information(); test_file_attribute_tag_information(); + test_dotfile_file_attributes(); test_file_mode(); test_file_readonly_access(); test_query_volume_information_file();

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

Biswapriyo Nath : include: Add DXGI_DEBUG_D3D11 in d3d11sdklayers.idl.
by Alexandre Julliard 01 May '23

01 May '23

Module: wine Branch: master Commit: 2b7ba08743d3a4062a1a1f12a952e329cb56e9a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/2b7ba08743d3a4062a1a1f12a952e3… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Mon May 1 19:14:55 2023 +0530 include: Add DXGI_DEBUG_D3D11 in d3d11sdklayers.idl. Required for libplacebo. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> --- include/d3d11sdklayers.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/d3d11sdklayers.idl b/include/d3d11sdklayers.idl index 54236fcdac7..843e97860d9 100644 --- a/include/d3d11sdklayers.idl +++ b/include/d3d11sdklayers.idl @@ -28,6 +28,8 @@ const UINT D3D11_DEBUG_FEATURE_NEVER_DISCARD_OFFERED_RESOURCE = 0x10; const UINT D3D11_DEBUG_FEATURE_AVOID_BEHAVIOR_CHANGING_DEBUG_AIDS = 0x40; const UINT D3D11_DEBUG_FEATURE_DISABLE_TILED_RESOURCE_MAPPING_TRACKING_AND_VALIDATION = 0x80; +cpp_quote("DEFINE_GUID(DXGI_DEBUG_D3D11, 0x4b99317b, 0xac39, 0x4aa6, 0xbb, 0xb, 0xba, 0xa0, 0x47, 0x84, 0x79, 0x8f);") + typedef enum D3D11_MESSAGE_CATEGORY { D3D11_MESSAGE_CATEGORY_APPLICATION_DEFINED, D3D11_MESSAGE_CATEGORY_MISCELLANEOUS,

1 0

David Kahurani : gdiplus: Traverse and draw the whole string.
by Alexandre Julliard 01 May '23

01 May '23

Module: wine Branch: master Commit: 03bc97a8c1af137a505ab71cf17a5c5556c6ad0d URL: https://gitlab.winehq.org/wine/wine/-/commit/03bc97a8c1af137a505ab71cf17a5c… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Mon May 1 12:54:29 2023 +0300 gdiplus: Traverse and draw the whole string. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45698 Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/gdiplus/graphicspath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 2e30300e348..656069d7ffe 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -908,7 +908,7 @@ static GpStatus format_string_callback(HDC dc, if (y + bounds->Height * args->scale > args->maxY) args->maxY = y + bounds->Height * args->scale; - for (i = index; i < length; ++i) + for (i = index; i < length + index; ++i) { GLYPHMETRICS gm; TTPOLYGONHEADER *ph = NULL, *origph;

1 0

Francisco Casas : vkd3d-shader/hlsl: Always specify resource on intrinsic_tex().
by Alexandre Julliard 01 May '23

01 May '23

Module: vkd3d Branch: master Commit: abb207fab068d3c2d23c34abfbd1c8341fe28935 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/abb207fab068d3c2d23c34abfbd1c… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Apr 26 14:42:17 2023 -0400 vkd3d-shader/hlsl: Always specify resource on intrinsic_tex(). Otherwise, in the added test, we get: vkd3d-compiler: vkd3d-shader/hlsl.c:452: hlsl_init_deref_from_index_chain: Assertion `chain' failed. because on the path that triggers the following error: E5002: Wrong type for argument 1 of 'tex3D': expected 'sampler' or 'sampler3D', but got 'sampler2D'. a NULL params.resource is passed to hlsl_new_resource_load() and then to hlsl_init_deref_from_index_chain(). --- libs/vkd3d-shader/hlsl.y | 5 +---- tests/sampler.shader_test | 9 +++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 1ba929b5..ab0b3f65 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3331,16 +3331,13 @@ static bool intrinsic_tex(struct hlsl_ctx *ctx, const struct parse_initializer * name, ctx->builtin_types.sampler[dim]->name, string->buffer); hlsl_release_string_buffer(ctx, string); } - else - { - load_params.resource = params->args[0]; - } if (!(coords = add_implicit_conversion(ctx, params->instrs, params->args[1], hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, hlsl_sampler_dim_count(dim)), loc))) coords = params->args[1]; load_params.coords = coords; + load_params.resource = params->args[0]; load_params.format = hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, 4); if (!(load = hlsl_new_resource_load(ctx, &load_params, loc))) diff --git a/tests/sampler.shader_test b/tests/sampler.shader_test index 2cb70a0b..23741a35 100644 --- a/tests/sampler.shader_test +++ b/tests/sampler.shader_test @@ -45,3 +45,12 @@ float4 main() : sv_target [test] draw quad probe all rgba (0.25, 0, 0.25, 0) + + +[pixel shader fail] +sampler2D s; + +float4 main() : sv_target +{ + return tex3D(s, float3(0.0, 0.0, 0.0)); +}

1 0

Ethan Lee : vkd3d-shader/hlsl: Add support for sign() intrinsic.
by Alexandre Julliard 01 May '23

01 May '23

Module: vkd3d Branch: master Commit: 5d735f3b0ee2074344cea16bc0d44e88d8da3351 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5d735f3b0ee2074344cea16bc0d44… Author: Ethan Lee <flibitijibibo(a)gmail.com> Date: Fri Apr 21 16:13:37 2023 -0400 vkd3d-shader/hlsl: Add support for sign() intrinsic. Signed-off-by: Ethan Lee <flibitijibibo(a)gmail.com> --- libs/vkd3d-shader/hlsl.y | 37 ++++++++++++++++++++++++++++++++++ tests/sign.shader_test | 52 ++++++++++++++++++++++++------------------------ 2 files changed, 63 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 27663a0d..1ba929b5 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3165,6 +3165,42 @@ static bool intrinsic_saturate(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_SAT, arg, loc); } +static bool intrinsic_sign(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *lt, *neg, *op1, *op2, *arg = params->args[0]; + struct hlsl_ir_constant *zero; + + struct hlsl_type *int_type = hlsl_get_numeric_type(ctx, arg->data_type->class, HLSL_TYPE_INT, + arg->data_type->dimx, arg->data_type->dimy); + + if (!(zero = hlsl_new_constant(ctx, hlsl_get_scalar_type(ctx, arg->data_type->base_type), loc))) + return false; + list_add_tail(params->instrs, &zero->node.entry); + + /* Check if 0 < arg, cast bool to int */ + + if (!(lt = add_binary_comparison_expr(ctx, params->instrs, HLSL_OP2_LESS, &zero->node, arg, loc))) + return false; + + if (!(op1 = add_implicit_conversion(ctx, params->instrs, lt, int_type, loc))) + return false; + + /* Check if arg < 0, cast bool to int and invert (meaning true is -1) */ + + if (!(lt = add_binary_comparison_expr(ctx, params->instrs, HLSL_OP2_LESS, arg, &zero->node, loc))) + return false; + + if (!(op2 = add_implicit_conversion(ctx, params->instrs, lt, int_type, loc))) + return false; + + if (!(neg = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_NEG, op2, loc))) + return false; + + /* Adding these two together will make 1 when > 0, -1 when < 0, and 0 when neither */ + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, neg, op1, loc); +} + static bool intrinsic_sin(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3483,6 +3519,7 @@ intrinsic_functions[] = {"round", 1, true, intrinsic_round}, {"rsqrt", 1, true, intrinsic_rsqrt}, {"saturate", 1, true, intrinsic_saturate}, + {"sign", 1, true, intrinsic_sign}, {"sin", 1, true, intrinsic_sin}, {"smoothstep", 3, true, intrinsic_smoothstep}, {"sqrt", 1, true, intrinsic_sqrt}, diff --git a/tests/sign.shader_test b/tests/sign.shader_test index dc1a557f..7ed632db 100644 --- a/tests/sign.shader_test +++ b/tests/sign.shader_test @@ -1,4 +1,4 @@ -[pixel shader notimpl] +[pixel shader] uniform float f; float4 main() : sv_target @@ -8,16 +8,16 @@ float4 main() : sv_target [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) +draw quad +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) +draw quad +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) +draw quad +probe all rgba (0.0, 0.0, 0.0, 0.0) -[pixel shader notimpl] +[pixel shader] uniform float4 f; float4 main() : sv_target @@ -27,10 +27,10 @@ float4 main() : sv_target [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) +draw quad +probe all rgba (1.0, 1.0, 1.0, 1.0) -[pixel shader notimpl] +[pixel shader] uniform float2x2 f; float4 main() : sv_target @@ -41,10 +41,10 @@ float4 main() : sv_target [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) +draw quad +probe all rgba (1.0, 1.0, 1.0, 1.0) -[pixel shader notimpl] +[pixel shader] uniform int f; float4 main() : sv_target @@ -54,16 +54,16 @@ float4 main() : sv_target [test] uniform 0 int4 1 0 0 0 -todo draw quad -todo probe all rgba (1, 1, 1, 1) +draw quad +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) +draw quad +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) +draw quad +probe all rgba (0, 0, 0, 0) -[pixel shader notimpl] +[pixel shader] uniform int4 f; float4 main() : sv_target @@ -73,10 +73,10 @@ float4 main() : sv_target [test] uniform 0 int4 1 2 3 4 -todo draw quad -todo probe all rgba (1, 1, 1, 1) +draw quad +probe all rgba (1, 1, 1, 1) -[pixel shader notimpl] +[pixel shader] uniform int2x2 f; float4 main() : sv_target @@ -87,5 +87,5 @@ float4 main() : sv_target [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) +draw quad +probe all rgba (1, 1, 1, 1)

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

← Newer
1
...
71
72
73
74
75
76
77
78
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 2023