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 with string value 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 64738f5d9f
commit 44c80c60b8
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 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -853,6 +853,7 @@ enum dxil_attribute_kind
ATTRIBUTE_WELL_KNOWN = 0, ATTRIBUTE_WELL_KNOWN = 0,
ATTRIBUTE_WELL_KNOWN_WITH_INTEGER_VALUE = 1, ATTRIBUTE_WELL_KNOWN_WITH_INTEGER_VALUE = 1,
ATTRIBUTE_STRING = 3, ATTRIBUTE_STRING = 3,
ATTRIBUTE_STRING_WITH_STRING_VALUE = 4,
}; };
struct dxil_attribute struct dxil_attribute
@@ -866,6 +867,7 @@ struct dxil_attribute
union union
{ {
uint64_t numeric; uint64_t numeric;
const char *string;
} value; } value;
}; };
@@ -8589,11 +8591,15 @@ static void sm6_parser_init_attribute_groups(struct sm6_parser *dxil, const stru
failed = true; failed = true;
break; break;
/* TODO Other attribute kinds. */ case ATTRIBUTE_STRING_WITH_STRING_VALUE:
if (!(attribute->key.string = dxil_record_to_zero_terminated_string(record, &k, dxil))
|| !(attribute->value.string = dxil_record_to_zero_terminated_string(record, &k, dxil)))
failed = true;
break;
default: default:
/* Do not emit an error to avoid rejecting valid shaders, vkd3d_shader_parser_error(&dxil->p, VKD3D_SHADER_ERROR_DXIL_INVALID_ATTRIBUTE_KIND,
* given that so far we don't use attributes but don't support all the kinds. */ "Unrecognised PARAMATTR_GROUP attribute kind %"PRIu64".", kind);
failed = true; failed = true;
break; break;
} }
@@ -10693,6 +10699,11 @@ static void sm6_parser_cleanup_attribute_groups(struct sm6_parser *dxil)
case ATTRIBUTE_STRING: case ATTRIBUTE_STRING:
vkd3d_free((void *)attribute->key.string); vkd3d_free((void *)attribute->key.string);
break; break;
case ATTRIBUTE_STRING_WITH_STRING_VALUE:
vkd3d_free((void *)attribute->key.string);
vkd3d_free((void *)attribute->value.string);
break;
} }
} }
} }

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

@@ -231,6 +231,7 @@ enum vkd3d_shader_error
VKD3D_SHADER_ERROR_DXIL_NOT_IMPLEMENTED = 8021, VKD3D_SHADER_ERROR_DXIL_NOT_IMPLEMENTED = 8021,
VKD3D_SHADER_ERROR_DXIL_DUPLICATED_BLOCK = 8022, VKD3D_SHADER_ERROR_DXIL_DUPLICATED_BLOCK = 8022,
VKD3D_SHADER_ERROR_DXIL_INVALID_STRING = 8023, VKD3D_SHADER_ERROR_DXIL_INVALID_STRING = 8023,
VKD3D_SHADER_ERROR_DXIL_INVALID_ATTRIBUTE_KIND = 8024,
VKD3D_SHADER_WARNING_DXIL_UNKNOWN_MAGIC_NUMBER = 8300, VKD3D_SHADER_WARNING_DXIL_UNKNOWN_MAGIC_NUMBER = 8300,
VKD3D_SHADER_WARNING_DXIL_UNKNOWN_SHADER_TYPE = 8301, VKD3D_SHADER_WARNING_DXIL_UNKNOWN_SHADER_TYPE = 8301,