wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/d3d-asm: Pass a prefix and suffix to shader_dump_interpolation_mode().

Browse Source
This commit is contained in:
Henri Verbeet 2024-04-11 17:25:11 +02:00 committed by Alexandre Julliard
parent 1ad524072d
commit b8eadf4bab
Notes: Alexandre Julliard 2024-04-15 22:23:36 +02:00 
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/789
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libs/vkd3d-shader/d3d_asm.c
View File

@ -1642,38 +1642,41 @@ static void shader_print_primitive_type(struct vkd3d_d3d_asm_compiler *compiler,
vkd3d_string_buffer_printf(buffer, "%s%s%s", prefix, primitive_type, suffix); vkd3d_string_buffer_printf(buffer, "%s%s%s", prefix, primitive_type, suffix);
} }
static void shader_dump_interpolation_mode(struct vkd3d_d3d_asm_compiler *compiler, static void shader_print_interpolation_mode(struct vkd3d_d3d_asm_compiler *compiler,
enum vkd3d_shader_interpolation_mode interpolation_mode) const char *prefix, enum vkd3d_shader_interpolation_mode m, const char *suffix)
{ {
struct vkd3d_string_buffer *buffer = &compiler->buffer; struct vkd3d_string_buffer *buffer = &compiler->buffer;
const char *mode;
switch (interpolation_mode) switch (m)
{ {
case VKD3DSIM_CONSTANT: case VKD3DSIM_CONSTANT:
shader_addline(buffer, "constant"); mode = "constant";
break; break;
case VKD3DSIM_LINEAR: case VKD3DSIM_LINEAR:
shader_addline(buffer, "linear"); mode = "linear";
break; break;
case VKD3DSIM_LINEAR_CENTROID: case VKD3DSIM_LINEAR_CENTROID:
shader_addline(buffer, "linear centroid"); mode = "linear centroid";
break; break;
case VKD3DSIM_LINEAR_NOPERSPECTIVE: case VKD3DSIM_LINEAR_NOPERSPECTIVE:
shader_addline(buffer, "linear noperspective"); mode = "linear noperspective";
break; break;
case VKD3DSIM_LINEAR_SAMPLE: case VKD3DSIM_LINEAR_SAMPLE:
shader_addline(buffer, "linear sample"); mode = "linear sample";
break; break;
case VKD3DSIM_LINEAR_NOPERSPECTIVE_CENTROID: case VKD3DSIM_LINEAR_NOPERSPECTIVE_CENTROID:
shader_addline(buffer, "linear noperspective centroid"); mode = "linear noperspective centroid";
break; break;
case VKD3DSIM_LINEAR_NOPERSPECTIVE_SAMPLE: case VKD3DSIM_LINEAR_NOPERSPECTIVE_SAMPLE:
shader_addline(buffer, "linear noperspective sample"); mode = "linear noperspective sample";
break; break;
default: default:
shader_addline(buffer, "<unrecognized_interpolation_mode %#x>", interpolation_mode); vkd3d_string_buffer_printf(buffer, "%s%s<unhandled interpolation mode %#x>%s%s",
break; prefix, compiler->colours.error, m, compiler->colours.reset, suffix);
return;
} }
vkd3d_string_buffer_printf(buffer, "%s%s%s", prefix, mode, suffix);
} }
const char *shader_get_type_prefix(enum vkd3d_shader_type type) const char *shader_get_type_prefix(enum vkd3d_shader_type type)
@ -1920,8 +1923,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler,
break; break;
case VKD3DSIH_DCL_INPUT_PS: case VKD3DSIH_DCL_INPUT_PS:
vkd3d_string_buffer_printf(buffer, " "); shader_print_interpolation_mode(compiler, " ", ins->flags, "");
shader_dump_interpolation_mode(compiler, ins->flags);
shader_print_dst_param(compiler, " ", &ins->declaration.dst, true, ""); shader_print_dst_param(compiler, " ", &ins->declaration.dst, true, "");
break; break;
@ -1934,8 +1936,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler,
break; break;
case VKD3DSIH_DCL_INPUT_PS_SIV: case VKD3DSIH_DCL_INPUT_PS_SIV:
vkd3d_string_buffer_printf(buffer, " "); shader_print_interpolation_mode(compiler, " ", ins->flags, "");
shader_dump_interpolation_mode(compiler, ins->flags);
shader_print_dst_param(compiler, " ", &ins->declaration.register_semantic.reg, true, ""); shader_print_dst_param(compiler, " ", &ins->declaration.register_semantic.reg, true, "");
shader_print_input_sysval_semantic(compiler, ", ", ins->declaration.register_semantic.sysval_semantic, ""); shader_print_input_sysval_semantic(compiler, ", ", ins->declaration.register_semantic.sysval_semantic, "");
break; break;