wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Set the source name in hlsl_ctx_init().

Browse Source 
Without this, HLSL compiler messages were missing the source name. For
example, when attempting to compile gears.hlsl from the "gears" demo
with vkd3d-compiler:

    ":33:17: E5000: syntax error, unexpected NEW_IDENTIFIER"

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet
2021-09-01 15:45:06 +02:00
committed by Alexandre Julliard
parent cfc09a210a
commit 7fa0de03b9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/vkd3d-shader/hlsl.c
View File

@ -1694,8 +1694,8 @@ static void declare_predefined_types(struct hlsl_ctx *ctx)
} }
} }
static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct hlsl_profile_info *profile, static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const char *source_name,
struct vkd3d_shader_message_context *message_context) const struct hlsl_profile_info *profile, struct vkd3d_shader_message_context *message_context)
{ {
memset(ctx, 0, sizeof(*ctx)); memset(ctx, 0, sizeof(*ctx));
@ -1705,7 +1705,7 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct hlsl_profile_info *
if (!(ctx->source_files = hlsl_alloc(ctx, sizeof(*ctx->source_files)))) if (!(ctx->source_files = hlsl_alloc(ctx, sizeof(*ctx->source_files))))
return false; return false;
if (!(ctx->source_files[0] = hlsl_strdup(ctx, ""))) if (!(ctx->source_files[0] = hlsl_strdup(ctx, source_name ? source_name : "<anonymous>")))
{ {
vkd3d_free(ctx->source_files); vkd3d_free(ctx->source_files);
return false; return false;
@ -1800,7 +1800,7 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d
vkd3d_shader_dump_shader(compile_info->source_type, profile->type, &compile_info->source); vkd3d_shader_dump_shader(compile_info->source_type, profile->type, &compile_info->source);
if (!hlsl_ctx_init(&ctx, profile, message_context)) if (!hlsl_ctx_init(&ctx, compile_info->source_name, profile, message_context))
return VKD3D_ERROR_OUT_OF_MEMORY; return VKD3D_ERROR_OUT_OF_MEMORY;
if ((ret = hlsl_lexer_compile(&ctx, hlsl)) == 2) if ((ret = hlsl_lexer_compile(&ctx, hlsl)) == 2)