September 2021 - Wine-Commits

Conor McCarthy : tests: Add tests for an unbounded sampler array.
by Alexandre Julliard Sept. 8, 2021

Sept. 8, 2021

Module: vkd3d Branch: master Commit: ce07710f495748b2917513e06b96c6da7af92b04 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ce07710f495748b2917513e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Aug 24 01:23:21 2021 +1000 tests: Add tests for an unbounded sampler array. Based on a vkd3d-proton patch by Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 144 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index dede714..89b1f00 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -34979,6 +34979,149 @@ done: destroy_test_context(&context); } +static void test_unbounded_samplers(void) +{ + ID3D12DescriptorHeap *heap, *sampler_heap, *heaps[2]; + ID3D12Resource *input_texture, *output_buffer; + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_SAMPLER_DESC sampler_desc; + D3D12_SUBRESOURCE_DATA data; + struct resource_readback rb; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Device *device; + unsigned int i; + HRESULT hr; + + static const D3D12_DESCRIPTOR_RANGE descriptor_ranges[] = + { + {D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 1, 1, D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND}, + {D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER, UINT_MAX, 1, 1, D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND}, + }; + + static const D3D12_ROOT_PARAMETER root_parameters[] = + { + {D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE, .DescriptorTable = {1, &descriptor_ranges[0]}}, + {D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE, .DescriptorTable = {1, &descriptor_ranges[1]}}, + {D3D12_ROOT_PARAMETER_TYPE_UAV, .Descriptor = {1, 1}}, + }; + + static const DWORD cs_code[] = + { +#if 0 + Texture2D<float> t1 : register(t1, space1); + SamplerState s1[] : register(s1, space1); + RWByteAddressBuffer u1 : register(u1, space1); + + [numthreads(64, 1, 1)] + void main(uint id : SV_DispatchThreadID) + { + /* Should alternate between wrap (address 0.1), or clamp (address 1.0). */ + uint value = t1.SampleLevel(s1[NonUniformResourceIndex(id)], float2(1.1, 1.1), 0.0); + u1.Store(4 * id, value); + } +#endif + 0x43425844, 0x19feacce, 0xef7000f7, 0xd6411d98, 0x890a6fa4, 0x00000001, 0x00000178, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000124, 0x00050051, 0x00000049, 0x0100086a, + 0x0600005a, 0x00306e46, 0x00000000, 0x00000001, 0xffffffff, 0x00000001, 0x07001858, 0x00307e46, + 0x00000000, 0x00000001, 0x00000001, 0x00005555, 0x00000001, 0x0600009d, 0x0031ee46, 0x00000000, + 0x00000001, 0x00000001, 0x00000001, 0x0200005f, 0x00020012, 0x02000068, 0x00000001, 0x0400009b, + 0x00000040, 0x00000001, 0x00000001, 0x04000036, 0x00100012, 0x00000000, 0x0002000a, 0x13000048, + 0x00100012, 0x00000000, 0x00004002, 0x3f8ccccd, 0x3f8ccccd, 0x00000000, 0x00000000, 0x00207e46, + 0x00000000, 0x00000001, 0x86206000, 0x00020001, 0x00000000, 0x00000001, 0x0010000a, 0x00000000, + 0x00004001, 0x00000000, 0x0500001c, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x06000029, + 0x00100022, 0x00000000, 0x0002000a, 0x00004001, 0x00000002, 0x080000a6, 0x0021e012, 0x00000000, + 0x00000001, 0x0010001a, 0x00000000, 0x0010000a, 0x00000000, 0x0100003e, + }; + + static const float texture_data[] = {10.0f, 100.0f, 100.0f, 100.0f}; + + if (!init_compute_test_context(&context)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); + root_signature_desc.Flags = 0; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.pParameters = root_parameters; + + hr = create_root_signature(device, &root_signature_desc, &context.root_signature); + todo + ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr); + if (FAILED(hr)) + goto done; + + input_texture = create_default_texture2d(device, 2, 2, 1, 1, DXGI_FORMAT_R32_FLOAT, D3D12_RESOURCE_FLAG_NONE, + D3D12_RESOURCE_STATE_COPY_DEST); + data.pData = texture_data; + data.RowPitch = 2 * sizeof(uint32_t); + data.SlicePitch = 2 * data.RowPitch; + upload_texture_data(input_texture, &data, 1, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, input_texture, D3D12_RESOURCE_STATE_COPY_DEST, + D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE); + + output_buffer = create_default_buffer(device, 64 * sizeof(uint32_t), D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + + context.pipeline_state = create_compute_pipeline_state(device, + context.root_signature, shader_bytecode(cs_code, sizeof(cs_code))); + + heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + sampler_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER, 64); + + srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING; + srv_desc.Format = DXGI_FORMAT_R32_FLOAT; + srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D; + srv_desc.Texture2D.MipLevels = 1; + srv_desc.Texture2D.MostDetailedMip = 0; + srv_desc.Texture2D.PlaneSlice = 0; + srv_desc.Texture2D.ResourceMinLODClamp = 0; + ID3D12Device_CreateShaderResourceView(device, input_texture, &srv_desc, + ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap)); + + for (i = 0; i < 64; ++i) + { + memset(&sampler_desc, 0, sizeof(sampler_desc)); + sampler_desc.Filter = D3D12_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.AddressU = sampler_desc.AddressV = sampler_desc.AddressW + = (i & 1) ? D3D12_TEXTURE_ADDRESS_MODE_CLAMP : D3D12_TEXTURE_ADDRESS_MODE_WRAP; + ID3D12Device_CreateSampler(device, &sampler_desc, get_cpu_descriptor_handle(&context, sampler_heap, i)); + } + + ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + heaps[0] = heap; heaps[1] = sampler_heap; + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 2, heaps); + ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap)); + ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 1, ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(sampler_heap)); + ID3D12GraphicsCommandList_SetComputeRootUnorderedAccessView(command_list, 2, ID3D12Resource_GetGPUVirtualAddress(output_buffer)); + ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1); + + transition_resource_state(command_list, output_buffer, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_buffer_readback_with_command_list(output_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); + for (i = 0; i < 64; ++i) + { + unsigned int value = get_readback_uint(&rb, i, 0, 0); + unsigned int expected = (i & 1) ? 100 : 10; + ok(value == expected, "Got %u, expected %u at %u.\n", value, expected, i); + } + release_resource_readback(&rb); + + ID3D12Resource_Release(input_texture); + ID3D12Resource_Release(output_buffer); + ID3D12DescriptorHeap_Release(heap); + ID3D12DescriptorHeap_Release(sampler_heap); +done: + destroy_test_context(&context); +} + START_TEST(d3d12) { parse_args(argc, argv); @@ -35151,4 +35294,5 @@ START_TEST(d3d12) run_test(test_hull_shader_patch_constant_inputs); run_test(test_resource_arrays); run_test(test_unbounded_resource_arrays); + run_test(test_unbounded_samplers); }

1 0

Conor McCarthy : vkd3d: Handle D3D_PRIMITIVE_TOPOLOGY_UNDEFINED.
by Alexandre Julliard Sept. 8, 2021

Sept. 8, 2021

Module: vkd3d Branch: master Commit: 471b8e2206a9ee8fc57af36e181f96049282ddb8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=471b8e2206a9ee8fc57af36… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Sep 4 00:58:56 2021 +1000 vkd3d: Handle D3D_PRIMITIVE_TOPOLOGY_UNDEFINED. Bundles need to set an undefined topology to match D3D12 behaviour. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 6 ------ libs/vkd3d/state.c | 8 ++++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 46c0c3a..9f4a414 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3660,12 +3660,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetPrimitiveTopology(ID3D12Gr TRACE("iface %p, topology %#x.\n", iface, topology); - if (topology == D3D_PRIMITIVE_TOPOLOGY_UNDEFINED) - { - WARN("Ignoring D3D_PRIMITIVE_TOPOLOGY_UNDEFINED.\n"); - return; - } - if (list->primitive_topology == topology) return; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 58463e5..4eccf1e 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2754,6 +2754,8 @@ static enum VkPrimitiveTopology vk_topology_from_d3d12_topology(D3D12_PRIMITIVE_ case D3D_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST: case D3D_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST: return VK_PRIMITIVE_TOPOLOGY_PATCH_LIST; + case D3D_PRIMITIVE_TOPOLOGY_UNDEFINED: + return VK_PRIMITIVE_TOPOLOGY_MAX_ENUM; default: FIXME("Unhandled primitive topology %#x.\n", topology); return VK_PRIMITIVE_TOPOLOGY_POINT_LIST; @@ -2938,6 +2940,12 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta ia_desc.topology = vk_topology_from_d3d12_topology(topology); ia_desc.primitiveRestartEnable = !!graphics->index_buffer_strip_cut_value; + if (ia_desc.topology == VK_PRIMITIVE_TOPOLOGY_MAX_ENUM) + { + WARN("Primitive topology is undefined.\n"); + return VK_NULL_HANDLE; + } + tessellation_info.sType = VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO; tessellation_info.pNext = NULL; tessellation_info.flags = 0;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Parse function calls.
by Alexandre Julliard Sept. 8, 2021

Sept. 8, 2021

Module: vkd3d Branch: master Commit: 32ba154eb26879be49bcbb1afcf43f517f3ec1bc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=32ba154eb26879be49bcbb1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 1 17:20:52 2021 -0500 vkd3d-shader/hlsl: Parse function calls. 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: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 77 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 26ba469..ddc429b 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1523,6 +1523,67 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t return statements_list; } +struct find_function_call_args +{ + const struct parse_initializer *params; + const struct hlsl_ir_function_decl *decl; +}; + +static void find_function_call_exact(struct rb_entry *entry, void *context) +{ + const struct hlsl_ir_function_decl *decl = RB_ENTRY_VALUE(entry, const struct hlsl_ir_function_decl, entry); + struct find_function_call_args *args = context; + const struct hlsl_ir_var *param; + unsigned int i = 0; + + LIST_FOR_EACH_ENTRY(param, decl->parameters, struct hlsl_ir_var, param_entry) + { + if (i >= args->params->args_count + || !hlsl_types_are_equal(param->data_type, args->params->args[i++]->data_type)) + return; + } + if (i == args->params->args_count) + args->decl = decl; +} + +static const struct hlsl_ir_function_decl *find_function_call(struct hlsl_ctx *ctx, + const char *name, const struct parse_initializer *params) +{ + struct find_function_call_args args = {.params = params}; + struct hlsl_ir_function *func; + struct rb_entry *entry; + + if (!(entry = rb_get(&ctx->functions, name))) + return NULL; + func = RB_ENTRY_VALUE(entry, struct hlsl_ir_function, entry); + + rb_for_each_entry(&func->overloads, find_function_call_exact, &args); + if (!args.decl) + FIXME("Search for compatible overloads.\n"); + return args.decl; +} + +static struct list *add_call(struct hlsl_ctx *ctx, const char *name, + struct parse_initializer *params, struct vkd3d_shader_location loc) +{ + const struct hlsl_ir_function_decl *decl; + + if ((decl = find_function_call(ctx, name, params))) + { + hlsl_fixme(ctx, loc, "Call to user-defined function \"%s\".", name); + free_parse_initializer(params); + return NULL; + } + else + { + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Function \"%s\" is not defined.", name); + free_parse_initializer(params); + return NULL; + } + vkd3d_free(params->args); + return params->instrs; +} + } %locations @@ -1714,6 +1775,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t %type <function> func_prototype %type <initializer> complex_initializer +%type <initializer> func_arguments %type <initializer> initializer_expr_list %type <if_body> if_body @@ -2575,6 +2637,16 @@ expr_statement: $$ = $1; } +func_arguments: + %empty + { + $$.args = NULL; + $$.args_count = 0; + if (!($$.instrs = make_empty_list(ctx))) + YYABORT; + } + | initializer_expr_list + primary_expr: C_FLOAT { @@ -2631,6 +2703,11 @@ primary_expr: { $$ = $2; } + | var_identifier '(' func_arguments ')' + { + if (!($$ = add_call(ctx, $1, &$3, @1))) + YYABORT; + } postfix_expr: primary_expr

1 0

Zebediah Figura : tests: Add a simple test for function overloads.
by Alexandre Julliard Sept. 8, 2021

Sept. 8, 2021

Module: vkd3d Branch: master Commit: 6e182e02063bf3ede75d5b9c1e1edc334dfce300 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6e182e02063bf3ede75d5b9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 1 17:20:51 2021 -0500 tests: Add a simple test for function overloads. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ tests/hlsl-function-overload.shader_test | 40 ++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/Makefile.am b/Makefile.am index f51233c..721a6b6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,6 +58,7 @@ vkd3d_shader_tests = \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ + tests/hlsl-function-overload.shader_test \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ @@ -266,6 +267,7 @@ XFAIL_TESTS = \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-comma.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ + tests/hlsl-function-overload.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-nested-arrays.shader_test \ diff --git a/tests/hlsl-function-overload.shader_test b/tests/hlsl-function-overload.shader_test new file mode 100644 index 0000000..c6e0ccf --- /dev/null +++ b/tests/hlsl-function-overload.shader_test @@ -0,0 +1,40 @@ +[pixel shader fail] +/* The same function signature cannot be defined twice. */ + +float func(int arg) +{ + return 0.1; +} + +float func(int arg) +{ + return 0.1; +} + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader] +/* Test a basic overload. */ +float func(int arg) +{ + return 0.1; +} + +float func(uint arg) +{ + return 0.2; +} + +float4 main() : sv_target +{ + int i = 1; + uint u = 1; + return float4(func(i), func(u), func(int2(1, 1)), func(uint2(1, 1))); +} + +[test] +draw quad +probe all rgba (0.1, 0.2, 0.1, 0.2)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Parse the clamp() intrinsic.
by Alexandre Julliard Sept. 8, 2021

