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_primitive_type().

Browse Source
This commit is contained in:
Henri Verbeet 2024-04-04 17:19:25 +02:00 committed by Alexandre Julliard
parent 7d72accce2
commit 1ad524072d
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 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1590,53 +1590,56 @@ static void shader_dump_ins_modifiers(struct vkd3d_d3d_asm_compiler *compiler,
if (mmask) FIXME("Unrecognised modifier %#x.\n", mmask); if (mmask) FIXME("Unrecognised modifier %#x.\n", mmask);
} }
static void shader_dump_primitive_type(struct vkd3d_d3d_asm_compiler *compiler, static void shader_print_primitive_type(struct vkd3d_d3d_asm_compiler *compiler,
const struct vkd3d_shader_primitive_type *primitive_type) const char *prefix, const struct vkd3d_shader_primitive_type *p, const char *suffix)
{ {
struct vkd3d_string_buffer *buffer = &compiler->buffer; struct vkd3d_string_buffer *buffer = &compiler->buffer;
const char *primitive_type;
switch (primitive_type->type) switch (p->type)
{ {
case VKD3D_PT_UNDEFINED: case VKD3D_PT_UNDEFINED:
shader_addline(buffer, "undefined"); primitive_type = "undefined";
break; break;
case VKD3D_PT_POINTLIST: case VKD3D_PT_POINTLIST:
shader_addline(buffer, "pointlist"); primitive_type = "pointlist";
break; break;
case VKD3D_PT_LINELIST: case VKD3D_PT_LINELIST:
shader_addline(buffer, "linelist"); primitive_type = "linelist";
break; break;
case VKD3D_PT_LINESTRIP: case VKD3D_PT_LINESTRIP:
shader_addline(buffer, "linestrip"); primitive_type = "linestrip";
break; break;
case VKD3D_PT_TRIANGLELIST: case VKD3D_PT_TRIANGLELIST:
shader_addline(buffer, "trianglelist"); primitive_type = "trianglelist";
break; break;
case VKD3D_PT_TRIANGLESTRIP: case VKD3D_PT_TRIANGLESTRIP:
shader_addline(buffer, "trianglestrip"); primitive_type = "trianglestrip";
break; break;
case VKD3D_PT_TRIANGLEFAN: case VKD3D_PT_TRIANGLEFAN:
shader_addline(buffer, "trianglefan"); primitive_type = "trianglefan";
break; break;
case VKD3D_PT_LINELIST_ADJ: case VKD3D_PT_LINELIST_ADJ:
shader_addline(buffer, "linelist_adj"); primitive_type = "linelist_adj";
break; break;
case VKD3D_PT_LINESTRIP_ADJ: case VKD3D_PT_LINESTRIP_ADJ:
shader_addline(buffer, "linestrip_adj"); primitive_type = "linestrip_adj";
break; break;
case VKD3D_PT_TRIANGLELIST_ADJ: case VKD3D_PT_TRIANGLELIST_ADJ:
shader_addline(buffer, "trianglelist_adj"); primitive_type = "trianglelist_adj";
break; break;
case VKD3D_PT_TRIANGLESTRIP_ADJ: case VKD3D_PT_TRIANGLESTRIP_ADJ:
shader_addline(buffer, "trianglestrip_adj"); primitive_type = "trianglestrip_adj";
break; break;
case VKD3D_PT_PATCH: case VKD3D_PT_PATCH:
shader_addline(buffer, "patch%u", primitive_type->patch_vertex_count); vkd3d_string_buffer_printf(buffer, "%spatch%u%s", prefix, p->patch_vertex_count, suffix);
break; return;
default: default:
shader_addline(buffer, "<unrecognized_primitive_type %#x>", primitive_type->type); vkd3d_string_buffer_printf(buffer, "%s%s<unhandled primitive type %#x>%s%s",
break; prefix, compiler->colours.error, p->type, compiler->colours.reset, suffix);
return;
} }
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_dump_interpolation_mode(struct vkd3d_d3d_asm_compiler *compiler,
@ -1944,8 +1947,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler,
case VKD3DSIH_DCL_INPUT_PRIMITIVE: case VKD3DSIH_DCL_INPUT_PRIMITIVE:
case VKD3DSIH_DCL_OUTPUT_TOPOLOGY: case VKD3DSIH_DCL_OUTPUT_TOPOLOGY:
vkd3d_string_buffer_printf(buffer, " "); shader_print_primitive_type(compiler, " ", &ins->declaration.primitive_type, "");
shader_dump_primitive_type(compiler, &ins->declaration.primitive_type);
break; break;
case VKD3DSIH_DCL_INTERFACE: case VKD3DSIH_DCL_INTERFACE: