wine-commits October 2023

wine-commits@winehq.org

1 participants
702 discussions

Giovanni Mascellani : tests: Acknowledge WARP giving a GPU handle to a non-shader-visible descriptor heap.
by Alexandre Julliard 16 Oct '23

16 Oct '23

Module: vkd3d Branch: master Commit: 3f87cf9d7f21fbe3961504c4e1a9b0a68e8fcc5e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3f87cf9d7f21fbe3961504c4e1a9b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Oct 13 13:47:13 2023 +0200 tests: Acknowledge WARP giving a GPU handle to a non-shader-visible descriptor heap. WARP has no GPU, so it probably treats GPU handles just like CPU handles. --- tests/d3d12.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 73b21908..c490f281 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2451,7 +2451,7 @@ static void test_create_descriptor_heap(void) ok(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr); gpu_handle = ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap); - ok(!gpu_handle.ptr, "Got unexpected ptr %"PRIx64".\n", gpu_handle.ptr); + ok(!gpu_handle.ptr || broken(test_options.use_warp_device), "Got unexpected ptr %"PRIx64".\n", gpu_handle.ptr); refcount = get_refcount(device); ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount);

1 0

Giovanni Mascellani : tests: Acknowledge WARP accepting some unusual CreateCommittedResource() configuration.
by Alexandre Julliard 16 Oct '23

16 Oct '23

Module: vkd3d Branch: master Commit: 862dcf27a66e63be97a5790133578608a0b3eb26 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/862dcf27a66e63be97a5790133578… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Oct 13 13:45:22 2023 +0200 tests: Acknowledge WARP accepting some unusual CreateCommittedResource() configuration. A software implementation can conceivably satisfy some requests that cannot work on real hardware. --- tests/d3d12.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index bfbbf804..73b21908 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1700,28 +1700,36 @@ static void test_create_committed_resource(void) hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, (void **)&resource); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG || broken(test_options.use_warp_device), "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12Resource_Release(resource); resource_desc.Width = 31; resource_desc.Height = 32; hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, (void **)&resource); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG || broken(test_options.use_warp_device), "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12Resource_Release(resource); resource_desc.Width = 30; resource_desc.Height = 30; hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, (void **)&resource); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG || broken(test_options.use_warp_device), "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12Resource_Release(resource); resource_desc.Width = 2; resource_desc.Height = 2; hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, (void **)&resource); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG || broken(test_options.use_warp_device), "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12Resource_Release(resource); resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE1D; resource_desc.Width = 32; @@ -1778,11 +1786,16 @@ static void test_create_committed_resource(void) hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, (void **)&resource); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG || broken(test_options.use_warp_device), "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12Resource_Release(resource); + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_COPY_SOURCE, NULL, &IID_ID3D12Resource, (void **)&resource); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG || broken(test_options.use_warp_device), "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12Resource_Release(resource); heap_properties.Type = D3D12_HEAP_TYPE_READBACK; @@ -1801,7 +1814,10 @@ static void test_create_committed_resource(void) hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, (void **)&resource); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG || broken(test_options.use_warp_device), "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12Resource_Release(resource); + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_GENERIC_READ, NULL, &IID_ID3D12Resource, (void **)&resource);

1 0

Conor McCarthy : vkd3d-shader/dxil: Handle multi-row signature elements.
by Alexandre Julliard 16 Oct '23

16 Oct '23

