wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/d3dbc: Separate writing the comment bytecode from write_sm1_uniforms().

Browse Source 
Consistent with how D3DXFindShaderComment() allows looking up comments
by tag. This also makes it a little easier to move CTAB generation out
of d3dbc.c.
This commit is contained in:
Henri Verbeet 2024-12-16 18:40:02 +01:00
parent 00538c377e
commit c681673993
Notes: Henri Verbeet 2024-12-17 16:53:24 +01:00 
Approved-by: Francisco Casas (@fcasas)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1321
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libs/vkd3d-shader/d3dbc.c
View File

@ -1787,7 +1787,7 @@ static void sm1_sort_externs(struct hlsl_ctx *ctx)
static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer) static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer)
{ {
size_t ctab_offset, ctab_start, ctab_end, vars_offset, vars_start, size_offset, creator_offset, offset; size_t ctab_start, vars_offset, vars_start, creator_offset, offset;
unsigned int uniform_count = 0; unsigned int uniform_count = 0;
struct hlsl_ir_var *var; struct hlsl_ir_var *var;
@ -1816,9 +1816,6 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe
sm1_sort_externs(ctx); sm1_sort_externs(ctx);
size_offset = put_u32(buffer, 0);
ctab_offset = put_u32(buffer, VKD3D_MAKE_TAG('C','T','A','B'));
ctab_start = put_u32(buffer, 7 * sizeof(uint32_t)); /* CTAB header size. */ ctab_start = put_u32(buffer, 7 * sizeof(uint32_t)); /* CTAB header size. */
creator_offset = put_u32(buffer, 0); creator_offset = put_u32(buffer, 0);
put_u32(buffer, sm1_version(ctx->profile->type, ctx->profile->major_version, ctx->profile->minor_version)); put_u32(buffer, sm1_version(ctx->profile->type, ctx->profile->major_version, ctx->profile->minor_version));
@ -1939,9 +1936,6 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe
offset = put_string(buffer, vkd3d_shader_get_version(NULL, NULL)); offset = put_string(buffer, vkd3d_shader_get_version(NULL, NULL));
set_u32(buffer, creator_offset, offset - ctab_start); set_u32(buffer, creator_offset, offset - ctab_start);
ctab_end = bytecode_align(buffer);
set_u32(buffer, size_offset, vkd3d_make_u32(VKD3D_SM1_OP_COMMENT, (ctab_end - ctab_offset) / sizeof(uint32_t)));
} }
void sm1_generate_ctab(struct hlsl_ctx *ctx, struct vkd3d_shader_code *ctab) void sm1_generate_ctab(struct hlsl_ctx *ctx, struct vkd3d_shader_code *ctab)
@ -2013,6 +2007,21 @@ static const struct vkd3d_sm1_opcode_info *shader_sm1_get_opcode_info_from_vsir_
return info; return info;
} }
static void d3dbc_write_comment(struct d3dbc_compiler *d3dbc,
uint32_t tag, const struct vkd3d_shader_code *comment)
{
struct vkd3d_bytecode_buffer *buffer = &d3dbc->buffer;
size_t offset, start, end;
offset = put_u32(buffer, 0);
start = put_u32(buffer, tag);
bytecode_put_bytes(buffer, comment->code, comment->size);
end = bytecode_align(buffer);
set_u32(buffer, offset, vkd3d_make_u32(VKD3D_SM1_OP_COMMENT, (end - start) / sizeof(uint32_t)));
}
static uint32_t sm1_encode_register_type(enum vkd3d_shader_register_type type) static uint32_t sm1_encode_register_type(enum vkd3d_shader_register_type type)
{ {
return ((type << VKD3D_SM1_REGISTER_TYPE_SHIFT) & VKD3D_SM1_REGISTER_TYPE_MASK) return ((type << VKD3D_SM1_REGISTER_TYPE_SHIFT) & VKD3D_SM1_REGISTER_TYPE_MASK)
@ -2376,9 +2385,7 @@ int d3dbc_compile(struct vsir_program *program, uint64_t config_flags,
} }
put_u32(buffer, sm1_version(version->type, version->major, version->minor)); put_u32(buffer, sm1_version(version->type, version->major, version->minor));
d3dbc_write_comment(&d3dbc, VKD3D_MAKE_TAG('C','T','A','B'), ctab);
bytecode_put_bytes(buffer, ctab->code, ctab->size);
d3dbc_write_semantic_dcls(&d3dbc); d3dbc_write_semantic_dcls(&d3dbc);
d3dbc_write_program_instructions(&d3dbc); d3dbc_write_program_instructions(&d3dbc);