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/glsl: Use location information from the current instruction.

Browse Source
This commit is contained in:
Henri Verbeet
2023-11-17 18:13:02 +01:00
committed by Alexandre Julliard
parent dff22c9ed7
commit 038764985a
Notes: Alexandre Julliard 2024-03-11 23:07:46 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/702
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ struct vkd3d_glsl_generator
};
struct vkd3d_glsl_generator *vkd3d_glsl_generator_create(const struct vkd3d_shader_version *version,
struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_location *location)
struct vkd3d_shader_message_context *message_context)
{
struct vkd3d_glsl_generator *generator;
@@ -38,7 +38,6 @@ 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 = *location;
generator->message_context = message_context;
return generator;
}
@@ -73,6 +72,8 @@ static void shader_glsl_ret(struct vkd3d_glsl_generator *generator,
static void vkd3d_glsl_handle_instruction(struct vkd3d_glsl_generator *generator,
const struct vkd3d_shader_instruction *instruction)
{
generator->location = instruction->location;
switch (instruction->handler_idx)
{
case VKD3DSIH_DCL_INPUT:
@@ -101,10 +102,8 @@ int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator,
vkd3d_string_buffer_printf(&generator->buffer, "#version 440\n\n");
vkd3d_string_buffer_printf(&generator->buffer, "void main()\n{\n");
generator->location.column = 0;
for (i = 0; i < program->instructions.count; ++i)
{
generator->location.line = i + 1;
vkd3d_glsl_handle_instruction(generator, &program->instructions.elements[i]);
}