Module: vkd3d Branch: master Commit: e0d0a04b7989369dbac701df8ddaafa4866bcc0e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e0d0a04b7989369dbac701df8ddaa… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Oct 3 11:59:09 2023 +1000 vkd3d-shader/dxil: Handle multi-row signature elements. --- libs/vkd3d-shader/dxil.c | 15 ++++++++++++--- tests/hlsl/entry-point-semantics.shader_test | 17 +++++++++++++---- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 7e3a1257..47b26194 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2384,7 +2384,7 @@ static void sm6_parser_init_signature(struct sm6_parser *sm6, const struct shade { struct vkd3d_shader_dst_param *param; const struct signature_element *e; - unsigned int i; + unsigned int i, count; for (i = 0; i < s->element_count; ++i) { @@ -2392,8 +2392,11 @@ static void sm6_parser_init_signature(struct sm6_parser *sm6, const struct shade param = &params[i]; dst_param_io_init(param, e, reg_type); - param->reg.idx[0].offset = i; - param->reg.idx_count = 1; + count = 0; + if (e->register_count > 1) + param->reg.idx[count++].offset = 0; + param->reg.idx[count++].offset = i; + param->reg.idx_count = count; } } @@ -2427,6 +2430,12 @@ static void sm6_parser_emit_signature(struct sm6_parser *sm6, const struct shade ins->flags = e->interpolation_mode; *param = params[i]; + + if (e->register_count > 1) + { + param->reg.idx[0].rel_addr = NULL; + param->reg.idx[0].offset = e->register_count; + } } } diff --git a/tests/hlsl/entry-point-semantics.shader_test b/tests/hlsl/entry-point-semantics.shader_test index 6d355ab5..d177b037 100644 --- a/tests/hlsl/entry-point-semantics.shader_test +++ b/tests/hlsl/entry-point-semantics.shader_test @@ -84,7 +84,7 @@ float4 main(in apple a) : sv_target [test] draw quad -todo(sm>=6) probe (0, 0) rgba (10.0, 20.0, 30.0, 40.0) +probe (0, 0) rgba (10.0, 20.0, 30.0, 40.0) % Arrays of matrices get successive indexes. @@ -101,7 +101,12 @@ float4 main(in apple a) : sv_target [test] draw quad -todo(sm>=6) probe (0, 0) rgba (10.0, 11.0, 30.0, 31.0) +probe (0, 0) rgba (10.0, 11.0, 30.0, 31.0) + + +% dxcompiler emits correct array addressing. +[require] +shader model < 6.0 % Arrays (even multi-dimensional) of struct elements are allowed. The fields in the different struct @@ -145,6 +150,10 @@ draw quad todo(sm>=6) probe (0, 0) rgba (10.0, 11.0, 20.0, 21.0) +[require] +% reset requirements + + [pixel shader fail] struct apple { @@ -201,7 +210,7 @@ float4 main(in float4 tex0 : TEXCOORD0, in float4 tex1 : TEXCOORD1) : sv_target [test] draw quad -todo(sm>=6) probe (0, 0) rgba (1.0, 2.0, 10.0, 20.0) +probe (0, 0) rgba (1.0, 2.0, 10.0, 20.0) % Output semantics cannot be mapped to more than one value. @@ -272,7 +281,7 @@ float4 main(in float4 a : TEXCOORD0, in float3 b : TEXCOORD1) : sv_target [test] draw quad -todo(sm>=6) probe (0, 0) rgba (10.0, 11.0, 20.0, 21.0) +probe (0, 0) rgba (10.0, 11.0, 20.0, 21.0) % In SM4, duplicated input semantics can only have different types if they have the same layout and

1 0

Conor McCarthy : vkd3d-shader/dxil: Handle signature element additional tag/value pairs.
by Alexandre Julliard 16 Oct '23

16 Oct '23

Module: vkd3d Branch: master Commit: 7113064a1914d3ad56a19fe1af5c3f50f00e37c2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7113064a1914d3ad56a19fe1af5c3… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Oct 2 12:24:04 2023 +1000 vkd3d-shader/dxil: Handle signature element additional tag/value pairs. --- libs/vkd3d-shader/dxil.c | 84 ++++++++++++++++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 81 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 48fbcaf1..7e3a1257 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -214,6 +214,14 @@ enum dxil_semantic_kind SEMANTIC_KIND_INVALID = SEMANTIC_KIND_COUNT, }; +enum dxil_element_additional_tag +{ + ADDITIONAL_TAG_STREAM_INDEX = 0, + ADDITIONAL_TAG_GLOBAL_SYMBOL = 1, /* not used */ + ADDITIONAL_TAG_RELADDR_MASK = 2, + ADDITIONAL_TAG_USED_MASK = 3, +}; + enum dx_intrinsic_opcode { DX_LOAD_INPUT = 4, @@ -3306,6 +3314,76 @@ static const struct sm6_metadata_value *sm6_parser_find_named_metadata(struct sm return NULL; } +static void signature_element_read_additional_element_values(struct signature_element *e, + const struct sm6_metadata_node *node, struct sm6_parser *sm6) +{ + unsigned int i, operand_count, value; + enum dxil_element_additional_tag tag; + + if (node->operand_count < 11 || !node->operands[10]) + return; + + if (!sm6_metadata_value_is_node(node->operands[10])) + { + WARN("Additional values list is not a node.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_SIGNATURE, + "Signature element additional values list is not a metadata node."); + return; + } + + node = node->operands[10]->u.node; + if (node->operand_count & 1) + { + WARN("Operand count is not even.\n"); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, + "Operand count for signature element additional tag/value pairs is not even."); + } + operand_count = node->operand_count & ~1u; + + for (i = 0; i < operand_count; i += 2) + { + if (!sm6_metadata_get_uint_value(sm6, node->operands[i], &tag) + || !sm6_metadata_get_uint_value(sm6, node->operands[i + 1], &value)) + { + WARN("Failed to extract tag/value pair.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_SIGNATURE, + "Signature element tag/value pair at index %u is not an integer pair.", i); + continue; + } + + switch (tag) + { + case ADDITIONAL_TAG_STREAM_INDEX: + e->stream_index = value; + break; + case ADDITIONAL_TAG_RELADDR_MASK: + /* A mask of components accessed via relative addressing. Seems to replace TPF 'dcl_index_range'. */ + if (value > VKD3DSP_WRITEMASK_ALL) + { + WARN("Invalid relative addressed mask %#x.\n", value); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_INVALID_MASK, + "Mask %#x of relative-addressed components is invalid.", value); + } + break; + case ADDITIONAL_TAG_USED_MASK: + if (value > VKD3DSP_WRITEMASK_ALL) + { + WARN("Invalid used mask %#x.\n", value); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_INVALID_MASK, + "Mask %#x of used components is invalid.", value); + value &= VKD3DSP_WRITEMASK_ALL; + } + e->used_mask = value; + break; + default: + FIXME("Unhandled tag %u, value %u.\n", tag, value); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, + "Tag %#x for signature element additional value %#x is unhandled.", tag, value); + break; + } + } +} + static enum vkd3d_result sm6_parser_read_signature(struct sm6_parser *sm6, const struct sm6_metadata_value *m, struct shader_signature *s) { @@ -3396,9 +3474,6 @@ static enum vkd3d_result sm6_parser_read_signature(struct sm6_parser *sm6, const } e->semantic_name = element_node->operands[1]->u.string_value; - /* TODO: load from additional tag/value pairs. */ - e->stream_index = 0; - e->component_type = vkd3d_component_type_from_dxil_component_type(values[2]); e->min_precision = minimum_precision_from_dxil_component_type(values[2]); @@ -3442,9 +3517,10 @@ static enum vkd3d_result sm6_parser_read_signature(struct sm6_parser *sm6, const } e->mask = vkd3d_write_mask_from_component_count(column_count) << index; - /* TODO: load from additional tag/value pairs. */ e->used_mask = e->mask; + signature_element_read_additional_element_values(e, element_node, sm6); + m = element_node->operands[4]; if (!sm6_metadata_value_is_node(m)) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b5171ba6..2c84cb10 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -187,6 +187,7 @@ enum vkd3d_shader_error VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS = 8304, VKD3D_SHADER_WARNING_DXIL_TYPE_MISMATCH = 8305, VKD3D_SHADER_WARNING_DXIL_ENTRY_POINT_MISMATCH = 8306, + VKD3D_SHADER_WARNING_DXIL_INVALID_MASK = 8307, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED = 9000, VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER = 9001,

1 0

Conor McCarthy : vkd3d-shader/dxil: Read the DXIL input and output signatures.
by Alexandre Julliard 16 Oct '23

16 Oct '23

Module: vkd3d Branch: master Commit: 8648ca0e776214ffa1538a791c15a9fcf29911fb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8648ca0e776214ffa1538a791c15a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Sep 28 16:33:11 2023 +1000 vkd3d-shader/dxil: Read the DXIL input and output signatures. These can differ from the DXBC signatures by having multiple rows, and load/store instructions reference them by id instead of register index. --- libs/vkd3d-shader/dxbc.c | 2 + libs/vkd3d-shader/dxil.c | 358 ++++++++++++++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 4 + 3 files changed, 360 insertions(+), 4 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/dxil: Validate the entry point info.
by Alexandre Julliard 16 Oct '23

16 Oct '23

Module: vkd3d Branch: master Commit: 62badbff7ac181318df2eb6489c6c15485cb8a0f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/62badbff7ac181318df2eb6489c6c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Sep 28 16:25:39 2023 +1000 vkd3d-shader/dxil: Validate the entry point info. --- libs/vkd3d-shader/dxil.c | 112 ++++++++++++++++++++++++++++--- libs/vkd3d-shader/vkd3d_shader_private.h | 2 + 2 files changed, 105 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 9e591af2..fdcb8401 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -358,6 +358,8 @@ struct sm6_parser struct sm6_symbol *global_symbols; size_t global_symbol_count; + const char *entry_point; + struct vkd3d_shader_dst_param *output_params; struct vkd3d_shader_dst_param *input_params; @@ -2710,6 +2712,11 @@ static bool sm6_metadata_value_is_node(const struct sm6_metadata_value *m) return m && m->type == VKD3D_METADATA_NODE; } +static bool sm6_metadata_value_is_string(const struct sm6_metadata_value *m) +{ + return m && m->type == VKD3D_METADATA_STRING; +} + static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const struct dxil_block *block, struct sm6_function *function) { @@ -3135,6 +3142,77 @@ static enum vkd3d_result sm6_parser_metadata_init(struct sm6_parser *sm6, const return VKD3D_OK; } +static const struct sm6_metadata_value *sm6_parser_find_named_metadata(struct sm6_parser *sm6, const char *name) +{ + const struct sm6_metadata_node *node; + unsigned int i; + + for (i = 0; i < sm6->named_metadata_count; ++i) + { + if (strcmp(sm6->named_metadata[i].name, name)) + continue; + + node = sm6->named_metadata[i].value.u.node; + if (!node->operand_count) + return NULL; + if (node->operand_count > 1) + { + FIXME("Ignoring %u extra operands for %s.\n", node->operand_count - 1, name); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, + "Ignoring %u extra operands for metadata node %s.", node->operand_count - 1, name); + } + return node->operands[0]; + } + + return NULL; +} + +static enum vkd3d_result sm6_parser_entry_point_init(struct sm6_parser *sm6) +{ + const struct sm6_metadata_value *m = sm6_parser_find_named_metadata(sm6, "dx.entryPoints"); + const struct sm6_metadata_node *entry_node = m ? m->u.node : NULL; + const struct sm6_value *value; + + if (!entry_node || entry_node->operand_count < 2 || !(m = entry_node->operands[0])) + { + WARN("No entry point definition found.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_ENTRY_POINT, + "No entry point definition found in the metadata."); + return VKD3D_ERROR_INVALID_SHADER; + } + + if (m->type != VKD3D_METADATA_VALUE) + { + WARN("Entry point definition is not a value.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_ENTRY_POINT, + "Entry point definition is not a metadata value."); + return VKD3D_ERROR_INVALID_SHADER; + } + + value = m->u.value; + if (!sm6_value_is_function_dcl(value)) + { + WARN("Entry point value is not a function definition.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_ENTRY_POINT, + "Entry point metadata value does not contain a function definition."); + return VKD3D_ERROR_INVALID_SHADER; + } + + sm6->entry_point = value->u.function.name; + if (!sm6_metadata_value_is_string(entry_node->operands[1]) + || ascii_strcasecmp(sm6->entry_point, entry_node->operands[1]->u.string_value)) + { + WARN("Entry point function name %s mismatch.\n", sm6->entry_point); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_ENTRY_POINT_MISMATCH, + "Entry point function name %s does not match the name in metadata.", sm6->entry_point); + } + + sm6_parser_init_input_signature(sm6, &sm6->p.shader_desc.input_signature); + sm6_parser_init_output_signature(sm6, &sm6->p.shader_desc.output_signature); + + return VKD3D_OK; +} + static void sm6_metadata_value_destroy(struct sm6_metadata_value *m) { switch (m->type) @@ -3245,6 +3323,15 @@ static const struct vkd3d_shader_parser_ops sm6_parser_ops = .parser_destroy = sm6_parser_destroy, }; +static struct sm6_function *sm6_parser_get_function(const struct sm6_parser *sm6, const char *name) +{ + size_t i; + for (i = 0; i < sm6->function_count; ++i) + if (!ascii_strcasecmp(sm6->functions[i].declaration->u.function.name, name)) + return &sm6->functions[i]; + return NULL; +} + static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t *byte_code, size_t byte_code_size, const char *source_name, struct vkd3d_shader_message_context *message_context) { @@ -3257,6 +3344,7 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t enum bitcode_block_abbreviation abbr; struct vkd3d_shader_version version; struct dxil_block *block; + struct sm6_function *fn; enum vkd3d_result ret; unsigned int i, j; @@ -3469,8 +3557,8 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t return ret; } - sm6_parser_init_output_signature(sm6, output_signature); - sm6_parser_init_input_signature(sm6, input_signature); + if ((ret = sm6_parser_entry_point_init(sm6)) < 0) + return ret; if ((ret = sm6_parser_module_init(sm6, &sm6->root_block, 0)) < 0) { @@ -3494,14 +3582,20 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t sm6->p.shader_desc.ssa_count = sm6->ssa_next_id; - for (i = 0; i < sm6->function_count; ++i) + if (!(fn = sm6_parser_get_function(sm6, sm6->entry_point))) { - if (!sm6_block_emit_instructions(sm6->functions[i].blocks[0], sm6)) - { - vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, - "Out of memory emitting shader instructions."); - return VKD3D_ERROR_OUT_OF_MEMORY; - } + WARN("Failed to find entry point %s.\n", sm6->entry_point); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_ENTRY_POINT, + "The definition of the entry point function '%s' was not found.", sm6->entry_point); + return VKD3D_ERROR_INVALID_SHADER; + } + + assert(sm6->function_count == 1); + if (!sm6_block_emit_instructions(fn->blocks[0], sm6)) + { + vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, + "Out of memory emitting shader instructions."); + return VKD3D_ERROR_OUT_OF_MEMORY; } dxil_block_destroy(&sm6->root_block); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 060647a6..a0140c67 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -177,6 +177,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND = 8012, VKD3D_SHADER_ERROR_DXIL_UNHANDLED_INTRINSIC = 8013, VKD3D_SHADER_ERROR_DXIL_INVALID_METADATA = 8014, + VKD3D_SHADER_ERROR_DXIL_INVALID_ENTRY_POINT = 8015, VKD3D_SHADER_WARNING_DXIL_UNKNOWN_MAGIC_NUMBER = 8300, VKD3D_SHADER_WARNING_DXIL_UNKNOWN_SHADER_TYPE = 8301, @@ -184,6 +185,7 @@ enum vkd3d_shader_error VKD3D_SHADER_WARNING_DXIL_INVALID_MODULE_LENGTH = 8303, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS = 8304, VKD3D_SHADER_WARNING_DXIL_TYPE_MISMATCH = 8305, + VKD3D_SHADER_WARNING_DXIL_ENTRY_POINT_MISMATCH = 8306, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED = 9000, VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER = 9001,

1 0

Henri Verbeet : tests: Use the same viewport origin and front-face orientation in the Vulkan and D3D runners.
by Alexandre Julliard 16 Oct '23

16 Oct '23

Module: vkd3d Branch: master Commit: e53178f39502ba4ae0169a21f4f1cea5f54c4255 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e53178f39502ba4ae0169a21f4f1c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 6 14:16:59 2023 +0200 tests: Use the same viewport origin and front-face orientation in the Vulkan and D3D runners. I.e., top-left origin, and clockwise front-facing. These end up cancelling each other out when drawing full-screen quads, but that's not necessarily true for other geometry. --- tests/shader_runner_vulkan.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index ebb15eba..f89b4d62 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -599,7 +599,8 @@ static VkPipeline create_graphics_pipeline(const struct vulkan_shader_runner *ru VkPipelineVertexInputStateCreateInfo input_desc = {.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO}; VkPipelineColorBlendStateCreateInfo blend_desc = {.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO}; VkPipelineMultisampleStateCreateInfo ms_desc = {.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO}; - static const VkViewport viewport = {.width = RENDER_TARGET_WIDTH, .height = RENDER_TARGET_HEIGHT, .maxDepth = 1}; + static const VkViewport viewport = {.y = RENDER_TARGET_HEIGHT, + .width = RENDER_TARGET_WIDTH, .height = -RENDER_TARGET_HEIGHT, .maxDepth = 1}; VkPipelineViewportStateCreateInfo vp_desc = {.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO}; static const VkRect2D rt_rect = {.extent.width = RENDER_TARGET_WIDTH, .extent.height = RENDER_TARGET_HEIGHT}; VkGraphicsPipelineCreateInfo pipeline_desc = {.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO}; @@ -699,6 +700,7 @@ static VkPipeline create_graphics_pipeline(const struct vulkan_shader_runner *ru vp_desc.pScissors = &rt_rect; rs_desc.cullMode = VK_CULL_MODE_NONE; + rs_desc.frontFace = VK_FRONT_FACE_CLOCKWISE; rs_desc.lineWidth = 1.0f; ms_desc.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; @@ -1190,6 +1192,7 @@ static bool get_graphics_queue_index(const struct vulkan_shader_runner *runner, static const char *const required_device_extensions[] = { VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, + VK_KHR_MAINTENANCE1_EXTENSION_NAME, }; static bool has_extension(const VkExtensionProperties *extensions, uint32_t count, const char *extension_name)

1 0

Alexandre Julliard : makefiles: Always use the global SOURCES variable for .y files.
by Alexandre Julliard 16 Oct '23

16 Oct '23

Module: wine Branch: master Commit: ffeb530cc0bd21016d1ea718de720edb3879d8d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/ffeb530cc0bd21016d1ea718de720e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 14 13:51:42 2023 +0200 makefiles: Always use the global SOURCES variable for .y files. --- dlls/jscript/Makefile.in | 17 ++++++----------- dlls/msi/Makefile.in | 17 ++++++----------- dlls/vbscript/Makefile.in | 13 ++++--------- dlls/wbemprox/Makefile.in | 10 ++++------ tools/make_makefiles | 4 +--- 5 files changed, 21 insertions(+), 40 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 3e019201eb8..c37b0dd69f3 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -1,10 +1,11 @@ MODULE = jscript.dll IMPORTS = oleaut32 ole32 user32 advapi32 -C_SRCS = \ +SOURCES = \ activex.c \ array.c \ bool.c \ + cc_parser.y \ compile.c \ date.c \ decode.c \ @@ -15,7 +16,10 @@ C_SRCS = \ function.c \ global.c \ jscript.c \ + jscript.rc \ + jscript_classes.idl \ jscript_main.c \ + jsglobal.idl \ json.c \ jsregexp.c \ jsstr.c \ @@ -24,17 +28,8 @@ C_SRCS = \ math.c \ number.c \ object.c \ + parser.y \ regexp.c \ set.c \ string.c \ vbarray.c - -RC_SRCS = jscript.rc - -IDL_SRCS = \ - jscript_classes.idl \ - jsglobal.idl - -BISON_SRCS = \ - cc_parser.y \ - parser.y diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index 7140e5a3308..21420909a92 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -4,13 +4,14 @@ IMPORTS = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 EXTRAIDLFLAGS = --prefix-server=s_ -C_SRCS = \ +SOURCES = \ action.c \ alter.c \ appsearch.c \ assembly.c \ automation.c \ classes.c \ + cond.y \ create.c \ custom.c \ database.c \ @@ -26,8 +27,10 @@ C_SRCS = \ install.c \ media.c \ msi.c \ + msi.rc \ msi_main.c \ msiquery.c \ + msiserver.idl \ package.c \ patch.c \ record.c \ @@ -35,6 +38,7 @@ C_SRCS = \ script.c \ select.c \ source.c \ + sql.y \ storages.c \ streams.c \ string.c \ @@ -43,14 +47,5 @@ C_SRCS = \ tokenize.c \ update.c \ upgrade.c \ - where.c - -IDL_SRCS = \ - msiserver.idl \ + where.c \ winemsi.idl - -BISON_SRCS = \ - cond.y \ - sql.y - -RC_SRCS = msi.rc diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in index a6a0569cc03..0dcc928460b 100644 --- a/dlls/vbscript/Makefile.in +++ b/dlls/vbscript/Makefile.in @@ -3,25 +3,20 @@ IMPORTS = oleaut32 ole32 user32 EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ compile.c \ global.c \ interp.c \ lex.c \ + parser.y \ regexp.c \ utils.c \ vbdisp.c \ vbregexp.c \ vbscript.c \ - vbscript_main.c - -BISON_SRCS = \ - parser.y - -RC_SRCS = vbscript.rc - -IDL_SRCS = \ + vbscript.rc \ vbscript_classes.idl \ + vbscript_main.c \ vbsglobal.idl \ vbsregexp10.idl \ vbsregexp55.idl diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index 48a43646491..53835c748ff 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,7 +1,7 @@ MODULE = wbemprox.dll IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4 setupapi -C_SRCS = \ +SOURCES = \ builtin.c \ class.c \ main.c \ @@ -14,8 +14,6 @@ C_SRCS = \ services.c \ sysrestore.c \ table.c \ - wbemlocator.c - -IDL_SRCS = wbemprox.idl - -BISON_SRCS = wql.y + wbemlocator.c \ + wbemprox.idl \ + wql.y diff --git a/tools/make_makefiles b/tools/make_makefiles index bd84414d9c5..0e4a31648c3 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -338,12 +338,11 @@ sub assign_sources_to_makefiles(@) my $make = $makefiles{"$dir/Makefile.in"}; my $name = substr( $file, length($dir) + 1 ); - if ($name =~ /\.(in|l|m|mc|po|sfd|svg)$/) + if ($name =~ /\.(in|l|m|mc|po|sfd|svg|y)$/) { push @{${$make}{"=SOURCES"}}, $name; next; } - elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; } elsif ($name =~ /\.c$/) { push @{${$make}{"=C_SRCS"}}, $name; @@ -394,7 +393,6 @@ sub assign_sources_to_makefiles(@) preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "C_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "RC_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "IDL_SRCS" ); - preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "BISON_SRCS" ); } }

