July 2021 - Wine-commits - list.winehq.org

Conor McCarthy : vkd3d-shader: Get descriptor info for descriptor arrays.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: vkd3d Branch: master Commit: a97d090010c7a0aa7c8a0009334b3a1fab9f8aac URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a97d090010c7a0aa7c8a000… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jul 23 23:01:38 2021 +1000 vkd3d-shader: Get descriptor info for descriptor arrays. 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 | 5 ++++- libs/vkd3d-shader/spirv.c | 4 +++- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 0e01134..6cdbaf1 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1137,7 +1137,10 @@ struct vkd3d_shader_descriptor_info * \ref vkd3d_shader_descriptor_info_flag. */ unsigned int flags; - /** Size of this descriptor array, or 1 if a single descriptor. */ + /** + * Size of this descriptor array, or 1 if a single descriptor. + * For an unbounded array this value is ~0u. + */ unsigned int count; }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f164322..ea02004 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5541,13 +5541,15 @@ static const struct vkd3d_shader_descriptor_info *vkd3d_dxbc_compiler_get_descri const struct vkd3d_shader_register_range *range) { const struct vkd3d_shader_scan_descriptor_info *descriptor_info = compiler->scan_descriptor_info; + unsigned int register_last = (range->last == ~0u) ? range->first : range->last; const struct vkd3d_shader_descriptor_info *d; unsigned int i; for (i = 0; i < descriptor_info->descriptor_count; ++i) { d = &descriptor_info->descriptors[i]; - if (d->type == type && d->register_space == range->space && d->register_index == range->first) + if (d->type == type && d->register_space == range->space && d->register_index <= range->first + && (d->count == ~0u || d->count > register_last - d->register_index)) return d; } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 54654f3..1a566a7 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -601,7 +601,7 @@ static bool vkd3d_shader_scan_add_descriptor(struct vkd3d_shader_scan_context *c d->resource_type = resource_type; d->resource_data_type = resource_data_type; d->flags = flags; - d->count = 1; + d->count = (range->last == ~0u) ? ~0u : range->last - range->first + 1; ++info->descriptor_count; return true;

1 0

Conor McCarthy : vkd3d-shader: Create descriptor array symbols for resources.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: vkd3d Branch: master Commit: 951af90f3e9a060160ba621b413e1d29b43fd563 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=951af90f3e9a060160ba621… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jul 23 23:01:39 2021 +1000 vkd3d-shader: Create descriptor array symbols for resources. 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 | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ea02004..8d5fd73 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5675,6 +5675,7 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp const struct vkd3d_shader_register *reg = &resource->reg.reg; const struct vkd3d_spirv_resource_type *resource_type_info; enum vkd3d_shader_component_type sampled_type; + const struct vkd3d_symbol *array_symbol; struct vkd3d_symbol resource_symbol; bool is_uav; @@ -5717,14 +5718,8 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp resource_type_info, sampled_type, structure_stride || raw, 0); } - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); - var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, - ptr_type_id, storage_class, 0); - - vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, var_id, reg, - &resource->range, resource_type, false); - - vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); + var_id = vkd3d_dxbc_compiler_build_descriptor_variable(compiler, storage_class, type_id, reg, + &resource->range, resource_type, &array_symbol); if (is_uav) { @@ -5762,6 +5757,10 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp storage_class = SpvStorageClassUniform; ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, struct_id); } + else + { + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); + } counter_var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, ptr_type_id, storage_class, 0); @@ -5775,6 +5774,7 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp vkd3d_symbol_make_resource(&resource_symbol, reg); resource_symbol.id = var_id; + resource_symbol.descriptor_array = array_symbol; resource_symbol.info.resource.range = resource->range; resource_symbol.info.resource.sampled_type = sampled_type; resource_symbol.info.resource.type_id = type_id; @@ -7770,9 +7770,26 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil if (!symbol) symbol = vkd3d_dxbc_compiler_find_resource(compiler, resource_reg); - image->id = symbol->id; + if (symbol->descriptor_array) + { + const struct vkd3d_symbol_descriptor_array_data *array_data = &symbol->descriptor_array->info.descriptor_array; + uint32_t ptr_type_id, index_id; + + index_id = vkd3d_dxbc_compiler_get_descriptor_index(compiler, resource_reg, + array_data->binding_base_idx); + + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, array_data->storage_class, + array_data->contained_type_id); + image->image_type_id = array_data->contained_type_id; + + image->id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, symbol->id, &index_id, 1); + } + else + { + image->id = symbol->id; + image->image_type_id = symbol->info.resource.type_id; + } image->sampled_type = symbol->info.resource.sampled_type; - image->image_type_id = symbol->info.resource.type_id; image->resource_type_info = symbol->info.resource.resource_type_info; image->structure_stride = symbol->info.resource.structure_stride; image->raw = symbol->info.resource.raw;

