- Wine-Commits - list.winehq.org

Alexandre Julliard : wbemprox: Get the processor caption from the registry.
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: wine Branch: master Commit: 7a054a4a8f477142d88c5ec07e0ba32ab52875c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/7a054a4a8f477142d88c5ec07e0ba3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 15 10:39:21 2024 +0200 wbemprox: Get the processor caption from the registry. --- dlls/wbemprox/builtin.c | 68 ++++++++++++++++++++----------------------------- 1 file changed, 28 insertions(+), 40 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index fa4c6ee6351..ebfd8e5fc9d 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1351,6 +1351,27 @@ static WCHAR *get_smbios_string( enum smbios_type type, size_t field_offset, con return get_smbios_string_by_id( ((const BYTE *)hdr)[field_offset], buf, offset, len ); } +static WCHAR *get_reg_str( HKEY root, const WCHAR *path, const WCHAR *value ) +{ + HKEY hkey = 0; + DWORD size, type; + WCHAR *ret = NULL; + + if (!RegOpenKeyExW( root, path, 0, KEY_READ, &hkey ) && + !RegQueryValueExW( hkey, value, NULL, &type, NULL, &size ) && type == REG_SZ && + (ret = malloc( size + sizeof(WCHAR) ))) + { + size += sizeof(WCHAR); + if (RegQueryValueExW( hkey, value, NULL, NULL, (BYTE *)ret, &size )) + { + free( ret ); + ret = NULL; + } + } + if (hkey) RegCloseKey( hkey ); + return ret; +} + static WCHAR *get_baseboard_manufacturer( const char *buf, UINT len ) { WCHAR *ret = get_smbios_string( SMBIOS_TYPE_BASEBOARD, offsetof(struct smbios_baseboard, vendor), buf, len ); @@ -3434,22 +3455,11 @@ static const WCHAR *get_osarchitecture(void) if (info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return L"64-bit"; return L"32-bit"; } -static void get_processor_caption( WCHAR *caption, UINT len ) +static WCHAR *get_processor_caption( UINT index ) { - const WCHAR *arch; - WCHAR manufacturer[13]; - int regs[4] = {0, 0, 0, 0}; - unsigned int family, model, stepping; - - get_processor_manufacturer( manufacturer, ARRAY_SIZE( manufacturer ) ); - if (!wcscmp( get_osarchitecture(), L"32-bit" )) arch = L"x86"; - else if (!wcscmp( manufacturer, L"AuthenticAMD" )) arch = L"AMD64"; - else arch = L"Intel64"; - - do_cpuid( 1, regs ); - - model = get_processor_model( regs[0], &stepping, &family ); - swprintf( caption, len, L"%s Family %u Model %u Stepping %u", arch, family, model, stepping ); + WCHAR name[64]; + swprintf( name, ARRAY_SIZE(name), L"Hardware\\Description\\System\\CentralProcessor\\%u", index ); + return get_reg_str( HKEY_LOCAL_MACHINE, name, L"Identifier" ); } static void get_processor_version( WCHAR *version, UINT len ) { @@ -3522,7 +3532,7 @@ static UINT get_processor_maxclockspeed( UINT index ) static enum fill_status fill_processor( struct table *table, const struct expr *cond ) { - WCHAR caption[100], device_id[14], processor_id[17], manufacturer[13], name[49] = {0}, version[50]; + WCHAR device_id[14], processor_id[17], manufacturer[13], name[49] = {0}, version[50]; struct record_processor *rec; UINT i, offset = 0, num_rows = 0, num_logical, num_physical, num_packages; enum fill_status status = FILL_STATUS_UNFILTERED; @@ -3531,7 +3541,6 @@ static enum fill_status fill_processor( struct table *table, const struct expr * if (!resize_table( table, num_packages, sizeof(*rec) )) return FILL_STATUS_FAILED; - get_processor_caption( caption, ARRAY_SIZE( caption ) ); get_processor_id( processor_id, ARRAY_SIZE( processor_id ) ); get_processor_manufacturer( manufacturer, ARRAY_SIZE( manufacturer ) ); get_processor_name( name ); @@ -3542,11 +3551,11 @@ static enum fill_status fill_processor( struct table *table, const struct expr * rec = (struct record_processor *)(table->data + offset); rec->addresswidth = !wcscmp( get_osarchitecture(), L"32-bit" ) ? 32 : 64; rec->architecture = !wcscmp( get_osarchitecture(), L"32-bit" ) ? 0 : 9; - rec->caption = wcsdup( caption ); + rec->caption = get_processor_caption( i ); rec->cpu_status = 1; /* CPU Enabled */ rec->currentclockspeed = get_processor_currentclockspeed( i ); rec->datawidth = !wcscmp( get_osarchitecture(), L"32-bit" ) ? 32 : 64; - rec->description = wcsdup( caption ); + rec->description = get_processor_caption( i ); swprintf( device_id, ARRAY_SIZE( device_id ), L"CPU%u", i ); rec->device_id = wcsdup( device_id ); rec->family = 2; /* Unknown */ @@ -3657,27 +3666,6 @@ static WCHAR *get_locale(void) return ret; } -static WCHAR *get_reg_str( HKEY root, const WCHAR *path, const WCHAR *value ) -{ - HKEY hkey = 0; - DWORD size, type; - WCHAR *ret = NULL; - - if (!RegOpenKeyExW( root, path, 0, KEY_READ, &hkey ) && - !RegQueryValueExW( hkey, value, NULL, &type, NULL, &size ) && type == REG_SZ && - (ret = malloc( size + sizeof(WCHAR) ))) - { - size += sizeof(WCHAR); - if (RegQueryValueExW( hkey, value, NULL, NULL, (BYTE *)ret, &size )) - { - free( ret ); - ret = NULL; - } - } - if (hkey) RegCloseKey( hkey ); - return ret; -} - static WCHAR *get_organization(void) { return get_reg_str( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion",

1 0

Piotr Caban : msvcrt/tests: Don't link to _wcsicmp_l and _create_locale.
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: wine Branch: master Commit: d2043a73a6594cd11a0a93655007ebf45be6e7c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/d2043a73a6594cd11a0a93655007eb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 15 13:45:53 2024 +0200 msvcrt/tests: Don't link to _wcsicmp_l and _create_locale. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56682 --- dlls/msvcrt/tests/locale.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 38dc62eb416..cb56fe39754 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -27,6 +27,9 @@ static BOOL (__cdecl *p__crtGetStringTypeW)(DWORD, DWORD, const wchar_t*, int, W static int (__cdecl *pmemcpy_s)(void *, size_t, void*, size_t); static int (__cdecl *p___mb_cur_max_func)(void); static int *(__cdecl *p__p___mb_cur_max)(void); +static _locale_t(__cdecl *p_create_locale)(int, const char*); +static void(__cdecl *p_free_locale)(_locale_t); +static int (__cdecl *p_wcsicmp_l)(const wchar_t*, const wchar_t*, _locale_t); void* __cdecl _Gettnames(void); static void init(void) @@ -37,6 +40,9 @@ static void init(void) pmemcpy_s = (void*)GetProcAddress(hmod, "memcpy_s"); p___mb_cur_max_func = (void*)GetProcAddress(hmod, "___mb_cur_max_func"); p__p___mb_cur_max = (void*)GetProcAddress(hmod, "__p___mb_cur_max"); + p_create_locale = (void*)GetProcAddress(hmod, "_create_locale"); + p_free_locale = (void*)GetProcAddress(hmod, "_free_locale"); + p_wcsicmp_l = (void*)GetProcAddress(hmod, "_wcsicmp_l"); } static void test_setlocale(void) @@ -815,20 +821,27 @@ static void test__wcsicmp_l(void) }; int ret, i; + if (!p_wcsicmp_l || !p_create_locale) + { + win_skip("_wcsicmp_l or _create_locale not available\n"); + return; + } + ok(!!p_free_locale, "_free_locale not available\n"); + for(i=0; i<ARRAY_SIZE(tests); i++) { _locale_t loc = NULL; - if(tests[i].loc && !(loc = _create_locale(LC_ALL, tests[i].loc))) { + if(tests[i].loc && !(loc = p_create_locale(LC_ALL, tests[i].loc))) { win_skip("locale %s not available. skipping\n", tests[i].loc); continue; } - ret = _wcsicmp_l(tests[i].str1, tests[i].str2, loc); + ret = p_wcsicmp_l(tests[i].str1, tests[i].str2, loc); ok(ret == tests[i].exp, "_wcsicmp_l = %d, expected %d for test %d '%ls' vs '%ls' using %s locale\n", ret, tests[i].exp, i, tests[i].str1, tests[i].str2, loc ? tests[i].loc : "current"); if(loc) - _free_locale(loc); + p_free_locale(loc); } }

1 0

Francisco Casas : vkd3d-shader/hlsl: Also lower matrix swizzles and index loads in const passes.
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: vkd3d Branch: master Commit: 061dc390367b4c83022d5fe1255f8d38f6b7ce9c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/061dc390367b4c83022d5fe1255f8… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Apr 26 14:46:56 2024 -0400 vkd3d-shader/hlsl: Also lower matrix swizzles and index loads in const passes. --- libs/vkd3d-shader/hlsl_codegen.c | 3 +++ tests/hlsl/array-size-expr.shader_test | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 51067960..27f16af5 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -5412,6 +5412,9 @@ void hlsl_run_const_passes(struct hlsl_ctx *ctx, struct hlsl_block *body) { bool progress; + lower_ir(ctx, lower_matrix_swizzles, body); + lower_ir(ctx, lower_index_loads, body); + lower_ir(ctx, lower_broadcasts, body); while (hlsl_transform_ir(ctx, fold_redundant_casts, body, NULL)); do diff --git a/tests/hlsl/array-size-expr.shader_test b/tests/hlsl/array-size-expr.shader_test index 366e25d5..0c9457ee 100644 --- a/tests/hlsl/array-size-expr.shader_test +++ b/tests/hlsl/array-size-expr.shader_test @@ -53,7 +53,7 @@ todo(glsl) draw quad probe all rgba (2, 3, 6, 1) % Additional level of indirection -[pixel shader todo fail(sm>=6)] +[pixel shader fail(sm>=6)] static const float array[8] = {1, 2, 3, 4, 5, 6, 7, 8}; static const int idx = 2; static const float array2[array[idx]] = {1, 2, 3}; @@ -64,11 +64,11 @@ float4 main() : sv_target } [test] -todo draw quad +todo(glsl) draw quad probe all rgba (2, 3, 6, 1) -[pixel shader fail(sm>=6) todo] +[pixel shader fail(sm>=6)] static const struct { float f; @@ -88,5 +88,5 @@ uniform 4 float 0.0 uniform 8 float 0.0 uniform 12 float 0.0 uniform 16 float 42.0 -todo draw quad +todo(glsl) draw quad probe all rgba (42, 42, 42, 42)

1 0

Francisco Casas : tests: Test complex array size expression.
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: vkd3d Branch: master Commit: dff2f746bc19dc5e783b6d3e1fbdb725a5f9a08c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dff2f746bc19dc5e783b6d3e1fbdb… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Apr 26 20:40:27 2024 -0400 tests: Test complex array size expression. --- tests/hlsl/array-size-expr.shader_test | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tests/hlsl/array-size-expr.shader_test b/tests/hlsl/array-size-expr.shader_test index a5666fd2..366e25d5 100644 --- a/tests/hlsl/array-size-expr.shader_test +++ b/tests/hlsl/array-size-expr.shader_test @@ -66,3 +66,27 @@ float4 main() : sv_target [test] todo draw quad probe all rgba (2, 3, 6, 1) + + +[pixel shader fail(sm>=6) todo] +static const struct +{ + float f; + float2x3 m[2]; +} a = {0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 1}; + +float arr[a.m[1]._13_22_21.zxy.z]; // Fails on SM6 because size is float. + +float4 main() : sv_target +{ + return arr[4]; +} + +[test] +uniform 0 float 0.0 +uniform 4 float 0.0 +uniform 8 float 0.0 +uniform 12 float 0.0 +uniform 16 float 42.0 +todo draw quad +probe all rgba (42, 42, 42, 42)

1 0

Francisco Casas : vkd3d-shader/hlsl: Run more constant passes on static expressions eval.
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: vkd3d Branch: master Commit: 0d252f894aefb6cf26a590e775a562723112aff9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0d252f894aefb6cf26a590e775a56… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Apr 26 12:15:52 2024 -0400 vkd3d-shader/hlsl: Run more constant passes on static expressions eval. --- libs/vkd3d-shader/hlsl.y | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c6b6219e..9c1bdef9 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1293,7 +1293,7 @@ static unsigned int evaluate_static_expression_as_uint(struct hlsl_ctx *ctx, str struct hlsl_ir_node *node; struct hlsl_block expr; unsigned int ret = 0; - bool progress; + struct hlsl_src src; LIST_FOR_EACH_ENTRY(node, &block->instrs, struct hlsl_ir_node, entry) { @@ -1330,13 +1330,12 @@ static unsigned int evaluate_static_expression_as_uint(struct hlsl_ctx *ctx, str return 0; } - do - { - progress = hlsl_transform_ir(ctx, hlsl_fold_constant_exprs, &expr, NULL); - progress |= hlsl_copy_propagation_execute(ctx, &expr); - } while (progress); + /* Wrap the node into a src to allow the reference to survive the multiple const passes. */ + hlsl_src_from_node(&src, node_from_block(&expr)); + hlsl_run_const_passes(ctx, &expr); + node = src.node; + hlsl_src_remove(&src); - node = node_from_block(&expr); if (node->type == HLSL_IR_CONSTANT) { constant = hlsl_ir_constant(node);

1 0

Francisco Casas : vkd3d-shader/hlsl: Run constant passes in a separate function.
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: vkd3d Branch: master Commit: 4f60c7167e7babb2727e5337a91fdd17d7cfd617 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4f60c7167e7babb2727e5337a91fd… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Apr 26 12:15:52 2024 -0400 vkd3d-shader/hlsl: Run constant passes in a separate function. --- libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl_codegen.c | 66 ++++++++++++++++++++++------------------ 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 0210cf9d..ca648149 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1250,6 +1250,7 @@ bool hlsl_clone_block(struct hlsl_ctx *ctx, struct hlsl_block *dst_block, const void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl *func); +void hlsl_run_const_passes(struct hlsl_ctx *ctx, struct hlsl_block *body); int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, enum vkd3d_shader_target_type target_type, struct vkd3d_shader_code *out); int hlsl_emit_effect_binary(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 26179042..51067960 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -5408,6 +5408,41 @@ static void remove_unreachable_code(struct hlsl_ctx *ctx, struct hlsl_block *bod } } +void hlsl_run_const_passes(struct hlsl_ctx *ctx, struct hlsl_block *body) +{ + bool progress; + + lower_ir(ctx, lower_broadcasts, body); + while (hlsl_transform_ir(ctx, fold_redundant_casts, body, NULL)); + do + { + progress = hlsl_transform_ir(ctx, split_array_copies, body, NULL); + progress |= hlsl_transform_ir(ctx, split_struct_copies, body, NULL); + } + while (progress); + hlsl_transform_ir(ctx, split_matrix_copies, body, NULL); + + lower_ir(ctx, lower_narrowing_casts, body); + lower_ir(ctx, lower_int_dot, body); + lower_ir(ctx, lower_int_division, body); + lower_ir(ctx, lower_int_modulus, body); + lower_ir(ctx, lower_int_abs, body); + lower_ir(ctx, lower_casts_to_bool, body); + lower_ir(ctx, lower_float_modulus, body); + hlsl_transform_ir(ctx, fold_redundant_casts, body, NULL); + + do + { + progress = hlsl_transform_ir(ctx, hlsl_fold_constant_exprs, body, NULL); + progress |= hlsl_transform_ir(ctx, hlsl_fold_constant_identities, body, NULL); + progress |= hlsl_transform_ir(ctx, hlsl_fold_constant_swizzles, body, NULL); + progress |= hlsl_copy_propagation_execute(ctx, body); + progress |= hlsl_transform_ir(ctx, fold_swizzle_chains, body, NULL); + progress |= hlsl_transform_ir(ctx, remove_trivial_swizzles, body, NULL); + progress |= hlsl_transform_ir(ctx, remove_trivial_conditional_branches, body, NULL); + } while (progress); +} + int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, enum vkd3d_shader_target_type target_type, struct vkd3d_shader_code *out) { @@ -5416,7 +5451,6 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry struct recursive_call_ctx recursive_call_ctx; struct hlsl_ir_var *var; unsigned int i; - bool progress; list_move_head(&body->instrs, &ctx->static_initializers.instrs); @@ -5494,35 +5528,9 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry { hlsl_transform_ir(ctx, lower_discard_neg, body, NULL); } - lower_ir(ctx, lower_broadcasts, body); - while (hlsl_transform_ir(ctx, fold_redundant_casts, body, NULL)); - do - { - progress = hlsl_transform_ir(ctx, split_array_copies, body, NULL); - progress |= hlsl_transform_ir(ctx, split_struct_copies, body, NULL); - } - while (progress); - hlsl_transform_ir(ctx, split_matrix_copies, body, NULL); - lower_ir(ctx, lower_narrowing_casts, body); - lower_ir(ctx, lower_int_dot, body); - lower_ir(ctx, lower_int_division, body); - lower_ir(ctx, lower_int_modulus, body); - lower_ir(ctx, lower_int_abs, body); - lower_ir(ctx, lower_casts_to_bool, body); - lower_ir(ctx, lower_float_modulus, body); - hlsl_transform_ir(ctx, fold_redundant_casts, body, NULL); - do - { - progress = hlsl_transform_ir(ctx, hlsl_fold_constant_exprs, body, NULL); - progress |= hlsl_transform_ir(ctx, hlsl_fold_constant_identities, body, NULL); - progress |= hlsl_transform_ir(ctx, hlsl_fold_constant_swizzles, body, NULL); - progress |= hlsl_copy_propagation_execute(ctx, body); - progress |= hlsl_transform_ir(ctx, fold_swizzle_chains, body, NULL); - progress |= hlsl_transform_ir(ctx, remove_trivial_swizzles, body, NULL); - progress |= hlsl_transform_ir(ctx, remove_trivial_conditional_branches, body, NULL); - } - while (progress); + hlsl_run_const_passes(ctx, body); + remove_unreachable_code(ctx, body); hlsl_transform_ir(ctx, normalize_switch_cases, body, NULL);

1 0

Francisco Casas : tests: Test default values for constant buffer variables.
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: vkd3d Branch: master Commit: 58a6db5589cfc8a6f4e3d56666e0dcb611929b8e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/58a6db5589cfc8a6f4e3d56666e0d… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Apr 4 12:09:10 2024 -0300 tests: Test default values for constant buffer variables. --- tests/hlsl/default-values.shader_test | 105 ++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/tests/hlsl/default-values.shader_test b/tests/hlsl/default-values.shader_test index 6550c67b..0427f659 100644 --- a/tests/hlsl/default-values.shader_test +++ b/tests/hlsl/default-values.shader_test @@ -115,6 +115,111 @@ todo(sm<6) draw quad probe all rgba (70, 80, 90, 100) +[pixel shader] +cbuffer buff +{ + float2 a = {1, 2}; + float4x2 b = {1, 2, 3, 4, 5, 6, 7, 8}; +} + +float4 main() : sv_target +{ + return float4(a, b[2]); +} + +[test] +if(sm<4) uniform 0 float4 10 30 50 70 +if(sm<4) uniform 4 float4 20 40 60 80 +if(sm<4) uniform 8 float4 10 20 0 0 +if(sm>=4) uniform 0 float4 10 20 0 0 +if(sm>=4) uniform 4 float4 10 30 50 70 +if(sm>=4) uniform 8 float4 20 40 60 80 +todo(glsl) draw quad +probe all rgba (10, 20, 50, 60) + + +[pixel shader fail(sm<6) todo] +cbuffer buff +{ + float a = 7; + float4 b = a; // initial value must be a literal expression. +} + +float4 main() : sv_target { return 0; } + + +[pixel shader fail(sm<6) todo] +cbuffer buff +{ + float a = 7; + float4 b = {1, 2, a, 4}; // initial value must be a literal expression. +} + +float4 main() : sv_target { return 0; } + + +[pixel shader] +static const float a = 7; + +cbuffer buff +{ + float4 b = {1, 2, a, 4}; // static constant values are allowed on the initializer. +} + +float4 main() : sv_target { return b; } + +[test] +uniform 0 float4 10 20 30 40 +todo(glsl) draw quad +probe all rgba (10, 20, 30, 40) + + +[pixel shader] +cbuffer buff +{ + float2 a = {1, 2}; + float4 b = {3, 5, float2(4, 4)}; // numeric type initializers are allowed. +} + +float4 main() : sv_target +{ + return 2 * b; +} + +[test] +if(sm<4) uniform 0 float4 30 50 40 40 +if(sm>=4) uniform 0 float4 10 20 0 0 +if(sm>=4) uniform 4 float4 30 50 40 40 +todo(glsl) draw quad +probe all rgba (60, 100, 80, 80) + + +[pixel shader] +cbuffer buff +{ + struct apple + { + float3 a[2]; + int2x2 b; + } ap = {1, 2, 3, 4, 5, 6, 7.5, 8, 9, 10}; +} + +float4 main() : sv_target +{ + return float4(ap.b); +} + +[test] +uniform 0 float4 10 20 30 0 +uniform 4 float4 40 50 60 0 +if(sm<4) uniform 8 float4 70 90 0 0 +if(sm<4) uniform 12 float4 80 100 0 0 +if(sm>=4) uniform 8 int4 70 90 0 0 +if(sm>=4) uniform 12 int4 80 100 0 0 +todo(glsl) draw quad +probe all rgba (70, 80, 90, 100) + + [require] shader model >= 5.0

1 0

Francisco Casas : tests: Test default values for uniform variables.
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: vkd3d Branch: master Commit: 499b44a193444eea9af8363dd9d22b2a12241c18 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/499b44a193444eea9af8363dd9d22… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Apr 10 20:18:24 2024 -0400 tests: Test default values for uniform variables. --- Makefile.am | 1 + tests/hlsl/default-values.shader_test | 143 ++++++++++++++++++++++++++++++++++ 2 files changed, 144 insertions(+) diff --git a/Makefile.am b/Makefile.am index f901a84d..b3288b50 100644 --- a/Makefile.am +++ b/Makefile.am @@ -89,6 +89,7 @@ vkd3d_shader_tests = \ tests/hlsl/cross.shader_test \ tests/hlsl/d3dcolor-to-ubyte4.shader_test \ tests/hlsl/ddxddy.shader_test \ + tests/hlsl/default-values.shader_test \ tests/hlsl/depth-out.shader_test \ tests/hlsl/determinant.shader_test \ tests/hlsl/discard.shader_test \ diff --git a/tests/hlsl/default-values.shader_test b/tests/hlsl/default-values.shader_test new file mode 100644 index 00000000..6550c67b --- /dev/null +++ b/tests/hlsl/default-values.shader_test @@ -0,0 +1,143 @@ +% Note that, except for effects, default values do not affect the execution. +% The default values are intended to be obtained using reflection. + +[pixel shader todo] +float2 a = {1, 2}; +float4x2 b = {1, 2, 3, 4, 5, 6, 7, 8}; + +float4 main() : sv_target +{ + return float4(a, b[2]); +} + +[test] +if(sm<4) uniform 0 float4 10 30 50 70 +if(sm<4) uniform 4 float4 20 40 60 80 +if(sm<4) uniform 8 float4 10 20 0 0 +if(sm>=4) uniform 0 float4 10 20 0 0 +if(sm>=4) uniform 4 float4 10 30 50 70 +if(sm>=4) uniform 8 float4 20 40 60 80 +todo(sm<6) draw quad +probe all rgba (10, 20, 50, 60) + + +[pixel shader fail(sm<6) todo] +float a = 7; +float4 b = a; // initial value must be a literal expression. + +float4 main() : sv_target { return 0; } + + +[pixel shader fail(sm<6) todo] +float a = 7; +float4 b = {1, 2, a, 4}; // initial value must be a literal expression. + +float4 main() : sv_target { return 0; } + + +[pixel shader fail] +Texture2D tex; +struct +{ + Texture2D t; + float a; +} apple = {tex, 4}; // initial value must be a literal expression. + +float4 main() : sv_target +{ + return 0; +} + + +[pixel shader todo] +static const float a = 7; +float4 b = {1, 2, a, 4}; // static constant values are allowed on the initializer. + +float4 main() : sv_target { return b; } + +[test] +uniform 0 float4 10.0 20.0 30.0 40.0 +todo(sm<6) draw quad +probe all rgba (10, 20, 30, 40) + + +[pixel shader todo] +float4 a = {3, 5, float2(4, 4)}; // numeric type initializers are allowed. + +float4 main() : sv_target +{ + return 2 * a; +} + +[test] +uniform 0 float4 10.0 20.0 30.0 40.0 +todo(sm<6) draw quad +probe all rgba (20, 40, 60, 80) + + +[pixel shader todo] +int4 a[2] = {10, 20, float3x2(1, 2, 3, 4, 5, 6)}; // matrix numeric type initializers are allowed. + +float4 main() : sv_target +{ + return 2 * a[1]; +} + +[test] +if(sm<4) uniform 0 float4 10 20 30 40 +if(sm<4) uniform 4 float4 50 60 70 80 +if(sm>=4) uniform 0 int4 10 20 30 40 +if(sm>=4) uniform 4 int4 50 60 70 80 +todo(sm<6) draw quad +probe all rgba (100, 120, 140, 160) + + +[pixel shader todo] +struct apple +{ + float3 a[2]; + int2x2 b; +} ap = {1, 2, 3, 4, 5, 6, 7.5, 8, 9, 10}; + +float4 main() : sv_target +{ + return float4(ap.b); +} + +[test] +uniform 0 float4 10 20 30 0 +uniform 4 float4 40 50 60 0 +if(sm<4) uniform 8 float4 70 90 0 0 +if(sm<4) uniform 12 float4 80 100 0 0 +if(sm>=4) uniform 8 int4 70 90 0 0 +if(sm>=4) uniform 12 int4 80 100 0 0 +todo(sm<6) draw quad +probe all rgba (70, 80, 90, 100) + + +[require] +shader model >= 5.0 + + +% Default values for doubles don't seem to be saved properly. +[pixel shader todo] +double2 m = {1, 2}; +// double2 m; // Offset: 0 Size: 16 +// = 0x00000000 0x00000000 0x40000000 0x00000000 + +float4 main() : sv_target +{ + return m.y; +} + + +[pixel shader todo] +static const float3x2 mat = {10, 20, 30, 40, 50, 60}; +static const float4 array[2] = {1, 2, 3, 4, 5, 6, 7, 8}; +static const int idx = 1; +float3 u = {array[idx].xwwz.xy, mat._m21_m01.x}; // = {5, 8, 60} + +float4 main() : sv_target +{ + return u.y; +}

1 0

Nikolay Sivov : d2d1/effect: Add a stub vertex buffer object.
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: wine Branch: master Commit: 76eaa05c92b4d8282b47dc1abea993ce1a4ab1c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/76eaa05c92b4d8282b47dc1abea993… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 15 03:00:40 2024 +0200 d2d1/effect: Add a stub vertex buffer object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 34 ++++++++----- dlls/d2d1/device.c | 28 +++++++---- dlls/d2d1/effect.c | 123 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/d2d1/tests/d2d1.c | 16 ++++-- 4 files changed, 169 insertions(+), 32 deletions(-)

1 0

Nikolay Sivov : d2d1/effect: Use more generic naming for loaded shaders array.
by Alexandre Julliard May 15, 2024

May 15, 2024

Module: wine Branch: master Commit: 26b89ce06d4205a968907f2b6fe3058dcfa32ccd URL: https://gitlab.winehq.org/wine/wine/-/commit/26b89ce06d4205a968907f2b6fe305… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 15 01:32:51 2024 +0200 d2d1/effect: Use more generic naming for loaded shaders array. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 23 ++++++++++++----------- dlls/d2d1/device.c | 40 +++++++++++++++++++++++----------------- dlls/d2d1/effect.c | 18 +++++++++++------- 3 files changed, 46 insertions(+), 35 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index c0ac5ba9a44..fc9e60c3b7d 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -594,10 +594,15 @@ HRESULT d2d_geometry_group_init(struct d2d_geometry *geometry, ID2D1Factory *fac D2D1_FILL_MODE fill_mode, ID2D1Geometry **src_geometries, unsigned int geometry_count); struct d2d_geometry *unsafe_impl_from_ID2D1Geometry(ID2D1Geometry *iface); -struct d2d_shader +struct d2d_indexed_objects { - GUID id; - IUnknown *shader; + struct + { + GUID id; + IUnknown *object; + } *elements; + size_t size; + size_t count; }; struct d2d_device @@ -607,17 +612,13 @@ struct d2d_device ID2D1Factory1 *factory; IDXGIDevice *dxgi_device; - struct - { - struct d2d_shader *objects; - size_t size; - size_t count; - } shaders; + struct d2d_indexed_objects shaders; }; struct d2d_device *unsafe_impl_from_ID2D1Device(ID2D1Device1 *iface); -HRESULT d2d_device_add_shader(struct d2d_device *device, REFGUID shader_id, IUnknown *shader); -BOOL d2d_device_is_shader_loaded(struct d2d_device *device, REFGUID shader_id); +HRESULT d2d_device_add_indexed_object(struct d2d_indexed_objects *objects, const GUID *id, + IUnknown *object); +BOOL d2d_device_is_object_indexed(struct d2d_indexed_objects *objects, const GUID *id); struct d2d_effect_context { diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 8b1099b180b..7741233f115 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -4282,11 +4282,20 @@ static ULONG WINAPI d2d_device_AddRef(ID2D1Device6 *iface) return refcount; } +static void d2d_device_indexed_objects_clear(struct d2d_indexed_objects *objects) +{ + size_t i; + + for (i = 0; i < objects->count; ++i) + IUnknown_Release(objects->elements[i].object); + free(objects->elements); + objects->elements = NULL; +} + static ULONG WINAPI d2d_device_Release(ID2D1Device6 *iface) { struct d2d_device *device = impl_from_ID2D1Device(iface); ULONG refcount = InterlockedDecrement(&device->refcount); - size_t i; TRACE("%p decreasing refcount to %lu.\n", iface, refcount); @@ -4294,9 +4303,7 @@ static ULONG WINAPI d2d_device_Release(ID2D1Device6 *iface) { IDXGIDevice_Release(device->dxgi_device); ID2D1Factory1_Release(device->factory); - for (i = 0; i < device->shaders.count; ++i) - IUnknown_Release(device->shaders.objects[i].shader); - free(device->shaders.objects); + d2d_device_indexed_objects_clear(&device->shaders); free(device); } @@ -4521,32 +4528,31 @@ void d2d_device_init(struct d2d_device *device, struct d2d_factory *factory, IDX IDXGIDevice_AddRef(device->dxgi_device); } -HRESULT d2d_device_add_shader(struct d2d_device *device, REFGUID shader_id, IUnknown *shader) +HRESULT d2d_device_add_indexed_object(struct d2d_indexed_objects *objects, + const GUID *id, IUnknown *object) { - struct d2d_shader *entry; - - if (!d2d_array_reserve((void **)&device->shaders.objects, &device->shaders.size, - device->shaders.count + 1, sizeof(*device->shaders.objects))) + if (!d2d_array_reserve((void **)&objects->elements, &objects->size, objects->count + 1, + sizeof(*objects->elements))) { - WARN("Failed to resize shaders array.\n"); + WARN("Failed to resize elements array.\n"); return E_OUTOFMEMORY; } - entry = &device->shaders.objects[device->shaders.count++]; - entry->id = *shader_id; - entry->shader = shader; - IUnknown_AddRef(entry->shader); + objects->elements[objects->count].id = *id; + objects->elements[objects->count].object = object; + IUnknown_AddRef(object); + objects->count++; return S_OK; } -BOOL d2d_device_is_shader_loaded(struct d2d_device *device, REFGUID shader_id) +BOOL d2d_device_is_object_indexed(struct d2d_indexed_objects *objects, const GUID *id) { size_t i; - for (i = 0; i < device->shaders.count; ++i) + for (i = 0; i < objects->count; ++i) { - if (IsEqualGUID(shader_id, &device->shaders.objects[i].id)) + if (IsEqualGUID(id, &objects->elements[i].id)) return TRUE; } diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index e7f9f78284f..0ad5fabbca7 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -1451,13 +1451,14 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadPixelShader(ID2D1EffectC REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size) { struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); + struct d2d_device *device = effect_context->device_context->device; ID3D11PixelShader *shader; HRESULT hr; TRACE("iface %p, shader_id %s, buffer %p, buffer_size %u.\n", iface, debugstr_guid(shader_id), buffer, buffer_size); - if (d2d_device_is_shader_loaded(effect_context->device_context->device, shader_id)) + if (d2d_device_is_object_indexed(&device->shaders, shader_id)) return S_OK; if (FAILED(hr = ID3D11Device1_CreatePixelShader(effect_context->device_context->d3d_device, @@ -1467,7 +1468,7 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadPixelShader(ID2D1EffectC return hr; } - hr = d2d_device_add_shader(effect_context->device_context->device, shader_id, (IUnknown *)shader); + hr = d2d_device_add_indexed_object(&device->shaders, shader_id, (IUnknown *)shader); ID3D11PixelShader_Release(shader); return hr; @@ -1477,13 +1478,14 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadVertexShader(ID2D1Effect REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size) { struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); + struct d2d_device *device = effect_context->device_context->device; ID3D11VertexShader *shader; HRESULT hr; TRACE("iface %p, shader_id %s, buffer %p, buffer_size %u.\n", iface, debugstr_guid(shader_id), buffer, buffer_size); - if (d2d_device_is_shader_loaded(effect_context->device_context->device, shader_id)) + if (d2d_device_is_object_indexed(&device->shaders, shader_id)) return S_OK; if (FAILED(hr = ID3D11Device1_CreateVertexShader(effect_context->device_context->d3d_device, @@ -1493,7 +1495,7 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadVertexShader(ID2D1Effect return hr; } - hr = d2d_device_add_shader(effect_context->device_context->device, shader_id, (IUnknown *)shader); + hr = d2d_device_add_indexed_object(&device->shaders, shader_id, (IUnknown *)shader); ID3D11VertexShader_Release(shader); return hr; @@ -1503,13 +1505,14 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadComputeShader(ID2D1Effec REFGUID shader_id, const BYTE *buffer, UINT32 buffer_size) { struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); + struct d2d_device *device = effect_context->device_context->device; ID3D11ComputeShader *shader; HRESULT hr; TRACE("iface %p, shader_id %s, buffer %p, buffer_size %u.\n", iface, debugstr_guid(shader_id), buffer, buffer_size); - if (d2d_device_is_shader_loaded(effect_context->device_context->device, shader_id)) + if (d2d_device_is_object_indexed(&device->shaders, shader_id)) return S_OK; if (FAILED(hr = ID3D11Device1_CreateComputeShader(effect_context->device_context->d3d_device, @@ -1519,7 +1522,7 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadComputeShader(ID2D1Effec return hr; } - hr = d2d_device_add_shader(effect_context->device_context->device, shader_id, (IUnknown *)shader); + hr = d2d_device_add_indexed_object(&device->shaders, shader_id, (IUnknown *)shader); ID3D11ComputeShader_Release(shader); return hr; @@ -1528,10 +1531,11 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_LoadComputeShader(ID2D1Effec static BOOL STDMETHODCALLTYPE d2d_effect_context_IsShaderLoaded(ID2D1EffectContext *iface, REFGUID shader_id) { struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); + struct d2d_device *device = effect_context->device_context->device; TRACE("iface %p, shader_id %s.\n", iface, debugstr_guid(shader_id)); - return d2d_device_is_shader_loaded(effect_context->device_context->device, shader_id); + return d2d_device_is_object_indexed(&device->shaders, shader_id); } static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateResourceTexture(ID2D1EffectContext *iface,

1 0