1 0

Alexandre Julliard : makefiles: Always use the global SOURCES variable for .l files.
by Alexandre Julliard 16 Oct '23

16 Oct '23

Module: wine Branch: master Commit: 94771cf07ad41b0f7d792559771222855ac01ba6 URL: https://gitlab.winehq.org/wine/wine/-/commit/94771cf07ad41b0f7d792559771222… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 14 13:50:44 2023 +0200 makefiles: Always use the global SOURCES variable for .l files. --- dlls/d3dcompiler_33/Makefile.in | 15 +++++---------- dlls/d3dcompiler_34/Makefile.in | 15 +++++---------- dlls/d3dcompiler_35/Makefile.in | 15 +++++---------- dlls/d3dcompiler_36/Makefile.in | 15 +++++---------- dlls/d3dcompiler_37/Makefile.in | 15 +++++---------- dlls/d3dcompiler_38/Makefile.in | 15 +++++---------- dlls/d3dcompiler_39/Makefile.in | 15 +++++---------- dlls/d3dcompiler_40/Makefile.in | 15 +++++---------- dlls/d3dcompiler_41/Makefile.in | 15 +++++---------- dlls/d3dcompiler_42/Makefile.in | 15 +++++---------- dlls/d3dcompiler_43/Makefile.in | 15 +++++---------- dlls/d3dcompiler_46/Makefile.in | 15 +++++---------- dlls/d3dcompiler_47/Makefile.in | 15 +++++---------- dlls/msxml3/Makefile.in | 22 ++++++++-------------- tools/make_makefiles | 4 +--- 15 files changed, 74 insertions(+), 147 deletions(-) diff --git a/dlls/d3dcompiler_33/Makefile.in b/dlls/d3dcompiler_33/Makefile.in index c9aff6e7edd..5bc3b44e879 100644 --- a/dlls/d3dcompiler_33/Makefile.in +++ b/dlls/d3dcompiler_33/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_34/Makefile.in b/dlls/d3dcompiler_34/Makefile.in index 9d8f48e48ee..e31d74fd902 100644 --- a/dlls/d3dcompiler_34/Makefile.in +++ b/dlls/d3dcompiler_34/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_35/Makefile.in b/dlls/d3dcompiler_35/Makefile.in index 1da7eca6c01..49be82f2593 100644 --- a/dlls/d3dcompiler_35/Makefile.in +++ b/dlls/d3dcompiler_35/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_36/Makefile.in b/dlls/d3dcompiler_36/Makefile.in index 62be7b22281..30f3e183396 100644 --- a/dlls/d3dcompiler_36/Makefile.in +++ b/dlls/d3dcompiler_36/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_37/Makefile.in b/dlls/d3dcompiler_37/Makefile.in index e8759d9e577..072e27a86d2 100644 --- a/dlls/d3dcompiler_37/Makefile.in +++ b/dlls/d3dcompiler_37/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_38/Makefile.in b/dlls/d3dcompiler_38/Makefile.in index da528cc0509..a03cdd730c8 100644 --- a/dlls/d3dcompiler_38/Makefile.in +++ b/dlls/d3dcompiler_38/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_39/Makefile.in b/dlls/d3dcompiler_39/Makefile.in index 94ec5aae839..2f9231871f1 100644 --- a/dlls/d3dcompiler_39/Makefile.in +++ b/dlls/d3dcompiler_39/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_40/Makefile.in b/dlls/d3dcompiler_40/Makefile.in index 10665d863ca..f6451bcad53 100644 --- a/dlls/d3dcompiler_40/Makefile.in +++ b/dlls/d3dcompiler_40/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_41/Makefile.in b/dlls/d3dcompiler_41/Makefile.in index 5d522857173..433a2cb03a3 100644 --- a/dlls/d3dcompiler_41/Makefile.in +++ b/dlls/d3dcompiler_41/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_42/Makefile.in b/dlls/d3dcompiler_42/Makefile.in index 613ddee223e..9f4f571b5bd 100644 --- a/dlls/d3dcompiler_42/Makefile.in +++ b/dlls/d3dcompiler_42/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index d02280305e8..51993fd0d79 100644 --- a/dlls/d3dcompiler_43/Makefile.in +++ b/dlls/d3dcompiler_43/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_46/Makefile.in b/dlls/d3dcompiler_46/Makefile.in index 1d82dfed1d9..1466c060ebf 100644 --- a/dlls/d3dcompiler_46/Makefile.in +++ b/dlls/d3dcompiler_46/Makefile.in @@ -7,18 +7,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_47/Makefile.in b/dlls/d3dcompiler_47/Makefile.in index e7df065061c..a98ca7243c1 100644 --- a/dlls/d3dcompiler_47/Makefile.in +++ b/dlls/d3dcompiler_47/Makefile.in @@ -7,18 +7,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in index 2bf789732da..7e59a223143 100644 --- a/dlls/msxml3/Makefile.in +++ b/dlls/msxml3/Makefile.in @@ -2,7 +2,7 @@ MODULE = msxml3.dll IMPORTS = $(XSLT_PE_LIBS) $(XML2_PE_LIBS) uuid urlmon shlwapi oleaut32 ole32 user32 advapi32 EXTRAINCL = $(XSLT_PE_CFLAGS) $(XML2_PE_CFLAGS) -C_SRCS = \ +SOURCES = \ attribute.c \ bsc.c \ cdata.c \ @@ -17,6 +17,7 @@ C_SRCS = \ factory.c \ httprequest.c \ main.c \ + msxml3_v1.idl \ mxnamespace.c \ mxwriter.c \ node.c \ @@ -26,24 +27,17 @@ C_SRCS = \ pi.c \ saxreader.c \ schema.c \ + schemas.rc \ selection.c \ stylesheet.c \ text.c \ uuid.c \ + version.rc \ xdr.c \ xmldoc.c \ xmlelem.c \ xmlparser.c \ - xmlview.c - -LEX_SRCS = xslpattern.l - -BISON_SRCS = xslpattern.y - -RC_SRCS = \ - schemas.rc \ - version.rc - -IDL_SRCS = \ - msxml3_v1.idl \ - xmlparser.idl + xmlparser.idl \ + xmlview.c \ + xslpattern.l \ + xslpattern.y diff --git a/tools/make_makefiles b/tools/make_makefiles index 1e52ee1cf67..bd84414d9c5 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -338,12 +338,11 @@ sub assign_sources_to_makefiles(@) my $make = $makefiles{"$dir/Makefile.in"}; my $name = substr( $file, length($dir) + 1 ); - if ($name =~ /\.(in|m|mc|po|sfd|svg)$/) + if ($name =~ /\.(in|l|m|mc|po|sfd|svg)$/) { push @{${$make}{"=SOURCES"}}, $name; next; } - elsif ($name =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $name; } elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; } elsif ($name =~ /\.c$/) { @@ -395,7 +394,6 @@ sub assign_sources_to_makefiles(@) preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "C_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "RC_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "IDL_SRCS" ); - preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "LEX_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "BISON_SRCS" ); } }

