winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
May 2024
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
1 participants
705 discussions
Start a n
N
ew thread
Conor McCarthy : tests/shader-runner: Skip shader model 6.0 tests if the device does not support them.
by Alexandre Julliard
02 May '24
02 May '24
Module: vkd3d Branch: master Commit: 9315bcb6a10d9860b744280a928149d365a828dd URL:
https://gitlab.winehq.org/wine/vkd3d/-/commit/9315bcb6a10d9860b744280a92814…
Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Apr 24 10:51:11 2024 +1000 tests/shader-runner: Skip shader model 6.0 tests if the device does not support them. --- tests/shader_runner_d3d12.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 593d0759..be1e10ed 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -753,6 +753,16 @@ static void d3d12_runner_init_caps(struct d3d12_shader_runner *runner) runner->caps.rov = options.ROVsSupported; } +static bool device_supports_shader_model_6_0(ID3D12Device *device) +{ + D3D12_FEATURE_DATA_SHADER_MODEL sm = {D3D_SHADER_MODEL_6_0}; + HRESULT hr; + + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_SHADER_MODEL, &sm, sizeof(sm)); + ok(hr == S_OK, "Failed to check feature shader model support, hr %#x.\n", hr); + return sm.HighestShaderModel >= D3D_SHADER_MODEL_6_0; +} + void run_shader_tests_d3d12(void *dxc_compiler) { static const struct test_context_desc desc = @@ -792,7 +802,11 @@ void run_shader_tests_d3d12(void *dxc_compiler) { runner.caps.minimum_shader_model = SHADER_MODEL_6_0; runner.caps.maximum_shader_model = SHADER_MODEL_6_0; - run_shader_tests(&runner.r, &runner.caps, &d3d12_runner_ops, dxc_compiler); + + if (device_supports_shader_model_6_0(device)) + run_shader_tests(&runner.r, &runner.caps, &d3d12_runner_ops, dxc_compiler); + else + trace("Device does not support shader model 6.0.\n"); } ID3D12GraphicsCommandList_Release(runner.compute_list);
1
0
0
0
Conor McCarthy : vkd3d: Initialise wave ops feature options.
by Alexandre Julliard
02 May '24
02 May '24
Module: vkd3d Branch: master Commit: fd590c2593bda2e511ba688c8881fbdb2d564774 URL:
https://gitlab.winehq.org/wine/vkd3d/-/commit/fd590c2593bda2e511ba688c8881f…
Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jun 20 15:16:52 2023 +1000 vkd3d: Initialise wave ops feature options. Based in part on a vkd3d-proton patch by Philip Rebohle. --- libs/vkd3d/device.c | 36 ++++++++++++++++++++++++++++++++---- libs/vkd3d/state.c | 2 ++ tests/hlsl/wave-ops-uint.shader_test | 2 +- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index cb2b6ad0..3f3332dd 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -788,6 +788,11 @@ VkInstance vkd3d_instance_get_vk_instance(struct vkd3d_instance *instance) return instance->vk_instance; } +static bool d3d12_device_environment_is_vulkan_min_1_1(struct d3d12_device *device) +{ + return device->environment == VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_1; +} + struct vkd3d_physical_device_info { /* properties */ @@ -796,6 +801,7 @@ struct vkd3d_physical_device_info VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT texel_buffer_alignment_properties; VkPhysicalDeviceTransformFeedbackPropertiesEXT xfb_properties; VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT vertex_divisor_properties; + VkPhysicalDeviceSubgroupProperties subgroup_properties; VkPhysicalDeviceProperties2KHR properties2; @@ -838,6 +844,7 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i VkPhysicalDevice4444FormatsFeaturesEXT *formats4444_features; VkPhysicalDeviceTransformFeedbackFeaturesEXT *xfb_features; struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; + VkPhysicalDeviceSubgroupProperties *subgroup_properties; memset(info, 0, sizeof(*info)); conditional_rendering_features = &info->conditional_rendering_features; @@ -857,6 +864,7 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i formats4444_features = &info->formats4444_features; xfb_features = &info->xfb_features; xfb_properties = &info->xfb_properties; + subgroup_properties = &info->subgroup_properties; info->features2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2; @@ -902,6 +910,9 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i vk_prepend_struct(&info->properties2, xfb_properties); vertex_divisor_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT; vk_prepend_struct(&info->properties2, vertex_divisor_properties); + subgroup_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES; + if (d3d12_device_environment_is_vulkan_min_1_1(device)) + vk_prepend_struct(&info->properties2, subgroup_properties); if (vulkan_info->KHR_get_physical_device_properties2) VK_CALL(vkGetPhysicalDeviceProperties2KHR(physical_device, &info->properties2)); @@ -1509,6 +1520,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, struct vkd3d_physical_device_info *physical_device_info, uint32_t *device_extension_count, bool **user_extension_supported) { + const VkPhysicalDeviceSubgroupProperties *subgroup_properties = &physical_device_info->subgroup_properties; const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT *fragment_shader_interlock; const struct vkd3d_optional_device_extensions_info *optional_extensions; @@ -1520,6 +1532,16 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, uint32_t count; VkResult vr; + /* SHUFFLE is required to implement WaveReadLaneAt with dynamically uniform index before SPIR-V 1.5 / Vulkan 1.2. */ + static const VkSubgroupFeatureFlags required_subgroup_features = VK_SUBGROUP_FEATURE_ARITHMETIC_BIT + | VK_SUBGROUP_FEATURE_BASIC_BIT + | VK_SUBGROUP_FEATURE_BALLOT_BIT + | VK_SUBGROUP_FEATURE_SHUFFLE_BIT + | VK_SUBGROUP_FEATURE_QUAD_BIT + | VK_SUBGROUP_FEATURE_VOTE_BIT; + + static const VkSubgroupFeatureFlags required_stages = VK_SHADER_STAGE_COMPUTE_BIT | VK_SHADER_STAGE_FRAGMENT_BIT; + *device_extension_count = 0; vkd3d_trace_physical_device(physical_device, physical_device_info, vk_procs); @@ -1583,10 +1605,12 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, device->feature_options.ResourceHeapTier = D3D12_RESOURCE_HEAP_TIER_2; /* Shader Model 6 support. */ - device->feature_options1.WaveOps = FALSE; - device->feature_options1.WaveLaneCountMin = 0; - device->feature_options1.WaveLaneCountMax = 0; - device->feature_options1.TotalLaneCount = 0; + device->feature_options1.WaveOps = subgroup_properties->subgroupSize >= 4 + && (subgroup_properties->supportedOperations & required_subgroup_features) == required_subgroup_features + && (subgroup_properties->supportedStages & required_stages) == required_stages; + device->feature_options1.WaveLaneCountMin = subgroup_properties->subgroupSize; + device->feature_options1.WaveLaneCountMax = subgroup_properties->subgroupSize; + device->feature_options1.TotalLaneCount = 32 * subgroup_properties->subgroupSize; /* approx. */ device->feature_options1.ExpandedComputeResourceStates = TRUE; device->feature_options1.Int64ShaderOps = features->shaderInt64; @@ -3434,7 +3458,11 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device9 TRACE("Request shader model %#x.\n", data->HighestShaderModel); +#ifdef VKD3D_SHADER_UNSUPPORTED_DXIL + data->HighestShaderModel = D3D_SHADER_MODEL_6_0; +#else data->HighestShaderModel = D3D_SHADER_MODEL_5_1; +#endif TRACE("Shader model %#x.\n", data->HighestShaderModel); return S_OK; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 6ba29c18..199d8043 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2159,6 +2159,8 @@ static unsigned int feature_flags_compile_option(const struct d3d12_device *devi flags |= VKD3D_SHADER_COMPILE_OPTION_FEATURE_INT64; if (device->feature_options.DoublePrecisionFloatShaderOps) flags |= VKD3D_SHADER_COMPILE_OPTION_FEATURE_FLOAT64; + if (device->feature_options1.WaveOps) + flags |= VKD3D_SHADER_COMPILE_OPTION_FEATURE_WAVE_OPS; return flags; } diff --git a/tests/hlsl/wave-ops-uint.shader_test b/tests/hlsl/wave-ops-uint.shader_test index c04b3951..033ac45b 100644 --- a/tests/hlsl/wave-ops-uint.shader_test +++ b/tests/hlsl/wave-ops-uint.shader_test @@ -81,7 +81,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rui (1) probe uav 1 (1) rui (1) probe uav 1 (2) rui (1)
1
0
0
0
Conor McCarthy : vkd3d-shader/spirv: Handle the WAVELANECOUNT register.
by Alexandre Julliard
02 May '24
02 May '24
Module: vkd3d Branch: master Commit: a130c970a693ef95f8bbcbb8dcb5380c111ad025 URL:
https://gitlab.winehq.org/wine/vkd3d/-/commit/a130c970a693ef95f8bbcbb8dcb53…
Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Apr 18 10:58:15 2024 +1000 vkd3d-shader/spirv: Handle the WAVELANECOUNT register. --- libs/vkd3d-shader/spirv.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index cb1f5ded..e76aa894 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2631,6 +2631,11 @@ static bool spirv_compiler_is_opengl_target(const struct spirv_compiler *compile return spirv_compiler_get_target_environment(compiler) == VKD3D_SHADER_SPIRV_ENVIRONMENT_OPENGL_4_5; } +static bool spirv_compiler_is_spirv_min_1_3_target(const struct spirv_compiler *compiler) +{ + return spirv_compiler_get_target_environment(compiler) == VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_1; +} + static bool spirv_compiler_is_target_extension_supported(const struct spirv_compiler *compiler, enum vkd3d_shader_spirv_extension extension) { @@ -3149,6 +3154,9 @@ static bool spirv_compiler_get_register_name(char *buffer, unsigned int buffer_s case VKD3DSPR_OUTSTENCILREF: snprintf(buffer, buffer_size, "oStencilRef"); break; + case VKD3DSPR_WAVELANECOUNT: + snprintf(buffer, buffer_size, "vWaveLaneCount"); + break; default: FIXME("Unhandled register %#x.\n", reg->type); snprintf(buffer, buffer_size, "unrecognized_%#x", reg->type); @@ -4534,6 +4542,9 @@ static void spirv_compiler_decorate_builtin(struct spirv_compiler *compiler, case SpvBuiltInCullDistance: vkd3d_spirv_enable_capability(builder, SpvCapabilityCullDistance); break; + case SpvBuiltInSubgroupSize: + vkd3d_spirv_enable_capability(builder, SpvCapabilityGroupNonUniform); + break; default: break; } @@ -4723,6 +4734,8 @@ vkd3d_register_builtins[] = {VKD3DSPR_DEPTHOUTLE, {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInFragDepth}}, {VKD3DSPR_OUTSTENCILREF, {VKD3D_SHADER_COMPONENT_UINT, 1, SpvBuiltInFragStencilRefEXT}}, + + {VKD3DSPR_WAVELANECOUNT, {VKD3D_SHADER_COMPONENT_UINT, 1, SpvBuiltInSubgroupSize}}, }; static void spirv_compiler_emit_register_execution_mode(struct spirv_compiler *compiler, @@ -5771,6 +5784,23 @@ static void spirv_compiler_emit_dcl_global_flags(struct spirv_compiler *compiler flags &= ~VKD3DSGF_ENABLE_INT64; } + if (flags & VKD3DSGF_ENABLE_WAVE_INTRINSICS) + { + if (!(compiler->features & VKD3D_SHADER_COMPILE_OPTION_FEATURE_WAVE_OPS)) + { + WARN("Unsupported wave ops.\n"); + spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_UNSUPPORTED_FEATURE, + "The target environment does not support wave ops."); + } + else if (!spirv_compiler_is_spirv_min_1_3_target(compiler)) + { + WARN("Wave ops enabled but environment does not support SPIR-V 1.3 or greater.\n"); + spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_UNSUPPORTED_FEATURE, + "The target environment uses wave ops but does not support SPIR-V 1.3 or greater."); + } + flags &= ~VKD3DSGF_ENABLE_WAVE_INTRINSICS; + } + if (flags & ~(VKD3DSGF_REFACTORING_ALLOWED | VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS)) FIXME("Unhandled global flags %#"PRIx64".\n", (uint64_t)flags); else
1
0
0
0
Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsics WaveGetLaneCount and WaveGetLaneIndex.
by Alexandre Julliard
02 May '24
02 May '24
Module: vkd3d Branch: master Commit: 6a56b4e5d81594648054e151adb60f22a51bb5fd URL:
https://gitlab.winehq.org/wine/vkd3d/-/commit/6a56b4e5d81594648054e151adb60…
Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Apr 18 10:35:07 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsics WaveGetLaneCount and WaveGetLaneIndex. --- libs/vkd3d-shader/d3d_asm.c | 8 ++++++++ libs/vkd3d-shader/dxil.c | 24 ++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 3 files changed, 34 insertions(+) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index cd8ba0a7..7a8bbfc1 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -1161,6 +1161,14 @@ static void shader_print_register(struct vkd3d_d3d_asm_compiler *compiler, const vkd3d_string_buffer_printf(buffer, "sr"); break; + case VKD3DSPR_WAVELANECOUNT: + vkd3d_string_buffer_printf(buffer, "vWaveLaneCount"); + break; + + case VKD3DSPR_WAVELANEINDEX: + vkd3d_string_buffer_printf(buffer, "vWaveLaneIndex"); + break; + default: vkd3d_string_buffer_printf(buffer, "%s<unhandled register type %#x>%s", compiler->colours.error, reg->type, compiler->colours.reset); diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index ccba66af..f68e3274 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -427,6 +427,8 @@ enum dx_intrinsic_opcode DX_STORE_PATCH_CONSTANT = 106, DX_OUTPUT_CONTROL_POINT_ID = 107, DX_PRIMITIVE_ID = 108, + DX_WAVE_GET_LANE_INDEX = 111, + DX_WAVE_GET_LANE_COUNT = 112, DX_LEGACY_F32TOF16 = 130, DX_LEGACY_F16TOF32 = 131, DX_RAW_BUFFER_LOAD = 139, @@ -5899,6 +5901,26 @@ static void sm6_parser_emit_dx_texture_store(struct sm6_parser *sm6, enum dx_int dst_param_init_with_mask(dst_param, write_mask); } +static void sm6_parser_emit_dx_wave_builtin(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + enum vkd3d_shader_register_type type; + + switch (op) + { + case DX_WAVE_GET_LANE_COUNT: + type = VKD3DSPR_WAVELANECOUNT; + break; + case DX_WAVE_GET_LANE_INDEX: + type = VKD3DSPR_WAVELANEINDEX; + break; + default: + vkd3d_unreachable(); + } + + sm6_parser_emit_dx_input_register_mov(sm6, state->ins, type, VKD3D_DATA_UINT); +} + struct sm6_dx_opcode_info { const char *ret_type; @@ -6018,6 +6040,8 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_UMAD ] = {"m", "RRR", sm6_parser_emit_dx_ma}, [DX_UMAX ] = {"m", "RR", sm6_parser_emit_dx_binary}, [DX_UMIN ] = {"m", "RR", sm6_parser_emit_dx_binary}, + [DX_WAVE_GET_LANE_COUNT ] = {"i", "", sm6_parser_emit_dx_wave_builtin}, + [DX_WAVE_GET_LANE_INDEX ] = {"i", "", sm6_parser_emit_dx_wave_builtin}, }; static bool sm6_parser_validate_operand_type(struct sm6_parser *sm6, const struct sm6_value *value, char info_type, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 165126b5..d0285fdc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -590,6 +590,8 @@ enum vkd3d_shader_register_type VKD3DSPR_OUTSTENCILREF, VKD3DSPR_UNDEF, VKD3DSPR_SSA, + VKD3DSPR_WAVELANECOUNT, + VKD3DSPR_WAVELANEINDEX, VKD3DSPR_COUNT,
1
0
0
0
Alexandre Julliard : ntdll: Generate stub entry points as x86-64 code on ARM64EC.
by Alexandre Julliard
02 May '24
02 May '24
Module: wine Branch: master Commit: 4e0e623859aefee9d28a383dffe155fd1cfb3f38 URL:
https://gitlab.winehq.org/wine/wine/-/commit/4e0e623859aefee9d28a383dffe155…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:28:29 2024 +0200 ntdll: Generate stub entry points as x86-64 code on ARM64EC. Partial revert of 220a70bee268415925d1ae747611f48e51665e64. --- dlls/ntdll/loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c5d82e8c68c..6e3f67ef593 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -436,7 +436,7 @@ struct stub const char *name; const void* entry; }; -#elif defined(__aarch64__) || defined(__arm64ec__) +#elif defined(__aarch64__) struct stub { DWORD ldr_x0; /* ldr x0, $dll */ @@ -500,7 +500,7 @@ static ULONG_PTR allocate_stub( const char *dll, const char *name ) stub->dll = dll; stub->name = name; stub->entry = stub_entry_point; -#elif defined(__aarch64__) || defined(__arm64ec__) +#elif defined(__aarch64__) stub->ldr_x0 = 0x580000a0; /* ldr x0, #20 ($dll) */ stub->ldr_x1 = 0x580000c1; /* ldr x1, #24 ($name) */ stub->mov_x2_lr = 0xaa1e03e2; /* mov x2, lr */
1
0
0
0
Alexandre Julliard : ntdll: Build __chkstk as x86-64 code on ARM64EC.
by Alexandre Julliard
02 May '24
02 May '24
Module: wine Branch: master Commit: 6d931c271a9c9df332c0a9fe084f667919f7081a URL:
https://gitlab.winehq.org/wine/wine/-/commit/6d931c271a9c9df332c0a9fe084f66…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:28:00 2024 +0200 ntdll: Build __chkstk as x86-64 code on ARM64EC. Based on a patch by Jacek Caban. --- dlls/ntdll/signal_arm64ec.c | 11 ----------- dlls/ntdll/signal_x86_64.c | 26 +++++++++++++++++--------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index e9e9b2a6bb3..8caf4218ab9 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -2323,17 +2323,6 @@ static void __attribute__((naked)) arm64x_check_call(void) } -/************************************************************************** - * __chkstk (NTDLL.@) - * - * Supposed to touch all the stack pages, but we shouldn't need that. - */ -void __attribute__((naked)) __chkstk(void) -{ - asm( "ret" ); -} - - /************************************************************************** * __chkstk_arm64ec (NTDLL.@) * diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 78afadbe387..d6218dc61b7 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -18,7 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#if defined(__x86_64__) && !defined(__arm64ec__) +#if 0 +#pragma makedep arm64ec_x64 +#endif + +#ifdef __x86_64__ #include <stdlib.h> #include <stdarg.h> @@ -34,6 +38,17 @@ #include "wine/debug.h" #include "ntsyscalls.h" + +/************************************************************************** + * __chkstk (NTDLL.@) + * + * Supposed to touch all the stack pages, but we shouldn't need that. + */ +__ASM_GLOBAL_FUNC( __chkstk, "ret" ); + + +#ifndef __arm64ec_x64__ + WINE_DEFAULT_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(relay); @@ -81,14 +96,6 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX } -/************************************************************************** - * __chkstk (NTDLL.@) - * - * Supposed to touch all the stack pages, but we shouldn't need that. - */ -__ASM_GLOBAL_FUNC( __chkstk, "ret" ); - - /*********************************************************************** * RtlCaptureContext (NTDLL.@) */ @@ -1043,4 +1050,5 @@ __ASM_GLOBAL_FUNC( DbgUserBreakPoint, "int $3; ret" "\n\tnop; nop; nop; nop; nop; nop; nop; nop" "\n\tnop; nop; nop; nop; nop; nop" ); +#endif /* __arm64ec_x64__ */ #endif /* __x86_64__ */
1
0
0
0
Alexandre Julliard : vcomp: Fix stack alignment in the fork wrapper on ARM.
by Alexandre Julliard
02 May '24
02 May '24
Module: wine Branch: master Commit: 8331003f7ef7b98f32e283370a941ddce25ed945 URL:
https://gitlab.winehq.org/wine/wine/-/commit/8331003f7ef7b98f32e283370a941d…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:25:11 2024 +0200 vcomp: Fix stack alignment in the fork wrapper on ARM. --- dlls/vcomp/fork.c | 53 ++++++++++++++++++++++++----------------------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/dlls/vcomp/fork.c b/dlls/vcomp/fork.c index 7ec9f394c14..c754a301d07 100644 --- a/dlls/vcomp/fork.c +++ b/dlls/vcomp/fork.c @@ -107,37 +107,32 @@ __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, #elif defined __arm__ __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, - "push {r4, r5, LR}\n\t" - "mov r4, r0\n\t" - "mov r5, SP\n\t" + "push {fp, lr}\n\t" + ".seh_save_regs_w {fp, lr}\n\t" + "mov fp, sp\n\t" + ".seh_save_sp fp\n\t" + ".seh_endprologue\n\t" "lsl r3, r1, #2\n\t" - "cmp r3, #0\n\t" - "beq 5f\n\t" - "sub SP, SP, r3\n\t" "tst r1, #1\n\t" - "it eq\n\t" - "subeq SP, SP, #4\n\t" - "1:\tsub r3, r3, #4\n\t" - "ldr r0, [r2, r3]\n\t" - "str r0, [SP, r3]\n\t" - "cmp r3, #0\n\t" - "bgt 1b\n\t" - "cmp r1, #1\n\t" - "bgt 2f\n\t" - "pop {r0}\n\t" - "b 5f\n\t" - "2:\tcmp r1, #2\n\t" - "bgt 3f\n\t" - "pop {r0-r1}\n\t" - "b 5f\n\t" - "3:\tcmp r1, #3\n\t" - "bgt 4f\n\t" - "pop {r0-r2}\n\t" - "b 5f\n\t" - "4:\tpop {r0-r3}\n\t" - "5:\tblx r4\n\t" - "mov SP, r5\n\t" - "pop {r4, r5, PC}" ) + "it ne\n\t" + "addne r3, r3, #4\n\t" + "cmp r3, #16\n\t" + "it lt\n\t" + "movlt r3, #16\n\t" + "sub sp, sp, r3\n\t" + "mov ip, r0\n\t" + "mov r3, #0\n\t" + "cmp r1, #0\n\t" + "beq 2f\n" + "1:\tldr r0, [r2, r3]\n\t" + "str r0, [sp, r3]\n\t" + "add r3, r3, #4\n\t" + "subs r1, r1, #1\n\t" + "bne 1b\n" + "2:\tpop {r0-r3}\n\t" + "blx ip\n\t" + "mov sp, fp\n\t" + "pop {fp, pc}" ) #elif defined __aarch64__
1
0
0
0
Alexandre Julliard : vcomp: Move the fork wrapper to a separate file.
by Alexandre Julliard
02 May '24
02 May '24
Module: wine Branch: master Commit: a1e553aa807809b01ae19d05a20376cd47b42fbd URL:
https://gitlab.winehq.org/wine/wine/-/commit/a1e553aa807809b01ae19d05a20376…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:25:01 2024 +0200 vcomp: Move the fork wrapper to a separate file. And build it as x86-64 code on ARM64EC. --- dlls/vcomp/Makefile.in | 1 + dlls/vcomp/fork.c | 173 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/main.c | 158 +----------------------------------------- dlls/vcomp100/Makefile.in | 1 + dlls/vcomp110/Makefile.in | 1 + dlls/vcomp120/Makefile.in | 1 + dlls/vcomp140/Makefile.in | 1 + 7 files changed, 180 insertions(+), 156 deletions(-)
1
0
0
0
Alexandre Julliard : oleaut32: Move the call_method thunk to a separate file.
by Alexandre Julliard
02 May '24
02 May '24
Module: wine Branch: master Commit: 6af17eec91f37149c34cee7eef2f24bcd47209cb URL:
https://gitlab.winehq.org/wine/wine/-/commit/6af17eec91f37149c34cee7eef2f24…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:24:48 2024 +0200 oleaut32: Move the call_method thunk to a separate file. And build it as x86-64 code on ARM64EC. --- dlls/oleaut32/Makefile.in | 1 + dlls/oleaut32/thunks.c | 187 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 145 ----------------------------------- 3 files changed, 188 insertions(+), 145 deletions(-)
1
0
0
0
Alexandre Julliard : widl: Default to fully interpreted stubs mode.
by Alexandre Julliard
02 May '24
02 May '24
Module: wine Branch: master Commit: 64923f3feead5ed89f00ccd124f8ac67e6946267 URL:
https://gitlab.winehq.org/wine/wine/-/commit/64923f3feead5ed89f00ccd124f8ac…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 2 09:22:40 2024 +0200 widl: Default to fully interpreted stubs mode. --- dlls/actxprxy/Makefile.in | 2 -- dlls/avifil32/Makefile.in | 2 -- dlls/combase/Makefile.in | 2 -- dlls/dispex/Makefile.in | 2 -- dlls/ia2comproxy/Makefile.in | 2 -- dlls/ieproxy/Makefile.in | 2 -- dlls/msctfp/Makefile.in | 2 -- dlls/msdaps/Makefile.in | 1 - dlls/msi/Makefile.in | 2 +- dlls/mstask/Makefile.in | 2 -- dlls/netapi32/Makefile.in | 2 -- dlls/ntoskrnl.exe/Makefile.in | 2 -- dlls/ole32/Makefile.in | 2 -- dlls/oleacc/Makefile.in | 2 -- dlls/oleaut32/Makefile.in | 2 -- dlls/qmgrprxy/Makefile.in | 2 -- dlls/quartz/Makefile.in | 2 -- dlls/rpcrt4/Makefile.in | 2 -- dlls/rpcrt4/tests/Makefile.in | 2 +- dlls/schedsvc/Makefile.in | 2 -- dlls/schedsvc/tests/Makefile.in | 2 -- dlls/sechost/Makefile.in | 2 -- dlls/sti/Makefile.in | 1 - dlls/taskschd/Makefile.in | 1 - dlls/urlmon/Makefile.in | 2 -- dlls/windowscodecs/Makefile.in | 2 -- programs/plugplay/Makefile.in | 1 - programs/rpcss/Makefile.in | 1 - programs/services/Makefile.in | 1 - tools/widl/widl.c | 2 +- tools/widl/widl.man.in | 2 +- 31 files changed, 4 insertions(+), 52 deletions(-)
1
0
0
0
← Newer
1
...
65
66
67
68
69
70
71
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
Results per page:
10
25
50
100
200