wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/spirv: Parse the SPIR-V id bound.

Browse Source
This commit is contained in:
Giovanni Mascellani
2024-10-29 16:32:05 -05:00
committed by Henri Verbeet
parent 3f548ccf9c
commit 9b4f5dab77
Notes: Henri Verbeet 2024-12-09 16:17:46 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1239
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libs/vkd3d-shader/spirv.c
View File

@@ -286,7 +286,7 @@ static void spirv_parser_print_generator(struct spirv_parser *parser, uint32_t m
static enum vkd3d_result spirv_parser_read_header(struct spirv_parser *parser) static enum vkd3d_result spirv_parser_read_header(struct spirv_parser *parser)
{ {
uint32_t magic, version, generator; uint32_t magic, version, generator, bound;
unsigned int major, minor; unsigned int major, minor;
if (parser->pos > parser->size || parser->size - parser->pos < VKD3D_SPIRV_HEADER_SIZE) if (parser->pos > parser->size || parser->size - parser->pos < VKD3D_SPIRV_HEADER_SIZE)
@@ -299,6 +299,7 @@ static enum vkd3d_result spirv_parser_read_header(struct spirv_parser *parser)
magic = spirv_parser_read_u32(parser); magic = spirv_parser_read_u32(parser);
version = spirv_parser_read_u32(parser); version = spirv_parser_read_u32(parser);
generator = spirv_parser_read_u32(parser); generator = spirv_parser_read_u32(parser);
bound = spirv_parser_read_u32(parser);
if (magic != SpvMagicNumber) if (magic != SpvMagicNumber)
{ {
@@ -323,11 +324,19 @@ static enum vkd3d_result spirv_parser_read_header(struct spirv_parser *parser)
return VKD3D_ERROR_NOT_IMPLEMENTED; return VKD3D_ERROR_NOT_IMPLEMENTED;
} }
if (!bound)
{
spirv_parser_error(parser, VKD3D_SHADER_ERROR_SPV_INVALID_SHADER,
"Invalid zero id bound.");
return VKD3D_ERROR_INVALID_SHADER;
}
if (parser->formatting & VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER) if (parser->formatting & VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER)
{ {
spirv_parser_print_comment(parser, "SPIR-V"); spirv_parser_print_comment(parser, "SPIR-V");
spirv_parser_print_comment(parser, "Version: %u.%u", major, minor); spirv_parser_print_comment(parser, "Version: %u.%u", major, minor);
spirv_parser_print_generator(parser, generator); spirv_parser_print_generator(parser, generator);
spirv_parser_print_comment(parser, "Bound: %u", bound);
} }
return VKD3D_OK; return VKD3D_OK;