1 0

Alexandre Julliard : makefiles: Always use the global SOURCES variable for .svg files.
by Alexandre Julliard 16 Oct '23

16 Oct '23

Module: wine Branch: master Commit: 2205218b24a4eebb07f97c3b17d9310d3b3aad3f URL: https://gitlab.winehq.org/wine/wine/-/commit/2205218b24a4eebb07f97c3b17d931… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 14 13:47:59 2023 +0200 makefiles: Always use the global SOURCES variable for .svg files. --- dlls/appwiz.cpl/Makefile.in | 9 ++---- dlls/comctl32/Makefile.in | 27 ++++++++---------- dlls/comdlg32/Makefile.in | 14 ++++------ dlls/credui/Makefile.in | 9 ++---- dlls/hhctrl.ocx/Makefile.in | 14 ++++------ dlls/ieframe/Makefile.in | 12 +++----- dlls/inetcpl.cpl/Makefile.in | 9 ++---- dlls/joy.cpl/Makefile.in | 9 ++---- dlls/light.msstyles/Makefile.in | 7 ++--- dlls/ole32/Makefile.in | 28 ++++++++----------- dlls/riched20/Makefile.in | 13 +++------ dlls/shell32/Makefile.in | 61 +++++++++++++++++++---------------------- dlls/user32/Makefile.in | 31 ++++++++++----------- programs/cmd/Makefile.in | 8 ++---- programs/hh/Makefile.in | 10 +++---- programs/iexplore/Makefile.in | 8 ++---- programs/taskmgr/Makefile.in | 9 ++---- programs/winetest/Makefile.in | 11 +++----- programs/winhlp32/Makefile.in | 13 ++++----- programs/wordpad/Makefile.in | 11 +++----- tools/make_makefiles | 3 +- 21 files changed, 125 insertions(+), 191 deletions(-)

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
71
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 October 2023