-- v2: vkd3d-shader/dxil: Use strcmp() to find the handle type. vkd3d-shader/dxil: Use strcmp() to find function names. vkd3d-shader/dxil: Use strcmp() to check the entry point name.
From: Conor McCarthy cmccarthy@codeweavers.com
Function names are case-sensitive. --- libs/vkd3d-shader/dxil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 15cc380f5..1e0a1e682 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -6726,7 +6726,7 @@ static enum vkd3d_result sm6_parser_entry_point_init(struct sm6_parser *sm6)
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)) + || strcmp(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,
From: Conor McCarthy cmccarthy@codeweavers.com
Function names are case-sensitive. --- libs/vkd3d-shader/dxil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 1e0a1e682..77d092510 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -6916,7 +6916,7 @@ static struct sm6_function *sm6_parser_get_function(const struct sm6_parser *sm6 { size_t i; for (i = 0; i < sm6->function_count; ++i) - if (!ascii_strcasecmp(sm6->functions[i].declaration->u.function.name, name)) + if (!strcmp(sm6->functions[i].declaration->u.function.name, name)) return &sm6->functions[i]; return NULL; }
From: Conor McCarthy cmccarthy@codeweavers.com
We use strcmp() on the same type name elsewhere, and case-insensitive matching does not seem necessary. --- libs/vkd3d-shader/dxil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 77d092510..b6a9d49e2 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -1628,7 +1628,7 @@ static enum vkd3d_result sm6_parser_type_table_init(struct sm6_parser *sm6) break; }
- if (!ascii_strcasecmp(struct_name, "dx.types.Handle")) + if (!strcmp(struct_name, "dx.types.Handle")) sm6->handle_type = type;
type->u.struc->name = struct_name;
This merge request was approved by Henri Verbeet.