1 0

Conor McCarthy : vkd3d: Introduce struct d3d12_pipeline_uav_counter_state.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: vkd3d Branch: master Commit: 640b914bfb18c05eacbe6414a819e9c600fbe3cd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=640b914bfb18c05eacbe641… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Jul 24 00:02:42 2021 +1000 vkd3d: Introduce struct d3d12_pipeline_uav_counter_state. 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 | 19 +++++------ libs/vkd3d/state.c | 80 +++++++++++++++++++++------------------------- libs/vkd3d/vkd3d_private.h | 17 ++++++---- 3 files changed, 58 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=640b914bfb18c05eacb…

1 0

Conor McCarthy : vkd3d: Add support for UAV counters in pixel shaders.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: vkd3d Branch: master Commit: 8860c4d07717aa00f5ac09345b538cf30300fa2a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8860c4d07717aa00f5ac093… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Jul 24 00:02:43 2021 +1000 vkd3d: Add support for UAV counters in pixel shaders. Allows GRID (2019) to run in D3D12 mode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49107 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 | 24 ++++++++++++------------ tests/d3d12.c | 2 -- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 29121e5..a381679 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2268,8 +2268,6 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s shader_interface.push_constant_buffer_count = root_signature->root_constant_count; shader_interface.combined_samplers = NULL; shader_interface.combined_sampler_count = 0; - shader_interface.uav_counters = NULL; - shader_interface.uav_counter_count = 0; for (i = 0; i < ARRAY_SIZE(shader_stages); ++i) { @@ -2290,19 +2288,16 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s hr = hresult_from_vkd3d_result(ret); goto fail; } - for (j = 0; j < shader_info.descriptor_count; ++j) + if (FAILED(hr = d3d12_pipeline_state_init_uav_counters(state, + device, root_signature, &shader_info, shader_stages[i].stage))) { - const struct vkd3d_shader_descriptor_info *d = &shader_info.descriptors[j]; - - if (d->type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV - && (d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_COUNTER)) - { - FIXME("UAV counters not implemented for graphics pipelines.\n"); - break; - } + WARN("Failed to create descriptor set layout for UAV counters, hr %#x.\n", hr); + goto fail; } vkd3d_shader_free_scan_descriptor_info(&shader_info); + shader_interface.uav_counters = NULL; + shader_interface.uav_counter_count = 0; target_info = NULL; switch (shader_stages[i].stage) { @@ -2328,6 +2323,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s break; case VK_SHADER_STAGE_FRAGMENT_BIT: + shader_interface.uav_counters = state->uav_counters.bindings; + shader_interface.uav_counter_count = state->uav_counters.binding_count; target_info = &ps_target_info; break; @@ -2523,6 +2520,8 @@ fail: } vkd3d_shader_free_shader_signature(&input_signature); + d3d12_pipeline_uav_counter_state_cleanup(&state->uav_counters, device); + return hr; } @@ -2811,7 +2810,8 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta pipeline_desc.pDepthStencilState = &graphics->ds_desc; pipeline_desc.pColorBlendState = &blend_desc; pipeline_desc.pDynamicState = &dynamic_desc; - pipeline_desc.layout = graphics->root_signature->vk_pipeline_layout; + pipeline_desc.layout = state->uav_counters.vk_pipeline_layout ? state->uav_counters.vk_pipeline_layout + : graphics->root_signature->vk_pipeline_layout; pipeline_desc.subpass = 0; pipeline_desc.basePipelineHandle = VK_NULL_HANDLE; pipeline_desc.basePipelineIndex = -1; diff --git a/tests/d3d12.c b/tests/d3d12.c index ab29e40..6fd4f67 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -22481,14 +22481,12 @@ static void test_graphics_uav_counters(void) 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);

