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/d3d-asm: Include the program descriptors when tracing vsir code.

Browse Source
This commit is contained in:
Giovanni Mascellani
2025-03-28 10:27:32 +01:00
committed by Henri Verbeet
parent bac6949365
commit 0417f4f162
Notes: Henri Verbeet 2025-04-14 22:03:34 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1446
2 changed files with 81 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2200,12 +2200,82 @@ static enum vkd3d_result dump_dxbc_signatures(struct vkd3d_d3d_asm_compiler *com
&program->patch_constant_signature)) < 0) &program->patch_constant_signature)) < 0)
return ret; return ret;
vkd3d_string_buffer_printf(&compiler->buffer, "%s.text%s\n",
compiler->colours.opcode, compiler->colours.reset);
return VKD3D_OK; return VKD3D_OK;
} }
static void shader_print_descriptor_name(struct vkd3d_d3d_asm_compiler *compiler,
enum vkd3d_shader_descriptor_type t, unsigned int id)
{
const char *type = NULL;
switch (t)
{
case VKD3D_SHADER_DESCRIPTOR_TYPE_SRV:
type = shader_register_names[VKD3DSPR_RESOURCE];
break;
case VKD3D_SHADER_DESCRIPTOR_TYPE_UAV:
type = shader_register_names[VKD3DSPR_UAV];
break;
case VKD3D_SHADER_DESCRIPTOR_TYPE_CBV:
type = shader_register_names[VKD3DSPR_CONSTBUFFER];
break;
case VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER:
type = shader_register_names[VKD3DSPR_SAMPLER];
break;
case VKD3D_SHADER_DESCRIPTOR_TYPE_FORCE_32BIT:
break;
}
if (type)
vkd3d_string_buffer_printf(&compiler->buffer, "%s%s%u%s",
compiler->colours.reg, type, id, compiler->colours.reset);
else
vkd3d_string_buffer_printf(&compiler->buffer, "%s<unhandled descriptor type %#x>%u%s",
compiler->colours.error, t, id, compiler->colours.reset);
}
static void shader_print_descriptors(struct vkd3d_d3d_asm_compiler *compiler,
const struct vkd3d_shader_scan_descriptor_info1 *descriptors)
{
struct vkd3d_string_buffer *buffer = &compiler->buffer;
unsigned int i;
vkd3d_string_buffer_printf(buffer, "%s.descriptors%s\n",
compiler->colours.opcode, compiler->colours.reset);
for (i = 0; i < descriptors->descriptor_count; ++i)
{
const struct vkd3d_shader_descriptor_info1 *d = &descriptors->descriptors[i];
vkd3d_string_buffer_printf(buffer, "%s.descriptor%s ", compiler->colours.opcode, compiler->colours.reset);
shader_print_descriptor_name(compiler, d->type, d->register_id);
shader_print_subscript_range(compiler, d->register_index,
d->count == ~0u ? ~0u : d->register_index + d->count - 1);
shader_dump_register_space(compiler, d->register_space);
if (d->type == VKD3D_SHADER_DESCRIPTOR_TYPE_SRV || d->type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV)
{
vkd3d_string_buffer_printf(buffer, ", ");
shader_print_resource_type(compiler, d->resource_type);
vkd3d_string_buffer_printf(buffer, " <v4:");
shader_print_data_type(compiler, d->resource_data_type);
if (d->resource_type == VKD3D_SHADER_RESOURCE_TEXTURE_2DMS
|| d->resource_type == VKD3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY)
shader_print_uint_literal(compiler, ", ", d->sample_count, "");
vkd3d_string_buffer_printf(buffer, ">");
}
if (d->buffer_size)
shader_print_hex_literal(compiler, ", size=", d->buffer_size, "");
if (d->structure_stride)
shader_print_hex_literal(compiler, ", stride=", d->structure_stride, "");
if (d->flags)
shader_print_hex_literal(compiler, ", flags=", d->flags, "");
if (d->uav_flags)
shader_print_hex_literal(compiler, ", uav_flags=", d->uav_flags, "");
vkd3d_string_buffer_printf(buffer, "\n");
}
}
enum vkd3d_result d3d_asm_compile(const struct vsir_program *program, enum vkd3d_result d3d_asm_compile(const struct vsir_program *program,
const struct vkd3d_shader_compile_info *compile_info, const struct vkd3d_shader_compile_info *compile_info,
struct vkd3d_shader_code *out, enum vsir_asm_flags flags) struct vkd3d_shader_code *out, enum vsir_asm_flags flags)
@@ -2290,6 +2360,12 @@ enum vkd3d_result d3d_asm_compile(const struct vsir_program *program,
return result; return result;
} }
if (compiler.flags & VSIR_ASM_FLAG_DUMP_DESCRIPTORS)
shader_print_descriptors(&compiler, &program->descriptors);
if (compiler.flags & (VSIR_ASM_FLAG_DUMP_SIGNATURES | VSIR_ASM_FLAG_DUMP_DESCRIPTORS))
vkd3d_string_buffer_printf(buffer, "%s.text%s\n", compiler.colours.opcode, compiler.colours.reset);
indent = 0; indent = 0;
for (i = 0; i < program->instructions.count; ++i) for (i = 0; i < program->instructions.count; ++i)
{ {
@@ -2416,7 +2492,7 @@ static void trace_io_declarations(const struct vsir_program *program)
void vsir_program_trace(const struct vsir_program *program) void vsir_program_trace(const struct vsir_program *program)
{ {
const unsigned int flags = VSIR_ASM_FLAG_DUMP_TYPES | VSIR_ASM_FLAG_DUMP_ALL_INDICES const unsigned int flags = VSIR_ASM_FLAG_DUMP_TYPES | VSIR_ASM_FLAG_DUMP_ALL_INDICES
| VSIR_ASM_FLAG_DUMP_SIGNATURES; | VSIR_ASM_FLAG_DUMP_SIGNATURES | VSIR_ASM_FLAG_DUMP_DESCRIPTORS;
struct vkd3d_shader_code code; struct vkd3d_shader_code code;
const char *p, *q, *end; const char *p, *q, *end;

1
libs/vkd3d-shader/vkd3d_shader_private.h
View File

@@ -1565,6 +1565,7 @@ enum vsir_asm_flags
VSIR_ASM_FLAG_DUMP_TYPES = 0x1, VSIR_ASM_FLAG_DUMP_TYPES = 0x1,
VSIR_ASM_FLAG_DUMP_ALL_INDICES = 0x2, VSIR_ASM_FLAG_DUMP_ALL_INDICES = 0x2,
VSIR_ASM_FLAG_DUMP_SIGNATURES = 0x4, VSIR_ASM_FLAG_DUMP_SIGNATURES = 0x4,
VSIR_ASM_FLAG_DUMP_DESCRIPTORS = 0x8,
}; };
enum vkd3d_result d3d_asm_compile(const struct vsir_program *program, enum vkd3d_result d3d_asm_compile(const struct vsir_program *program,