wine-commits July 2021

wine-commits@winehq.org

1 participants
728 discussions

Conor McCarthy : vkd3d: Rename d3d12_pipeline_state_init_compute_uav_counters() and handle pixel shaders.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: vkd3d Branch: master Commit: a4250e7d7115a9ee3bfba359d2a5899179c3e11c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a4250e7d7115a9ee3bfba35… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jul 15 01:47:42 2021 +1000 vkd3d: Rename d3d12_pipeline_state_init_compute_uav_counters() and handle pixel shaders. 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/state.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index e459c99..4537e31 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1414,9 +1414,9 @@ static HRESULT vkd3d_create_compute_pipeline(struct d3d12_device *device, return S_OK; } -static HRESULT d3d12_pipeline_state_init_compute_uav_counters(struct d3d12_pipeline_state *state, +static HRESULT d3d12_pipeline_state_init_uav_counters(struct d3d12_pipeline_state *state, struct d3d12_device *device, const struct d3d12_root_signature *root_signature, - const struct vkd3d_shader_scan_descriptor_info *shader_info) + const struct vkd3d_shader_scan_descriptor_info *shader_info, VkShaderStageFlags stage_flags) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; VkDescriptorSetLayout set_layouts[VKD3D_MAX_DESCRIPTOR_SETS + 1]; @@ -1426,6 +1426,8 @@ static HRESULT d3d12_pipeline_state_init_compute_uav_counters(struct d3d12_pipel unsigned int i, j; HRESULT hr; + assert(vkd3d_popcount(stage_flags) == 1); + for (i = 0; i < shader_info->descriptor_count; ++i) { const struct vkd3d_shader_descriptor_info *d = &shader_info->descriptors[i]; @@ -1438,6 +1440,16 @@ static HRESULT d3d12_pipeline_state_init_compute_uav_counters(struct d3d12_pipel if (!uav_counter_count) return S_OK; + /* It should be possible to support other stages in Vulkan, but in a graphics pipeline + * D3D12 currently only supports counters in pixel shaders, and handling multiple stages + * would be more complex. */ + if (!(stage_flags & (VK_SHADER_STAGE_FRAGMENT_BIT | VK_SHADER_STAGE_COMPUTE_BIT))) + { + FIXME("Found a UAV counter for Vulkan shader stage %#x. UAV counters in a " + "graphics pipeline are only supported in pixel shaders.\n", stage_flags); + return E_INVALIDARG; + } + if (!(binding_desc = vkd3d_calloc(uav_counter_count, sizeof(*binding_desc)))) return E_OUTOFMEMORY; if (!(state->uav_counters = vkd3d_calloc(uav_counter_count, sizeof(*state->uav_counters)))) @@ -1461,17 +1473,16 @@ static HRESULT d3d12_pipeline_state_init_compute_uav_counters(struct d3d12_pipel state->uav_counters[j].register_space = d->register_space; state->uav_counters[j].register_index = d->register_index; - state->uav_counters[j].shader_visibility = VKD3D_SHADER_VISIBILITY_COMPUTE; + state->uav_counters[j].shader_visibility = (stage_flags == VK_SHADER_STAGE_COMPUTE_BIT) + ? VKD3D_SHADER_VISIBILITY_COMPUTE : VKD3D_SHADER_VISIBILITY_PIXEL; state->uav_counters[j].binding.set = set_index; state->uav_counters[j].binding.binding = descriptor_binding; state->uav_counters[j].binding.count = 1; - /* FIXME: For the graphics pipeline we have to take the shader - * visibility into account. */ binding_desc[j].binding = descriptor_binding; binding_desc[j].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; binding_desc[j].descriptorCount = 1; - binding_desc[j].stageFlags = VK_SHADER_STAGE_ALL; + binding_desc[j].stageFlags = stage_flags; binding_desc[j].pImmutableSamplers = NULL; ++descriptor_binding; @@ -1538,8 +1549,8 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st return hresult_from_vkd3d_result(ret); } - if (FAILED(hr = d3d12_pipeline_state_init_compute_uav_counters(state, - device, root_signature, &shader_info))) + if (FAILED(hr = d3d12_pipeline_state_init_uav_counters(state, + device, root_signature, &shader_info, VK_SHADER_STAGE_COMPUTE_BIT))) { WARN("Failed to create descriptor set layout for UAV counters, hr %#x.\n", hr); return hr;

1 0

Conor McCarthy : tests: Add tests for a UAV counter in a graphics pipeline.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: vkd3d Branch: master Commit: 76ed601b695cadf9ca2f50d713789e9251b31730 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=76ed601b695cadf9ca2f50d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jul 15 01:47:41 2021 +1000 tests: Add tests for a UAV counter in a graphics pipeline. 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 | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 25410ff..04c1e2c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -22366,6 +22366,139 @@ static void test_decrement_uav_counter(void) destroy_test_context(&context); } +static void test_graphics_uav_counters(void) +{ + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_DESCRIPTOR_RANGE descriptor_ranges[1]; + D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc; + ID3D12DescriptorHeap *cpu_heap, *gpu_heap; + ID3D12GraphicsCommandList *command_list; + ID3D12Resource *buffer, *counter_buffer; + D3D12_ROOT_PARAMETER root_parameters[1]; + struct test_context_desc desc; + struct test_context context; + struct resource_readback rb; + ID3D12CommandQueue *queue; + ID3D12Device *device; + uint32_t counter; + D3D12_BOX box; + HRESULT hr; + + static const uint32_t clear_value[4] = {0}; + static const DWORD ps_code[] = + { +#if 0 + RWStructuredBuffer<uint> u; + + void main() + { + uint i = u.IncrementCounter(); + ++u[i]; + } +#endif + 0x43425844, 0x951850a3, 0xb2e7dcee, 0x6195cf5f, 0x3e1e6220, 0x00000001, 0x000000fc, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000000a8, 0x00000050, 0x0000002a, 0x0100086a, + 0x0480009e, 0x0011e000, 0x00000000, 0x00000004, 0x02000068, 0x00000001, 0x050000b2, 0x00100012, + 0x00000000, 0x0011e000, 0x00000000, 0x8b0000a7, 0x80002302, 0x00199983, 0x00100022, 0x00000000, + 0x0010000a, 0x00000000, 0x00004001, 0x00000000, 0x0011e006, 0x00000000, 0x0700001e, 0x00100022, + 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x00000001, 0x090000a8, 0x0011e012, 0x00000000, + 0x0010000a, 0x00000000, 0x00004001, 0x00000000, 0x0010001a, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + + memset(&desc, 0, sizeof(desc)); + desc.rt_width = 64; + desc.rt_height = 1; + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV; + descriptor_ranges[0].NumDescriptors = 1; + descriptor_ranges[0].BaseShaderRegister = 0; + descriptor_ranges[0].RegisterSpace = 0; + descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0; + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameters[0].DescriptorTable.NumDescriptorRanges = 1; + root_parameters[0].DescriptorTable.pDescriptorRanges = descriptor_ranges; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; + root_signature_desc.NumParameters = 1; + root_signature_desc.pParameters = root_parameters; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; + hr = create_root_signature(device, &root_signature_desc, &context.root_signature); + ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr); + + cpu_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + gpu_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + + buffer = create_default_buffer(device, 64 * sizeof(uint32_t), + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + counter_buffer = create_default_buffer(device, D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT + sizeof(uint32_t), + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); + + context.pipeline_state = create_pipeline_state(context.device, context.root_signature, 0, NULL, &ps, NULL); + + memset(&uav_desc, 0, sizeof(uav_desc)); + uav_desc.Format = DXGI_FORMAT_UNKNOWN; + uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER; + uav_desc.Buffer.NumElements = 64; + uav_desc.Buffer.StructureByteStride = sizeof(uint32_t); + uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE; + ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc, + get_cpu_descriptor_handle(&context, cpu_heap, 0)); + uav_desc.Buffer.CounterOffsetInBytes = D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT; + ID3D12Device_CreateUnorderedAccessView(device, buffer, counter_buffer, &uav_desc, + get_cpu_descriptor_handle(&context, gpu_heap, 0)); + + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &gpu_heap); + + ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint(command_list, + get_gpu_descriptor_handle(&context, gpu_heap, 0), + get_cpu_descriptor_handle(&context, cpu_heap, 0), + buffer, clear_value, 0, NULL); + uav_barrier(command_list, buffer); + + counter = 0; + upload_buffer_data(counter_buffer, uav_desc.Buffer.CounterOffsetInBytes, + sizeof(counter), &counter, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, counter_buffer, 0, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(gpu_heap)); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + counter = read_uav_counter(&context, counter_buffer, uav_desc.Buffer.CounterOffsetInBytes); + todo + ok(counter == 64, "Got %u, expected 64.\n", counter); + + transition_sub_resource_state(command_list, buffer, 0, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + set_box(&box, 0, 0, 0, uav_desc.Buffer.NumElements, 1, 1); + todo + check_readback_data_uint(&rb, &box, 1, 0); + release_resource_readback(&rb); + + ID3D12Resource_Release(buffer); + ID3D12Resource_Release(counter_buffer); + ID3D12DescriptorHeap_Release(cpu_heap); + ID3D12DescriptorHeap_Release(gpu_heap); + destroy_test_context(&context); +} + static void test_atomic_instructions(void) { ID3D12Resource *ps_buffer, *cs_buffer, *cs_buffer2; @@ -34631,6 +34764,7 @@ START_TEST(d3d12) run_test(test_cs_uav_store); run_test(test_uav_counters); run_test(test_decrement_uav_counter); + run_test(test_graphics_uav_counters); run_test(test_atomic_instructions); run_test(test_buffer_srv); run_test(test_create_query_heap);

1 0

Conor McCarthy : tests: Use D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT in test_uav_counters().
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: vkd3d Branch: master Commit: 3c4163a1b0a1d535da22ee630bdc383c01ce7758 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3c4163a1b0a1d535da22ee6… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jul 14 12:33:38 2021 +1000 tests: Use D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT in test_uav_counters(). CounterOffsetInBytes must be a multiple of the required alignment, and must be zero if no counter buffer is specified. This allows the test to succeed in Windows. 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 | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index e877af5..25410ff 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -22054,7 +22054,8 @@ static void test_uav_counters(void) 0x00000001, 0x0010000a, 0x00000000, 0x00004001, 0x00000000, 0x0010001a, 0x00000000, 0x0100003e, }; - static const unsigned int counter_offsets[] = {0, 1, 255}; + static const unsigned int counter_offsets[] = {0, D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT, + D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT * 2}; if (!init_compute_test_context(&context)) return; @@ -22085,7 +22086,7 @@ static void test_uav_counters(void) D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); out_buffer = create_default_buffer(device, 1024, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); - counter_buffer = create_default_buffer(device, 1024, + counter_buffer = create_default_buffer(device, D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT * 2 + sizeof(uint32_t), D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); for (i = 0; i < ARRAY_SIZE(counter_offsets); ++i) @@ -22103,15 +22104,14 @@ static void test_uav_counters(void) uav_desc.Buffer.NumElements = 256; uav_desc.Buffer.StructureByteStride = sizeof(uint32_t); uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE; - uav_desc.Buffer.CounterOffsetInBytes = counter_offsets[i] * sizeof(uint32_t); - ID3D12Device_CreateUnorderedAccessView(device, buffer, counter_buffer, &uav_desc, - get_cpu_descriptor_handle(&context, descriptor_heap, 0)); ID3D12Device_CreateUnorderedAccessView(device, out_buffer, NULL, &uav_desc, get_cpu_descriptor_handle(&context, descriptor_heap, 1)); + uav_desc.Buffer.CounterOffsetInBytes = counter_offsets[i]; + ID3D12Device_CreateUnorderedAccessView(device, buffer, counter_buffer, &uav_desc, + get_cpu_descriptor_handle(&context, descriptor_heap, 0)); counter = 0; - upload_buffer_data(counter_buffer, counter_offsets[i] * sizeof(uint32_t), - sizeof(counter), &counter, queue, command_list); + upload_buffer_data(counter_buffer, counter_offsets[i], sizeof(counter), &counter, queue, command_list); reset_command_list(command_list, context.allocator); transition_sub_resource_state(command_list, counter_buffer, 0, D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); @@ -22184,8 +22184,7 @@ static void test_uav_counters(void) id[j] = 0xdeadbeef; upload_buffer_data(buffer, 0, counter * sizeof(*id), id, queue, command_list); reset_command_list(command_list, context.allocator); - upload_buffer_data(counter_buffer, counter_offsets[i] * sizeof(uint32_t), - sizeof(counter), &counter, queue, command_list); + upload_buffer_data(counter_buffer, counter_offsets[i], sizeof(counter), &counter, queue, command_list); reset_command_list(command_list, context.allocator); transition_sub_resource_state(command_list, counter_buffer, 0,

1 0

Conor McCarthy : tests: Delete spurious HLSL source line.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: vkd3d Branch: master Commit: 751d9342f53fe391f69188eedb36057a011caca1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=751d9342f53fe391f69188e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jul 12 13:31:27 2021 +1000 tests: Delete spurious HLSL source line. 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 | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5514861..e877af5 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -15498,7 +15498,6 @@ static void test_srv_component_mapping(void) float4 main(float4 position : SV_POSITION) : SV_Target { float2 p; - D3D12_SUBRESOURCE_DATA data; p.x = position.x / 32.0f; p.y = position.y / 32.0f;

1 0

Conor McCarthy : vkd3d-shader: Add shader component type double.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: vkd3d Branch: master Commit: 4b919a10ad3b61ccbc7615511094d743aa75bfaa URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4b919a10ad3b61ccbc76155… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Jul 10 01:31:37 2021 +1000 vkd3d-shader: Add shader component type double. Based on a vkd3d-proton patch by Joshua Ashton. 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> --- include/vkd3d_shader.h | 2 ++ libs/vkd3d-shader/spirv.c | 2 ++ libs/vkd3d-shader/vkd3d_shader_private.h | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 03225d3..0e01134 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1177,6 +1177,8 @@ enum vkd3d_shader_component_type VKD3D_SHADER_COMPONENT_FLOAT = 0x3, /** Boolean. */ VKD3D_SHADER_COMPONENT_BOOL = 0x4, + /** 64-bit IEEE floating-point. */ + VKD3D_SHADER_COMPONENT_DOUBLE = 0x5, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPONENT_TYPE), }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6b81fee..6583469 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1714,6 +1714,8 @@ static uint32_t vkd3d_spirv_get_type_id(struct vkd3d_spirv_builder *builder, case VKD3D_SHADER_COMPONENT_BOOL: return vkd3d_spirv_get_op_type_bool(builder); break; + case VKD3D_SHADER_COMPONENT_DOUBLE: + return vkd3d_spirv_get_op_type_float(builder, 64); default: FIXME("Unhandled component type %#x.\n", component_type); return 0; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 650442c..033d8f0 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -977,6 +977,8 @@ static inline enum vkd3d_shader_component_type vkd3d_component_type_from_data_ty return VKD3D_SHADER_COMPONENT_UINT; case VKD3D_DATA_INT: return VKD3D_SHADER_COMPONENT_INT; + case VKD3D_DATA_DOUBLE: + return VKD3D_SHADER_COMPONENT_DOUBLE; default: FIXME("Unhandled data type %#x.\n", data_type); return VKD3D_SHADER_COMPONENT_UINT; @@ -994,6 +996,8 @@ static inline enum vkd3d_data_type vkd3d_data_type_from_component_type( return VKD3D_DATA_UINT; case VKD3D_SHADER_COMPONENT_INT: return VKD3D_DATA_INT; + case VKD3D_SHADER_COMPONENT_DOUBLE: + return VKD3D_DATA_DOUBLE; default: FIXME("Unhandled component type %#x.\n", component_type); return VKD3D_DATA_FLOAT;

1 0

Conor McCarthy : vkd3d-shader: Trace DXBC global flags for double-precision floating point ops and extensions.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: vkd3d Branch: master Commit: e6a676410a0ad0eef20db89d8b97931b9cb31cfa URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e6a676410a0ad0eef20db89… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Jul 10 01:31:36 2021 +1000 vkd3d-shader: Trace DXBC global flags for double-precision floating point ops and extensions. 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/trace.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 0173075..c21cb3e 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -368,6 +368,8 @@ static void shader_dump_global_flags(struct vkd3d_d3d_asm_compiler *compiler, ui {VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS, "enableRawAndStructuredBuffers"}, {VKD3DSGF_ENABLE_MINIMUM_PRECISION, "enableMinimumPrecision"}, {VKD3DSGF_SKIP_OPTIMIZATION, "skipOptimization"}, + {VKD3DSGF_ENABLE_DOUBLE_PRECISION_FLOAT_OPS, "enableDoublePrecisionFloatOps"}, + {VKD3DSGF_ENABLE_11_1_DOUBLE_EXTENSIONS, "enable11_1DoubleExtensions"}, }; for (i = 0; i < ARRAY_SIZE(global_flag_info); ++i)

1 0

Conor McCarthy : vkd3d-shader: Enable Float64 capability if flagged in DXBC.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: vkd3d Branch: master Commit: d027ac4c15638bc9b2b46144de3695d177090d83 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d027ac4c15638bc9b2b4614… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Jul 10 01:31:35 2021 +1000 vkd3d-shader: Enable Float64 capability if flagged in DXBC. Based on a vkd3d-proton patch by Joshua Ashton. 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 | 6 ++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index bd23112..6b81fee 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5128,6 +5128,12 @@ static void vkd3d_dxbc_compiler_emit_dcl_global_flags(struct vkd3d_dxbc_compiler flags &= ~VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL; } + if (flags & (VKD3DSGF_ENABLE_DOUBLE_PRECISION_FLOAT_OPS | VKD3DSGF_ENABLE_11_1_DOUBLE_EXTENSIONS)) + { + vkd3d_spirv_enable_capability(&compiler->spirv_builder, SpvCapabilityFloat64); + flags &= ~(VKD3DSGF_ENABLE_DOUBLE_PRECISION_FLOAT_OPS | VKD3DSGF_ENABLE_11_1_DOUBLE_EXTENSIONS); + } + if (flags & ~(VKD3DSGF_REFACTORING_ALLOWED | VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS)) FIXME("Unhandled global flags %#x.\n", flags); else diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index c5d1372..650442c 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -486,10 +486,12 @@ enum vkd3d_shader_interpolation_mode enum vkd3d_shader_global_flags { VKD3DSGF_REFACTORING_ALLOWED = 0x01, + VKD3DSGF_ENABLE_DOUBLE_PRECISION_FLOAT_OPS = 0x02, VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL = 0x04, VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS = 0x08, VKD3DSGF_SKIP_OPTIMIZATION = 0x10, - VKD3DSGF_ENABLE_MINIMUM_PRECISION = 0x20 + VKD3DSGF_ENABLE_MINIMUM_PRECISION = 0x20, + VKD3DSGF_ENABLE_11_1_DOUBLE_EXTENSIONS = 0x40, }; enum vkd3d_shader_sync_flags

1 0

Conor McCarthy : tests: Add tests for shader double-precision floating point instructions.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: vkd3d Branch: master Commit: 1a542a4bbaea4cebae98dfa31ec61fa63cf72b0d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1a542a4bbaea4cebae98dfa… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Jul 10 01:31:34 2021 +1000 tests: Add tests for shader double-precision floating point instructions. 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 | 384 +++++++++++++++++++++++++++++++++++++++++++++++ tests/d3d12_test_utils.h | 2 +- 2 files changed, 385 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=1a542a4bbaea4cebae9…

1 0

Conor McCarthy : vkd3d-shader: Trace SM5.1 descriptor register ranges.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: vkd3d Branch: master Commit: b44478781dc53a39d28cdfbf45623bd17c936cda URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b44478781dc53a39d28cdfb… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jul 9 14:33:41 2021 +1000 vkd3d-shader: Trace SM5.1 descriptor register ranges. 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/trace.c | 77 ++++++++++++++++++++++++++++++----------------- 1 file changed, 49 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=b44478781dc53a39d28…

1 0

Piotr Caban : msvcrt: Update round_limb on first limb length change in printf.
by Alexandre Julliard 10 Jul '21

10 Jul '21

Module: wine Branch: master Commit: 2ffcf4402181e7e7e8c322b713924e5738506c88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ffcf4402181e7e7e8c322b7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 10 20:38:16 2021 +0200 msvcrt: Update round_limb on first limb length change in printf. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51435 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 14 ++++++++++++++ dlls/ucrtbase/tests/printf.c | 1 + 2 files changed, 15 insertions(+) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index c6c074de795..d6b945e8ac7 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -704,11 +704,25 @@ static inline int FUNC_NAME(pf_output_fp)(FUNC_NAME(puts_clbk) pf_puts, void *pu if(i != first_limb_len) { first_limb_len = i; radix_pos++; + + round_pos++; + if (round_pos == LIMB_DIGITS) + { + round_pos = 0; + round_limb++; + } } } else if(i == b->e) { first_limb_len = 1; radix_pos++; b->e++; + + round_pos++; + if (round_pos == LIMB_DIGITS) + { + round_pos = 0; + round_limb++; + } } } } diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 96241b22cf0..588e579cc7e 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -819,6 +819,7 @@ static void test_printf_fp(void) { "%.0f", 0.5, { "1", NULL, NULL, NULL, "0" }, {NULL, NULL, NULL, NULL, "1" }}, { "%.0f", 1.5, { "2" }}, { "%.0f", 2.5, { "3", NULL, NULL, NULL, "2" }, {NULL, NULL, NULL, NULL, "3" }}, + { "%g", 9.999999999999999e-5, { "0.0001" }}, }; const char *res = NULL;

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2021