1 0

Conor McCarthy : vkd3d-shader: Compute XfbOffset for the slot of the specified element.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: vkd3d Branch: master Commit: b01104e47dbc9466c3fc79bf3ae4284a83190de9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b01104e47dbc9466c3fc79b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Jul 24 00:26:01 2021 +1000 vkd3d-shader: Compute XfbOffset for the slot of the specified element. Fixes NVIDIA HairWorks GPU crash on Metro Exodus, and test failures in test_line_tessellation(). 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> --- libs/vkd3d-shader/spirv.c | 6 ++++-- tests/d3d12.c | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8d5fd73..0407f50 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4136,13 +4136,15 @@ static void vkd3d_dxbc_compiler_decorate_xfb_output(struct vkd3d_dxbc_compiler * xfb_element = e; break; } - - offset += 4 * e->component_count; } if (!xfb_element) return; + for (i = 0; xfb_element != &xfb_info->elements[i]; ++i) + if (xfb_info->elements[i].output_slot == xfb_element->output_slot) + offset += 4 * xfb_info->elements[i].component_count; + if (xfb_element->component_index || xfb_element->component_count > component_count) { FIXME("Unhandled component range %u, %u.\n", xfb_element->component_index, xfb_element->component_count); diff --git a/tests/d3d12.c b/tests/d3d12.c index 6fd4f67..993acf4 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -28503,13 +28503,11 @@ static void test_line_tessellation(void) data = get_readback_data(&rb, i + 2048 / (2 * sizeof(*data)), 0, 0, 2 * sizeof(*data)); expected = &expected_data[3 * i + 1]; bug_if(is_nvidia_device(context.device)) - todo_if(i != 6) ok(compare_vec4(data, expected, 1), "Got color {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at %u.\n", data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w, i); ++data; expected = &expected_data[3 * i + 2]; - todo ok(compare_vec4(data, expected, 1), "Got primitive ID {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at %u.\n", data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w, i);

1 0

Conor McCarthy : tests: Test a buffer larger than the destination heap.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: vkd3d Branch: master Commit: 7cd4cf8aba0833b5b6fcdc4d3b80e8c5b22915dd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7cd4cf8aba0833b5b6fcdc4… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jul 26 13:47:38 2021 +1000 tests: Test a buffer larger than the destination heap. As per vkd3d-proton commit 72d9b322, E_INVALIDARG should be returned to indicate the type of failure. 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 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 993acf4..e4fed2c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2286,6 +2286,13 @@ static void test_create_placed_resource(void) &IID_ID3D12Resource, (void **)&resource); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + /* Buffer + offset too large for the heap. */ + hr = ID3D12Device_CreatePlacedResource(device, heap, heap_desc.SizeInBytes, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, + &IID_ID3D12Resource, (void **)&resource); + todo + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ID3D12Heap_Release(heap); for (i = 0; i < ARRAY_SIZE(invalid_buffer_desc_tests); ++i)

1 0