Sept. 8, 2021

Module: vkd3d Branch: master Commit: d035f3c2ffc45c634c405f7d245668e05de7326d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d035f3c2ffc45c634c405f7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 1 17:20:55 2021 -0500 vkd3d-shader/hlsl: Parse the clamp() intrinsic. 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: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ libs/vkd3d-shader/hlsl.y | 15 +++++++++++++++ tests/hlsl-clamp.shader_test | 10 ++++++++++ 3 files changed, 27 insertions(+) diff --git a/Makefile.am b/Makefile.am index 09d3755..3c18c31 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,6 +56,7 @@ vkd3d_shader_runners = \ vkd3d_shader_tests = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-clamp.shader_test \ tests/hlsl-comma.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-function-overload.shader_test \ @@ -266,6 +267,7 @@ SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 XFAIL_TESTS = \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-clamp.shader_test \ tests/hlsl-comma.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-function-overload.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index d374f64..8f63472 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1555,6 +1555,20 @@ static const struct hlsl_ir_function_decl *find_function_call(struct hlsl_ctx *c return args.decl; } +static bool intrinsic_clamp(struct hlsl_ctx *ctx, + const struct parse_initializer *params, struct vkd3d_shader_location loc) +{ + struct hlsl_ir_node *args[3] = {params->args[0], params->args[1]}; + struct hlsl_ir_expr *max; + + if (!(max = add_expr(ctx, params->instrs, HLSL_OP2_MAX, args, &loc))) + return false; + + args[0] = &max->node; + args[1] = params->args[2]; + return !!add_expr(ctx, params->instrs, HLSL_OP2_MIN, args, &loc); +} + static bool intrinsic_max(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { @@ -1572,6 +1586,7 @@ static const struct intrinsic_function } intrinsic_functions[] = { + {"clamp", 3, true, intrinsic_clamp}, {"max", 2, true, intrinsic_max}, }; diff --git a/tests/hlsl-clamp.shader_test b/tests/hlsl-clamp.shader_test new file mode 100644 index 0000000..73f396f --- /dev/null +++ b/tests/hlsl-clamp.shader_test @@ -0,0 +1,10 @@ +[pixel shader] +float4 main(uniform float u, uniform float v, uniform float w) : sv_target +{ + return float4(clamp(u, v, w), clamp(0.9, v, w), clamp(u, -0.5, w), clamp(0.6, -0.4, 0.3)); +} + +[test] +uniform 0 float4 -0.3 -0.1 0.7 0.0 +draw quad +probe all rgba (-0.1, 0.7, -0.3, 0.3)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use get_overloaded_func() only to find exact matches.
by Alexandre Julliard Sept. 8, 2021

Sept. 8, 2021

Module: vkd3d Branch: master Commit: f86e4d6b92fac2154de96bbed021d4fc754dddf0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f86e4d6b92fac2154de96bb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 1 17:20:53 2021 -0500 vkd3d-shader/hlsl: Use get_overloaded_func() only to find exact matches. The parameters are specified as a list of hlsl_ir_var structures, but add_call() is given an array of hlsl_ir_node pointers. Even if the former were changed to use an array instead, it's not worth trying to reuse the same function for both cases. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ddc429b..2512bcc 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -790,25 +790,17 @@ static struct hlsl_reg_reservation parse_reg_reservation(const char *reg_string) return reservation; } -static const struct hlsl_ir_function_decl *get_overloaded_func(struct rb_tree *funcs, char *name, - struct list *params, bool exact_signature) +static const struct hlsl_ir_function_decl *get_func_decl(struct rb_tree *funcs, char *name, struct list *params) { struct hlsl_ir_function *func; struct rb_entry *entry; - entry = rb_get(funcs, name); - if (entry) + if ((entry = rb_get(funcs, name))) { func = RB_ENTRY_VALUE(entry, struct hlsl_ir_function, entry); - entry = rb_get(&func->overloads, params); - if (!entry) - { - if (!exact_signature) - FIXME("No exact match, search for a compatible overloaded function (if any).\n"); - return NULL; - } - return RB_ENTRY_VALUE(entry, struct hlsl_ir_function_decl, entry); + if ((entry = rb_get(&func->overloads, params))) + return RB_ENTRY_VALUE(entry, struct hlsl_ir_function_decl, entry); } return NULL; } @@ -1813,7 +1805,7 @@ hlsl_prog: { const struct hlsl_ir_function_decl *decl; - decl = get_overloaded_func(&ctx->functions, $2.name, $2.decl->parameters, true); + decl = get_func_decl(&ctx->functions, $2.name, $2.decl->parameters); if (decl && !decl->func->intrinsic) { if (decl->body && $2.decl->body)

1 0

Conor McCarthy : vkd3d-shader: Free the capabilities array on spirv builder destruction.
by Alexandre Julliard Sept. 8, 2021

Sept. 8, 2021

Module: vkd3d Branch: master Commit: eb3d8c911c676f3839d47eebc5ef8e8202783e90 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=eb3d8c911c676f3839d47ee… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Sep 2 23:41:16 2021 +1000 vkd3d-shader: Free the capabilities array on spirv builder destruction. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 695882c..6f948c3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1800,6 +1800,8 @@ static void vkd3d_spirv_builder_free(struct vkd3d_spirv_builder *builder) vkd3d_spirv_stream_free(&builder->insertion_stream); + vkd3d_free(builder->capabilities); + rb_destroy(&builder->declarations, vkd3d_spirv_declaration_free, NULL); vkd3d_free(builder->iface);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Parse the max() intrinsic.
by Alexandre Julliard Sept. 8, 2021

Sept. 8, 2021

Module: vkd3d Branch: master Commit: 99674ab60f417efd7a40f8e5d012ec400b97f2a6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=99674ab60f417efd7a40f8e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 1 17:20:54 2021 -0500 vkd3d-shader/hlsl: Parse the max() intrinsic. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ libs/vkd3d-shader/hlsl.y | 67 +++++++++++++++++++++++++++++++++++++++++++++ tests/max.shader_test | 23 ++++++++++++++++ tests/shader_runner_d3d12.c | 2 ++ 4 files changed, 94 insertions(+) diff --git a/Makefile.am b/Makefile.am index 721a6b6..09d3755 100644 --- a/Makefile.am +++ b/Makefile.am @@ -72,6 +72,7 @@ vkd3d_shader_tests = \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ + tests/max.shader_test \ tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ tests/preproc-if-expr.shader_test \ @@ -278,6 +279,7 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ + tests/max.shader_test \ tests/trigonometry.shader_test \ tests/writemask-assignop-1.shader_test endif diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2512bcc..d374f64 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1555,10 +1555,38 @@ static const struct hlsl_ir_function_decl *find_function_call(struct hlsl_ctx *c return args.decl; } +static bool intrinsic_max(struct hlsl_ctx *ctx, + const struct parse_initializer *params, struct vkd3d_shader_location loc) +{ + struct hlsl_ir_node *args[3] = {params->args[0], params->args[1]}; + + return !!add_expr(ctx, params->instrs, HLSL_OP2_MAX, args, &loc); +} + +static const struct intrinsic_function +{ + const char *name; + int param_count; + bool check_numeric; + bool (*handler)(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc); +} +intrinsic_functions[] = +{ + {"max", 2, true, intrinsic_max}, +}; + +static int intrinsic_function_name_compare(const void *a, const void *b) +{ + const struct intrinsic_function *func = b; + + return strcmp(a, func->name); +} + static struct list *add_call(struct hlsl_ctx *ctx, const char *name, struct parse_initializer *params, struct vkd3d_shader_location loc) { const struct hlsl_ir_function_decl *decl; + struct intrinsic_function *intrinsic; if ((decl = find_function_call(ctx, name, params))) { @@ -1566,6 +1594,45 @@ static struct list *add_call(struct hlsl_ctx *ctx, const char *name, free_parse_initializer(params); return NULL; } + else if ((intrinsic = bsearch(name, intrinsic_functions, ARRAY_SIZE(intrinsic_functions), + sizeof(*intrinsic_functions), intrinsic_function_name_compare))) + { + if (intrinsic->param_count >= 0 && params->args_count != intrinsic->param_count) + { + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Wrong number of arguments to function '%s': expected %u, but got %u.\n", + name, intrinsic->param_count, params->args_count); + free_parse_initializer(params); + return NULL; + } + + if (intrinsic->check_numeric) + { + unsigned int i; + + for (i = 0; i < params->args_count; ++i) + { + if (params->args[i]->data_type->type > HLSL_CLASS_LAST_NUMERIC) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(ctx, params->args[i]->data_type))) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Wrong type for argument %u of '%s': expected a numeric type, but got '%s'.\n", + i + 1, name, string->buffer); + hlsl_release_string_buffer(ctx, string); + free_parse_initializer(params); + return NULL; + } + } + } + + if (!intrinsic->handler(ctx, params, loc)) + { + free_parse_initializer(params); + return NULL; + } + } else { hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED, "Function \"%s\" is not defined.", name); diff --git a/tests/max.shader_test b/tests/max.shader_test new file mode 100644 index 0000000..56c9a84 --- /dev/null +++ b/tests/max.shader_test @@ -0,0 +1,23 @@ +[pixel shader] +float4 main(uniform float u, uniform float v) : sv_target +{ + return float4(max(u, v), max(2, 2.1), max(true, 2), max(-1, -1)); +} + +[test] +uniform 0 float4 0.7 -0.1 0.0 0.0 +draw quad +probe all rgba (0.7, 2.1, 2.0, -1.0) + +[pixel shader] +float4 main(uniform float2 u, uniform float2 v) : sv_target +{ + float3 a = float3(-0.1, 0.2, 0.3); + + return float4(max(u, v), max(a, u)); +} + +[test] +uniform 0 float4 0.7 -0.1 0.4 0.8 +draw quad +probe all rgba (0.7, 0.8, 0.7, 0.2) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 3cc859a..2221c0f 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -136,6 +136,8 @@ static void parse_test_directive(struct shader_context *context, const char *lin static const float clear_color[4]; ID3D12PipelineState *pso; + if (context->c.root_signature) + ID3D12RootSignature_Release(context->c.root_signature); context->c.root_signature = create_32bit_constants_root_signature(context->c.device, 0, context->uniform_count, D3D12_SHADER_VISIBILITY_ALL);

1 0

Eric Pouech : dbghelp: Add internal_line_t structure as help in Line manipulation.
by Alexandre Julliard Sept. 7, 2021

Sept. 7, 2021

Module: wine Branch: master Commit: fabc4f7e124a50a22da258987d8ca410203e90d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fabc4f7e124a50a22da25898… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Sep 7 09:26:43 2021 +0200 dbghelp: Add internal_line_t structure as help in Line manipulation. the rationale is that: - the file name in IMAGEHLP_LINE* structures is returned as a pointer to an internal buffer - in the W64 variant of APIs, two calls to fetch_buffer() are currently needed (one for first A allocation, second for W conversion) - this generate bugs as it's assumed the two buffers are different so the internal_line_t purpose is to factorize the implementations of the 3 variants (A32, A64, W64) into a single code path this insures a unique allocation, and at most, one conversion Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 206 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 146 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fabc4f7e124a50a22da2…

1 0

Fabian Maurer : mpr: Fix copy paste error when converting hex char to int.
by Alexandre Julliard Sept. 7, 2021

Sept. 7, 2021

Module: wine Branch: master Commit: 63737942a06183f6b2e7fa8f95a07c918c9bf29b URL: https://source.winehq.org/git/wine.git/?a=commit;h=63737942a06183f6b2e7fa8f… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Sep 7 20:03:09 2021 +0200 mpr: Fix copy paste error when converting hex char to int. Spotted by Robert Naumann. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51728 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/pwcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mpr/pwcache.c b/dlls/mpr/pwcache.c index aa09522a5f9..f330a2a000a 100644 --- a/dlls/mpr/pwcache.c +++ b/dlls/mpr/pwcache.c @@ -45,7 +45,7 @@ static inline signed char ctox( CHAR x ) return x - '0'; if( ( x >= 'A' ) && ( x <= 'F' ) ) return x - 'A' + 10; - if( ( x >= 'a' ) && ( x <= 'a' ) ) + if( ( x >= 'a' ) && ( x <= 'f' ) ) return x - 'a' + 10; return -1; }

1 0