wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-12-15 08:03:30 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/dxil: Parse string attributes in parameter attribute groups.

Browse Source
This commit is contained in:
Giovanni Mascellani
2025-10-26 22:39:24 +01:00
committed by Henri Verbeet
parent e8db25750c
commit 64738f5d9f
Notes: Henri Verbeet 2025-11-20 18:36:47 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1813
2 changed files with 75 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
libs/vkd3d-shader/dxil.c
View File

@@ -852,6 +852,7 @@ enum dxil_attribute_kind
{
ATTRIBUTE_WELL_KNOWN = 0,
ATTRIBUTE_WELL_KNOWN_WITH_INTEGER_VALUE = 1,
ATTRIBUTE_STRING = 3,
};
struct dxil_attribute
@@ -860,6 +861,7 @@ struct dxil_attribute
union
{
uint64_t well_known;
const char *string;
} key;
union
{
@@ -1614,6 +1616,50 @@ static char *dxil_record_to_string(const struct dxil_record *record, unsigned in
return str;
}
static char *dxil_record_to_zero_terminated_string(const struct dxil_record *record,
unsigned int *offset, struct sm6_parser *dxil)
{
size_t str_len = 0, str_capacity = 0;
char *str = NULL;
unsigned int i;
VKD3D_ASSERT(*offset < record->operand_count);
for (i = *offset; i < record->operand_count; ++i)
{
if (record->operands[i] > UCHAR_MAX)
{
vkd3d_shader_parser_error(&dxil->p, VKD3D_SHADER_ERROR_DXIL_INVALID_STRING,
"Operand value %"PRIu64" is not a valid string character.", record->operands[i]);
vkd3d_free(str);
return NULL;
}
if (!vkd3d_array_reserve((void **)&str, &str_capacity, str_len + 1, sizeof(*str)))
{
vkd3d_shader_parser_error(&dxil->p, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY,
"Out of memory allocating a string of length %zu.", str_len + 1);
vkd3d_free(str);
return NULL;
}
if (!(str[str_len++] = record->operands[i]))
break;
}
if (i == record->operand_count)
{
vkd3d_shader_parser_error(&dxil->p, VKD3D_SHADER_ERROR_DXIL_INVALID_STRING,
"String is not zero-terminated.");
vkd3d_free(str);
return NULL;
}
*offset = i + 1;
return str;
}
static bool dxil_record_validate_operand_min_count(const struct dxil_record *record, unsigned int min_count,
struct sm6_parser *sm6)
{
@@ -8538,6 +8584,11 @@ static void sm6_parser_init_attribute_groups(struct sm6_parser *dxil, const stru
attribute->value.numeric = record->operands[k++];
break;
case ATTRIBUTE_STRING:
if (!(attribute->key.string = dxil_record_to_zero_terminated_string(record, &k, dxil)))
failed = true;
break;
/* TODO Other attribute kinds. */
default:
@@ -10623,6 +10674,29 @@ static void sm6_functions_cleanup(struct sm6_function *functions, size_t count)
static void sm6_parser_cleanup_attribute_groups(struct sm6_parser *dxil)
{
struct dxil_attribute_group *group;
struct dxil_attribute *attribute;
size_t i, j;
for (i = 0; i < dxil->attribute_group_count; ++i)
{
group = &dxil->attribute_groups[i];
for (j = 0; j < group->attribute_count; ++j)
{
attribute = &group->attributes[j];
switch (attribute->kind)
{
case ATTRIBUTE_WELL_KNOWN:
case ATTRIBUTE_WELL_KNOWN_WITH_INTEGER_VALUE:
break;
case ATTRIBUTE_STRING:
vkd3d_free((void *)attribute->key.string);
break;
}
}
}
vkd3d_free(dxil->attribute_groups);
}

1
libs/vkd3d-shader/vkd3d_shader_private.h
View File

@@ -230,6 +230,7 @@ enum vkd3d_shader_error
VKD3D_SHADER_ERROR_DXIL_INVALID_CONSTANT = 8020,
VKD3D_SHADER_ERROR_DXIL_NOT_IMPLEMENTED = 8021,
VKD3D_SHADER_ERROR_DXIL_DUPLICATED_BLOCK = 8022,
VKD3D_SHADER_ERROR_DXIL_INVALID_STRING = 8023,
VKD3D_SHADER_WARNING_DXIL_UNKNOWN_MAGIC_NUMBER = 8300,
VKD3D_SHADER_WARNING_DXIL_UNKNOWN_SHADER_TYPE = 8301,