Conor McCarthy : vkd3d: Return E_INVALIDARG if a heap is too small for a placed resource.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: vkd3d Branch: master Commit: e292351fa98915e66349bafe5f89239cf442d6e6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e292351fa98915e66349baf… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jul 26 13:47:39 2021 +1000 vkd3d: Return E_INVALIDARG if a heap is too small for a placed resource. Otherwise vkBindBufferMemory() or vkBindImageMemory() will fail, which can result in a generic E_FAIL. Based on a vkd3d-proton patch by Samuel Pitoiset which fixes a GPU hang with Cyberpunk 2077. 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/resource.c | 7 +++++++ tests/d3d12.c | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 3faa679..1ca23a9 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1911,6 +1911,13 @@ static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device, heap_offset = align(heap_offset, requirements.alignment); } + if (heap_offset > heap->desc.SizeInBytes || requirements.size > heap->desc.SizeInBytes - heap_offset) + { + ERR("Heap too small for the resource (offset %"PRIu64", resource size %"PRIu64", heap size %"PRIu64".\n", + heap_offset, requirements.size, heap->desc.SizeInBytes); + return E_INVALIDARG; + } + if (heap_offset % requirements.alignment) { FIXME("Invalid heap offset %#"PRIx64" (alignment %#"PRIx64").\n", diff --git a/tests/d3d12.c b/tests/d3d12.c index e4fed2c..fbf14a2 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2290,7 +2290,6 @@ static void test_create_placed_resource(void) hr = ID3D12Device_CreatePlacedResource(device, heap, heap_desc.SizeInBytes, &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, (void **)&resource); - todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); ID3D12Heap_Release(heap);

1 0

Zebediah Figura : vkd3d-shader: Allocate the $Params buffer in hlsl_ctx_init().
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: vkd3d Branch: master Commit: 1ed82b9fc4d2e360600ae3db3b282de686d35e9c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1ed82b9fc4d2e360600ae3d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 8 21:13:18 2021 -0500 vkd3d-shader: Allocate the $Params buffer in hlsl_ctx_init(). For clarity. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 3 +++ libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl_codegen.c | 15 ++------------- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 0b8c660..bc593f8 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1664,6 +1664,9 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct hlsl_profile_info * if (!(ctx->globals_buffer = hlsl_new_buffer(ctx, HLSL_BUFFER_CONSTANT, hlsl_strdup(ctx, "$Globals"), NULL, ctx->location))) return false; + if (!(ctx->params_buffer = hlsl_new_buffer(ctx, HLSL_BUFFER_CONSTANT, + hlsl_strdup(ctx, "$Params"), NULL, ctx->location))) + return false; ctx->cur_buffer = ctx->globals_buffer; return true; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index b62e781..e0045ac 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -456,7 +456,7 @@ struct hlsl_ctx struct list extern_vars; struct list buffers; - struct hlsl_buffer *cur_buffer, *globals_buffer; + struct hlsl_buffer *cur_buffer, *globals_buffer, *params_buffer; struct list types; struct rb_tree functions; const struct hlsl_ir_function_decl *cur_function; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 6336ddf..778d9df 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1142,27 +1142,16 @@ static void calculate_buffer_offset(struct hlsl_ir_var *var) static void allocate_buffers(struct hlsl_ctx *ctx) { - struct hlsl_buffer *buffer, *params_buffer; + struct hlsl_buffer *buffer; struct hlsl_ir_var *var; uint32_t index = 0; - if (!(params_buffer = hlsl_new_buffer(ctx, HLSL_BUFFER_CONSTANT, - hlsl_strdup(ctx, "$Params"), NULL, ctx->location))) - return; - - /* The $Globals and $Params buffers should be allocated first, before all - * explicit buffers. */ - list_remove(&params_buffer->entry); - list_add_head(&ctx->buffers, &params_buffer->entry); - list_remove(&ctx->globals_buffer->entry); - list_add_head(&ctx->buffers, &ctx->globals_buffer->entry); - LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { if (var->is_uniform) { if (var->is_param) - var->buffer = params_buffer; + var->buffer = ctx->params_buffer; calculate_buffer_offset(var); }

1 0

Zebediah Figura : vkd3d-shader: Track bytecode buffer size in bytes.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: vkd3d Branch: master Commit: 9f0b475583ca85d3aac9f53725a3648776100c96 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9f0b475583ca85d3aac9f53… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 8 21:13:19 2021 -0500 vkd3d-shader: Track bytecode buffer size in bytes. 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: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.h | 4 +- libs/vkd3d-shader/hlsl_codegen.c | 101 +++++++++++++++++---------------------- 2 files changed, 47 insertions(+), 58 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index e0045ac..54273ac 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -126,7 +126,7 @@ struct hlsl_type } e; unsigned int reg_size; - unsigned int bytecode_offset; + size_t bytecode_offset; }; struct hlsl_semantic @@ -144,7 +144,7 @@ struct hlsl_struct_field struct hlsl_semantic semantic; unsigned int reg_offset; - unsigned int name_bytecode_offset; + size_t name_bytecode_offset; }; struct hlsl_reg diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 778d9df..51cb789 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1324,72 +1324,57 @@ static struct hlsl_reg hlsl_reg_from_deref(const struct hlsl_deref *deref, const struct bytecode_buffer { struct hlsl_ctx *ctx; - uint32_t *data; - size_t count, size; + uint8_t *data; + size_t size, capacity; int status; }; -/* Returns the token index. */ -static unsigned int put_dword(struct bytecode_buffer *buffer, uint32_t value) +static size_t put_bytes(struct bytecode_buffer *buffer, const void *bytes, size_t size) { - unsigned int index = buffer->count; + size_t aligned_size = align(size, 4); + size_t offset = buffer->size; if (buffer->status) - return index; + return offset; - if (!hlsl_array_reserve(buffer->ctx, (void **)&buffer->data, &buffer->size, - buffer->count + 1, sizeof(*buffer->data))) + if (!hlsl_array_reserve(buffer->ctx, (void **)&buffer->data, &buffer->capacity, offset + aligned_size, 1)) { buffer->status = VKD3D_ERROR_OUT_OF_MEMORY; - return index; + return offset; } - buffer->data[buffer->count++] = value; + memcpy(buffer->data + offset, bytes, size); + memset(buffer->data + offset + size, 0xab, aligned_size - size); + buffer->size = offset + aligned_size; + return offset; +} - return index; +static size_t put_dword(struct bytecode_buffer *buffer, uint32_t value) +{ + return put_bytes(buffer, &value, sizeof(value)); } -/* Returns the token index. */ -static unsigned int put_float(struct bytecode_buffer *buffer, float value) +static size_t put_float(struct bytecode_buffer *buffer, float value) { - union - { - float f; - uint32_t u; - } u; - u.f = value; - return put_dword(buffer, u.u); + return put_bytes(buffer, &value, sizeof(value)); } -static void set_dword(struct bytecode_buffer *buffer, unsigned int index, uint32_t value) +static void set_dword(struct bytecode_buffer *buffer, size_t offset, uint32_t value) { if (buffer->status) return; - assert(index < buffer->count); - buffer->data[index] = value; + assert(offset + sizeof(value) <= buffer->size); + memcpy(buffer->data + offset, &value, sizeof(value)); } -/* Returns the token index. */ -static unsigned int put_string(struct bytecode_buffer *buffer, const char *str) +static size_t put_string(struct bytecode_buffer *buffer, const char *string) { - unsigned int index = buffer->count; - size_t len = strlen(str) + 1; - unsigned int token_count = (len + 3) / sizeof(*buffer->data); - - if (buffer->status) - return index; - - if (!hlsl_array_reserve(buffer->ctx, (void **)&buffer->data, &buffer->size, - buffer->count + token_count, sizeof(*buffer->data))) - { - buffer->status = E_OUTOFMEMORY; - return index; - } + return put_bytes(buffer, string, strlen(string) + 1); +} - buffer->data[buffer->count + token_count - 1] = 0xabababab; - memcpy(buffer->data + buffer->count, str, len); - buffer->count += token_count; - return index; +static size_t get_buffer_size(struct bytecode_buffer *buffer) +{ + return buffer->size; } static uint32_t sm1_version(enum vkd3d_shader_type type, unsigned int major, unsigned int minor) @@ -1505,9 +1490,10 @@ static unsigned int get_array_size(const struct hlsl_type *type) static void write_sm1_type(struct bytecode_buffer *buffer, struct hlsl_type *type, unsigned int ctab_start) { const struct hlsl_type *array_type = get_array_type(type); - unsigned int fields_offset = 0, field_count = 0; unsigned int array_size = get_array_size(type); struct hlsl_struct_field *field; + unsigned int field_count = 0; + size_t fields_offset = 0; if (type->bytecode_offset) return; @@ -1520,12 +1506,12 @@ static void write_sm1_type(struct bytecode_buffer *buffer, struct hlsl_type *typ write_sm1_type(buffer, field->type, ctab_start); } - fields_offset = (buffer->count - ctab_start) * sizeof(*buffer->data); + fields_offset = get_buffer_size(buffer) - ctab_start; LIST_FOR_EACH_ENTRY(field, array_type->e.elements, struct hlsl_struct_field, entry) { - put_dword(buffer, (field->name_bytecode_offset - ctab_start) * sizeof(*buffer->data)); - put_dword(buffer, (field->type->bytecode_offset - ctab_start) * sizeof(*buffer->data)); + put_dword(buffer, field->name_bytecode_offset - ctab_start); + put_dword(buffer, field->type->bytecode_offset - ctab_start); ++field_count; } } @@ -1567,7 +1553,7 @@ static void sm1_sort_externs(struct hlsl_ctx *ctx) static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct bytecode_buffer *buffer, struct hlsl_ir_function_decl *entry_func) { - unsigned int ctab_start, vars_start, size_offset, creator_offset, offset; + size_t ctab_offset, ctab_start, ctab_end, vars_start, size_offset, creator_offset, offset; unsigned int uniform_count = 0; struct hlsl_ir_var *var; @@ -1597,7 +1583,7 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct bytecode_buffer *buf sm1_sort_externs(ctx); size_offset = put_dword(buffer, 0); - put_dword(buffer, MAKEFOURCC('C','T','A','B')); + ctab_offset = put_dword(buffer, MAKEFOURCC('C','T','A','B')); ctab_start = put_dword(buffer, sizeof(D3DXSHADER_CONSTANTTABLE)); creator_offset = put_dword(buffer, 0); @@ -1607,7 +1593,7 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct bytecode_buffer *buf put_dword(buffer, 0); /* FIXME: flags */ put_dword(buffer, 0); /* FIXME: target string */ - vars_start = buffer->count; + vars_start = get_buffer_size(buffer); LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { @@ -1627,20 +1613,23 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct bytecode_buffer *buf { if (!var->semantic.name && var->reg.allocated) { - set_dword(buffer, vars_start + (uniform_count * 5), (buffer->count - ctab_start) * sizeof(*buffer->data)); - put_string(buffer, var->name); + size_t var_offset = vars_start + (uniform_count * 5 * sizeof(uint32_t)); + size_t name_offset; + + name_offset = put_string(buffer, var->name); + set_dword(buffer, var_offset, name_offset - ctab_start); write_sm1_type(buffer, var->data_type, ctab_start); - set_dword(buffer, vars_start + (uniform_count * 5) + 3, - (var->data_type->bytecode_offset - ctab_start) * sizeof(*buffer->data)); + set_dword(buffer, var_offset + 3 * sizeof(uint32_t), var->data_type->bytecode_offset - ctab_start); ++uniform_count; } } offset = put_string(buffer, vkd3d_shader_get_version(NULL, NULL)); - set_dword(buffer, creator_offset, (offset - ctab_start) * sizeof(*buffer->data)); + set_dword(buffer, creator_offset, offset - ctab_start); - set_dword(buffer, size_offset, D3DSIO_COMMENT | ((buffer->count - (ctab_start - 1)) << 16)); + ctab_end = get_buffer_size(buffer); + set_dword(buffer, size_offset, D3DSIO_COMMENT | (((ctab_end - ctab_offset) / sizeof(uint32_t)) << 16)); } static uint32_t sm1_encode_register_type(D3DSHADER_PARAM_REGISTER_TYPE type) @@ -2078,7 +2067,7 @@ static int write_sm1_shader(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl * if (!(ret = buffer.status)) { out->code = buffer.data; - out->size = buffer.count * sizeof(*buffer.data); + out->size = buffer.size; } return ret; }

1 0

Conor McCarthy : vkd3d-shader: Emit negation modifier for double-precision float registers.
by Alexandre Julliard 26 Jul '21

26 Jul '21

Module: vkd3d Branch: master Commit: d11510f02e3ec2ee7afbb07b386592b0a4d27a30 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d11510f02e3ec2ee7afbb07… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jul 23 15:32:21 2021 +1000 vkd3d-shader: Emit negation modifier for double-precision float registers. 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, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 33e664c..511f0c3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3393,7 +3393,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_neg(struct vkd3d_dxbc_compiler *compile uint32_t type_id; type_id = vkd3d_dxbc_compiler_get_type_id_for_reg(compiler, reg, write_mask); - if (reg->data_type == VKD3D_DATA_FLOAT) + if (reg->data_type == VKD3D_DATA_FLOAT || reg->data_type == VKD3D_DATA_DOUBLE) return vkd3d_spirv_build_op_fnegate(builder, type_id, val_id); else if (reg->data_type == VKD3D_DATA_INT) return vkd3d_spirv_build_op_snegate(builder, type_id, val_id);

1 0