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/hlsl: Initialise the vsir program in hlsl_emit_vsir().

Browse Source
This commit is contained in:
Henri Verbeet
2025-07-24 17:19:41 +02:00
parent dbaecb3f36
commit 49b857c5b7
Notes: Henri Verbeet 2025-07-29 13:35:35 +02:00 
Approved-by: Elizabeth Figura (@zfigura)
Approved-by: Francisco Casas (@fcasas)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1660
1 changed files with 30 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
libs/vkd3d-shader/hlsl_codegen.c
View File

@@ -9612,18 +9612,8 @@ static void sm1_generate_vsir(struct hlsl_ctx *ctx, const struct vkd3d_shader_co
struct hlsl_ir_function_decl *func, struct list *semantic_vars, struct hlsl_ir_function_decl *func, struct list *semantic_vars,
struct hlsl_block *body, uint64_t config_flags, struct vsir_program *program) struct hlsl_block *body, uint64_t config_flags, struct vsir_program *program)
{ {
struct vkd3d_shader_version version = {0};
struct hlsl_block block; struct hlsl_block block;
version.major = ctx->profile->major_version;
version.minor = ctx->profile->minor_version;
version.type = ctx->profile->type;
if (!vsir_program_init(program, compile_info, &version, 0, VSIR_CF_STRUCTURED, VSIR_NORMALISED_SM4))
{
ctx->result = VKD3D_ERROR_OUT_OF_MEMORY;
return;
}
program->ssa_count = 0; program->ssa_count = 0;
program->temp_count = allocate_temp_registers(ctx, body, semantic_vars); program->temp_count = allocate_temp_registers(ctx, body, semantic_vars);
if (ctx->result) if (ctx->result)
@@ -12347,32 +12337,22 @@ static void sm4_generate_vsir(struct hlsl_ctx *ctx,
struct list *semantic_vars, struct hlsl_block *body, struct list *patch_semantic_vars, struct list *semantic_vars, struct hlsl_block *body, struct list *patch_semantic_vars,
struct hlsl_block *patch_body, uint64_t config_flags, struct vsir_program *program) struct hlsl_block *patch_body, uint64_t config_flags, struct vsir_program *program)
{ {
struct vkd3d_shader_version version = {0}; const struct vkd3d_shader_version *version = &program->shader_version;
struct extern_resource *extern_resources; struct extern_resource *extern_resources;
unsigned int extern_resources_count; unsigned int extern_resources_count;
const struct hlsl_buffer *cbuffer; const struct hlsl_buffer *cbuffer;
version.major = ctx->profile->major_version;
version.minor = ctx->profile->minor_version;
version.type = ctx->profile->type;
if (!vsir_program_init(program, compile_info, &version, 0, VSIR_CF_STRUCTURED, VSIR_NORMALISED_SM4))
{
ctx->result = VKD3D_ERROR_OUT_OF_MEMORY;
return;
}
generate_vsir_signature(ctx, program, func, semantic_vars); generate_vsir_signature(ctx, program, func, semantic_vars);
if (version.type == VKD3D_SHADER_TYPE_HULL) if (version->type == VKD3D_SHADER_TYPE_HULL)
generate_vsir_signature(ctx, program, ctx->patch_constant_func, patch_semantic_vars); generate_vsir_signature(ctx, program, ctx->patch_constant_func, patch_semantic_vars);
if (version.type == VKD3D_SHADER_TYPE_COMPUTE) if (version->type == VKD3D_SHADER_TYPE_COMPUTE)
{ {
program->thread_group_size.x = ctx->thread_count[0]; program->thread_group_size.x = ctx->thread_count[0];
program->thread_group_size.y = ctx->thread_count[1]; program->thread_group_size.y = ctx->thread_count[1];
program->thread_group_size.z = ctx->thread_count[2]; program->thread_group_size.z = ctx->thread_count[2];
} }
else if (version.type == VKD3D_SHADER_TYPE_HULL) else if (version->type == VKD3D_SHADER_TYPE_HULL)
{ {
program->input_control_point_count = ctx->input_control_point_count == UINT_MAX program->input_control_point_count = ctx->input_control_point_count == UINT_MAX
? 1 : ctx->input_control_point_count; ? 1 : ctx->input_control_point_count;
@@ -12381,13 +12361,13 @@ static void sm4_generate_vsir(struct hlsl_ctx *ctx,
program->tess_partitioning = ctx->partitioning; program->tess_partitioning = ctx->partitioning;
program->tess_output_primitive = ctx->output_primitive; program->tess_output_primitive = ctx->output_primitive;
} }
else if (version.type == VKD3D_SHADER_TYPE_DOMAIN) else if (version->type == VKD3D_SHADER_TYPE_DOMAIN)
{ {
program->input_control_point_count = ctx->input_control_point_count == UINT_MAX program->input_control_point_count = ctx->input_control_point_count == UINT_MAX
? 0 : ctx->input_control_point_count; ? 0 : ctx->input_control_point_count;
program->tess_domain = ctx->domain; program->tess_domain = ctx->domain;
} }
else if (version.type == VKD3D_SHADER_TYPE_GEOMETRY) else if (version->type == VKD3D_SHADER_TYPE_GEOMETRY)
{ {
program->input_control_point_count = ctx->input_control_point_count; program->input_control_point_count = ctx->input_control_point_count;
program->input_primitive = ctx->input_primitive_type; program->input_primitive = ctx->input_primitive_type;
@@ -12415,7 +12395,7 @@ static void sm4_generate_vsir(struct hlsl_ctx *ctx,
} }
sm4_free_extern_resources(extern_resources, extern_resources_count); sm4_free_extern_resources(extern_resources, extern_resources_count);
if (version.type == VKD3D_SHADER_TYPE_GEOMETRY && version.major >= 5) if (version->type == VKD3D_SHADER_TYPE_GEOMETRY && version->major >= 5)
{ {
const struct hlsl_ir_var *var; const struct hlsl_ir_var *var;
@@ -12428,11 +12408,11 @@ static void sm4_generate_vsir(struct hlsl_ctx *ctx,
program->ssa_count = 0; program->ssa_count = 0;
if (version.type == VKD3D_SHADER_TYPE_HULL) if (version->type == VKD3D_SHADER_TYPE_HULL)
generate_vsir_add_program_instruction(ctx, program, generate_vsir_add_program_instruction(ctx, program,
&ctx->patch_constant_func->loc, VSIR_OP_HS_CONTROL_POINT_PHASE, 0, 0); &ctx->patch_constant_func->loc, VSIR_OP_HS_CONTROL_POINT_PHASE, 0, 0);
sm4_generate_vsir_add_function(ctx, semantic_vars, func, body, config_flags, program); sm4_generate_vsir_add_function(ctx, semantic_vars, func, body, config_flags, program);
if (version.type == VKD3D_SHADER_TYPE_HULL) if (version->type == VKD3D_SHADER_TYPE_HULL)
{ {
generate_vsir_add_program_instruction(ctx, program, generate_vsir_add_program_instruction(ctx, program,
&ctx->patch_constant_func->loc, VSIR_OP_HS_FORK_PHASE, 0, 0); &ctx->patch_constant_func->loc, VSIR_OP_HS_FORK_PHASE, 0, 0);
@@ -13914,6 +13894,7 @@ int hlsl_emit_vsir(struct hlsl_ctx *ctx, const struct vkd3d_shader_compile_info
uint32_t config_flags = vkd3d_shader_init_config_flags(); uint32_t config_flags = vkd3d_shader_init_config_flags();
const struct hlsl_profile_info *profile = ctx->profile; const struct hlsl_profile_info *profile = ctx->profile;
struct list semantic_vars, patch_semantic_vars; struct list semantic_vars, patch_semantic_vars;
struct vkd3d_shader_version version = {0};
struct hlsl_ir_var *var; struct hlsl_ir_var *var;
parse_entry_function_attributes(ctx, entry_func); parse_entry_function_attributes(ctx, entry_func);
@@ -13982,28 +13963,34 @@ int hlsl_emit_vsir(struct hlsl_ctx *ctx, const struct vkd3d_shader_compile_info
if (ctx->result) if (ctx->result)
return ctx->result; return ctx->result;
if (ctx->profile->major_version < 4) version.major = ctx->profile->major_version;
version.minor = ctx->profile->minor_version;
version.type = ctx->profile->type;
if (!vsir_program_init(program, compile_info, &version, 0, VSIR_CF_STRUCTURED, VSIR_NORMALISED_SM4))
{ {
ctx->result = VKD3D_ERROR_OUT_OF_MEMORY;
return ctx->result;
}
if (version.major < 4)
sm1_generate_ctab(ctx, reflection_data); sm1_generate_ctab(ctx, reflection_data);
if (ctx->result)
return ctx->result;
sm1_generate_vsir(ctx, compile_info, entry_func, &semantic_vars, &body, config_flags, program);
}
else else
{
sm4_generate_rdef(ctx, reflection_data); sm4_generate_rdef(ctx, reflection_data);
if (ctx->result)
return ctx->result;
sm4_generate_vsir(ctx, compile_info, entry_func, &semantic_vars, &body,
&patch_semantic_vars, &patch_body, config_flags, program);
}
if (ctx->result) if (ctx->result)
{ {
vsir_program_cleanup(program); vsir_program_cleanup(program);
return ctx->result;
}
if (version.major < 4)
sm1_generate_vsir(ctx, compile_info, entry_func, &semantic_vars, &body, config_flags, program);
else
sm4_generate_vsir(ctx, compile_info, entry_func, &semantic_vars, &body,
&patch_semantic_vars, &patch_body, config_flags, program);
if (ctx->result)
{
vkd3d_shader_free_shader_code(reflection_data); vkd3d_shader_free_shader_code(reflection_data);
vsir_program_cleanup(program);
} }
return ctx->result; return ctx->result;