wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Introduce vkd3d_shader_parser_error().

Browse Source 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2021-10-06 17:11:46 +02:00 committed by Alexandre Julliard
parent a0c2e52b4b
commit f5c6f2ea0e
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libs/vkd3d-shader/dxbc.c
View File

@ -175,18 +175,6 @@ static bool shader_is_sm_5_1(const struct vkd3d_shader_sm4_parser *sm4)
return version->major >= 5 && version->minor >= 1; return version->major >= 5 && version->minor >= 1;
} }
static void VKD3D_PRINTF_FUNC(3, 4) shader_sm4_error(struct vkd3d_shader_sm4_parser *sm4,
enum vkd3d_shader_error error, const char *format, ...)
{
va_list args;
va_start(args, format);
vkd3d_shader_verror(sm4->p.message_context, &sm4->p.location, error, format, args);
va_end(args);
sm4->p.failed = true;
}
static bool shader_sm4_read_src_param(struct vkd3d_shader_sm4_parser *priv, const uint32_t **ptr, static bool shader_sm4_read_src_param(struct vkd3d_shader_sm4_parser *priv, const uint32_t **ptr,
const uint32_t *end, enum vkd3d_data_type data_type, struct vkd3d_shader_src_param *src_param); const uint32_t *end, enum vkd3d_data_type data_type, struct vkd3d_shader_src_param *src_param);
static bool shader_sm4_read_dst_param(struct vkd3d_shader_sm4_parser *priv, const uint32_t **ptr, static bool shader_sm4_read_dst_param(struct vkd3d_shader_sm4_parser *priv, const uint32_t **ptr,
@ -246,15 +234,15 @@ static void shader_sm4_read_shader_data(struct vkd3d_shader_instruction *ins, ui
ins->declaration.icb = &priv->icb; ins->declaration.icb = &priv->icb;
} }
static void shader_sm4_set_descriptor_register_range(struct vkd3d_shader_sm4_parser *priv, static void shader_sm4_set_descriptor_register_range(struct vkd3d_shader_sm4_parser *sm4,
struct vkd3d_shader_register *reg, struct vkd3d_shader_register_range *range) struct vkd3d_shader_register *reg, struct vkd3d_shader_register_range *range)
{ {
range->first = reg->idx[1].offset; range->first = reg->idx[1].offset;
range->last = reg->idx[shader_is_sm_5_1(priv) ? 2 : 1].offset; range->last = reg->idx[shader_is_sm_5_1(sm4) ? 2 : 1].offset;
if (range->last < range->first) if (range->last < range->first)
{ {
FIXME("Invalid register range [%u:%u].\n", range->first, range->last); FIXME("Invalid register range [%u:%u].\n", range->first, range->last);
shader_sm4_error(priv, VKD3D_SHADER_ERROR_TPF_INVALID_REGISTER_RANGE, vkd3d_shader_parser_error(&sm4->p, VKD3D_SHADER_ERROR_TPF_INVALID_REGISTER_RANGE,
"Last register %u must not be less than first register %u in range.\n", range->last, range->first); "Last register %u must not be less than first register %u in range.\n", range->last, range->first);
} }
} }

12
libs/vkd3d-shader/vkd3d_shader_main.c
View File

@ -378,6 +378,18 @@ static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser)
shader_sm4_free(parser); shader_sm4_free(parser);
} }
void VKD3D_PRINTF_FUNC(3, 4) vkd3d_shader_parser_error(struct vkd3d_shader_parser *parser,
enum vkd3d_shader_error error, const char *format, ...)
{
va_list args;
va_start(args, format);
vkd3d_shader_verror(parser->message_context, &parser->location, error, format, args);
va_end(args);
parser->failed = true;
}
static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_info *compile_info, static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_info *compile_info,
bool validate_target_type) bool validate_target_type)
{ {

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

@ -904,6 +904,8 @@ struct vkd3d_shader_parser
const uint32_t *ptr; const uint32_t *ptr;
}; };
void vkd3d_shader_parser_error(struct vkd3d_shader_parser *parser,
enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(3, 4);
void vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, void vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser,
struct vkd3d_shader_message_context *message_context, const char *source_name, struct vkd3d_shader_message_context *message_context, const char *source_name,
const struct vkd3d_shader_version *version); const struct vkd3d_shader_version *version);