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/sm4: Maintain the parser location in the vkd3d_shader_parser structure.

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-01 17:51:15 +02:00
committed by Alexandre Julliard
parent aca39afd73
commit 18e838a1cc
5 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libs/vkd3d-shader/glsl.c
View File

@@ -22,14 +22,13 @@ struct vkd3d_glsl_generator
{
struct vkd3d_shader_version version;
struct vkd3d_string_buffer buffer;
struct vkd3d_shader_location location;
const struct vkd3d_shader_location *location;
struct vkd3d_shader_message_context *message_context;
bool failed;
};
struct vkd3d_glsl_generator *vkd3d_glsl_generator_create(const struct vkd3d_shader_version *version,
const struct vkd3d_shader_compile_info *compile_info,
struct vkd3d_shader_message_context *message_context)
struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_location *location)
{
struct vkd3d_glsl_generator *generator;
@@ -39,8 +38,7 @@ struct vkd3d_glsl_generator *vkd3d_glsl_generator_create(const struct vkd3d_shad
memset(generator, 0, sizeof(*generator));
generator->version = *version;
vkd3d_string_buffer_init(&generator->buffer);
generator->location.source_name = compile_info->source_name;
generator->location.line = 2; /* Line 1 is the version token. */
generator->location = location;
generator->message_context = message_context;
return generator;
}
@@ -52,10 +50,9 @@ static void VKD3D_PRINTF_FUNC(3, 4) vkd3d_glsl_compiler_error(
va_list args;
va_start(args, fmt);
vkd3d_shader_verror(generator->message_context, &generator->location, error, fmt, args);
vkd3d_shader_verror(generator->message_context, generator->location, error, fmt, args);
va_end(args);
generator->failed = true;
return;
}
static void shader_glsl_ret(struct vkd3d_glsl_generator *generator,
@@ -91,9 +88,6 @@ static void vkd3d_glsl_handle_instruction(struct vkd3d_glsl_generator *generator
"Unhandled instruction %#x", instruction->handler_idx);
break;
}
++generator->location.line;
return;
}
int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator,