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: Return a vsir program from hlsl_compile_shader().

Browse Source 
This largely brings the HLSL frontend in line with the other frontends.
This commit is contained in:
Henri Verbeet
2025-08-05 21:17:49 +02:00
parent 85603dc9c6
commit f95fc28851
Notes: Henri Verbeet 2025-08-07 20:51:41 +02:00 
Approved-by: Elizabeth Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1671
4 changed files with 59 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5142,19 +5142,16 @@ int hlsl_compile_effect(const struct vkd3d_shader_compile_info *compile_info,
return ret;
}
int hlsl_compile_shader(const struct vkd3d_shader_compile_info *compile_info,
struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_code *out)
int hlsl_parse(const struct vkd3d_shader_compile_info *compile_info,
struct vkd3d_shader_message_context *message_context,
struct vsir_program *program, struct vkd3d_shader_code *reflection_data)
{
const struct vkd3d_shader_hlsl_source_info *hlsl_source_info;
uint64_t config_flags = vkd3d_shader_init_config_flags();
struct hlsl_ir_function_decl *decl, *entry_func = NULL;
enum vsir_normalisation_level normalisation_level;
struct vkd3d_shader_code reflection_data = {0};
struct vkd3d_shader_source_list source_list;
const struct hlsl_profile_info *profile;
struct vkd3d_shader_version version;
struct hlsl_ir_function *func;
struct vsir_program program;
const char *entry_point;
struct hlsl_ctx ctx;
int ret;
@@ -5182,14 +5179,12 @@ int hlsl_compile_shader(const struct vkd3d_shader_compile_info *compile_info,
if (version.major < 4 && (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_ASM
|| compile_info->target_type == VKD3D_SHADER_TARGET_D3D_BYTECODE))
normalisation_level = VSIR_NORMALISED_SM1;
if (!vsir_program_init(&program, compile_info, &version, 0, VSIR_CF_STRUCTURED, normalisation_level))
if (!vsir_program_init(program, compile_info, &version, 0, VSIR_CF_STRUCTURED, normalisation_level))
return VKD3D_ERROR_OUT_OF_MEMORY;
vkd3d_shader_source_list_init(&source_list);
if ((ret = hlsl_ctx_parse(&ctx, &source_list, compile_info, profile, message_context)) < 0)
if ((ret = hlsl_ctx_parse(&ctx, &program->source_files, compile_info, profile, message_context)) < 0)
{
vkd3d_shader_source_list_cleanup(&source_list);
vsir_program_cleanup(&program);
vsir_program_cleanup(program);
return ret;
}
@@ -5217,20 +5212,16 @@ int hlsl_compile_shader(const struct vkd3d_shader_compile_info *compile_info,
hlsl_error(&ctx, &loc, VKD3D_SHADER_ERROR_HLSL_NOT_DEFINED,
"Entry point \"%s\" is not defined.", entry_point);
hlsl_ctx_cleanup(&ctx);
vkd3d_shader_source_list_cleanup(&source_list);
vsir_program_cleanup(&program);
vsir_program_cleanup(program);
return VKD3D_ERROR_INVALID_SHADER;
}
if ((ret = hlsl_emit_vsir(&ctx, compile_info, entry_func, &program, &reflection_data)) >= 0)
{
vsir_program_trace(&program);
ret = vsir_program_compile(&program, &reflection_data, config_flags, compile_info, out, message_context);
vkd3d_shader_free_shader_code(&reflection_data);
}
ret = hlsl_emit_vsir(&ctx, compile_info, entry_func, program, reflection_data);
hlsl_ctx_cleanup(&ctx);
vkd3d_shader_source_list_cleanup(&source_list);
vsir_program_cleanup(&program);
if (ret < 0)
vsir_program_cleanup(program);
else
vsir_program_trace(program);
return ret;
}

3
libs/vkd3d-shader/ir.c
View File

@@ -451,6 +451,8 @@ bool vsir_program_init(struct vsir_program *program, const struct vkd3d_shader_c
return false;
}
vkd3d_shader_source_list_init(&program->source_files);
return true;
}
@@ -463,6 +465,7 @@ void vsir_program_cleanup(struct vsir_program *program)
for (i = 0; i < program->block_name_count; ++i)
vkd3d_free((void *)program->block_names[i]);
vkd3d_free(program->block_names);
vkd3d_shader_source_list_cleanup(&program->source_files);
shader_instruction_array_destroy(&program->instructions);
shader_signature_cleanup(&program->input_signature);
shader_signature_cleanup(&program->output_signature);

56
libs/vkd3d-shader/vkd3d_shader_main.c
View File

@@ -800,12 +800,28 @@ static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_
}
static enum vkd3d_result vsir_parse(const struct vkd3d_shader_compile_info *compile_info, uint64_t config_flags,
struct vkd3d_shader_message_context *message_context, struct vsir_program *program)
const struct shader_dump_data *dump_data, struct vkd3d_shader_message_context *message_context,
struct vsir_program *program, struct vkd3d_shader_code *reflection_data)
{
struct vkd3d_shader_compile_info preprocessed_info;
struct vkd3d_shader_code preprocessed;
enum vkd3d_result ret;
switch (compile_info->source_type)
{
case VKD3D_SHADER_SOURCE_HLSL:
if ((ret = preproc_lexer_parse(compile_info, &preprocessed, message_context)) >= 0)
{
vkd3d_shader_dump_shader(dump_data, preprocessed.code, preprocessed.size, SHADER_DUMP_TYPE_PREPROC);
preprocessed_info = *compile_info;
preprocessed_info.source = preprocessed;
ret = hlsl_parse(&preprocessed_info, message_context, program, reflection_data);
vkd3d_shader_free_shader_code(&preprocessed);
}
break;
case VKD3D_SHADER_SOURCE_D3D_BYTECODE:
ret = d3dbc_parse(compile_info, config_flags, message_context, program);
break;
@@ -836,14 +852,18 @@ static enum vkd3d_result vsir_parse(const struct vkd3d_shader_compile_info *comp
if (TRACE_ON())
vsir_program_trace(program);
vsir_program_cleanup(program);
return ret;
goto fail;
}
if (compile_info->target_type != VKD3D_SHADER_TARGET_NONE
&& (ret = vsir_program_transform_early(program, config_flags, compile_info, message_context)) < 0)
vsir_program_cleanup(program);
goto fail;
return ret;
fail:
vkd3d_shader_free_shader_code(reflection_data);
vsir_program_cleanup(program);
return ret;
}
@@ -1781,11 +1801,14 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char
else
{
uint64_t config_flags = vkd3d_shader_init_config_flags();
struct vkd3d_shader_code reflection_data = {0};
struct vsir_program program;
if (!(ret = vsir_parse(compile_info, config_flags, &message_context, &program)))
if (!(ret = vsir_parse(compile_info, config_flags, &dump_data,
&message_context, &program, &reflection_data)))
{
ret = vsir_program_scan(&program, compile_info, &message_context, false);
vkd3d_shader_free_shader_code(&reflection_data);
vsir_program_cleanup(&program);
}
}
@@ -1797,7 +1820,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char
return ret;
}
int vsir_program_compile(struct vsir_program *program, const struct vkd3d_shader_code *reflection_data,
static int vsir_program_compile(struct vsir_program *program, const struct vkd3d_shader_code *reflection_data,
uint64_t config_flags, const struct vkd3d_shader_compile_info *compile_info,
struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context)
{
@@ -1859,7 +1882,7 @@ int vsir_program_compile(struct vsir_program *program, const struct vkd3d_shader
return ret;
}
static int compile_hlsl(const struct vkd3d_shader_compile_info *compile_info,
static int fx_compile(const struct vkd3d_shader_compile_info *compile_info,
const struct shader_dump_data *dump_data, struct vkd3d_shader_code *out,
struct vkd3d_shader_message_context *message_context)
{
@@ -1874,10 +1897,7 @@ static int compile_hlsl(const struct vkd3d_shader_compile_info *compile_info,
preprocessed_info = *compile_info;
preprocessed_info.source = preprocessed;
if (compile_info->target_type == VKD3D_SHADER_TARGET_FX)
ret = hlsl_compile_effect(&preprocessed_info, message_context, out);
else
ret = hlsl_compile_shader(&preprocessed_info, message_context, out);
ret = hlsl_compile_effect(&preprocessed_info, message_context, out);
vkd3d_shader_free_shader_code(&preprocessed);
return ret;
@@ -1905,9 +1925,10 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info,
fill_shader_dump_data(compile_info, &dump_data);
vkd3d_shader_dump_shader(&dump_data, compile_info->source.code, compile_info->source.size, SHADER_DUMP_TYPE_SOURCE);
if (compile_info->source_type == VKD3D_SHADER_SOURCE_HLSL)
if (compile_info->source_type == VKD3D_SHADER_SOURCE_HLSL
&& compile_info->target_type == VKD3D_SHADER_TARGET_FX)
{
ret = compile_hlsl(compile_info, &dump_data, out, &message_context);
ret = fx_compile(compile_info, &dump_data, out, &message_context);
}
else if (compile_info->source_type == VKD3D_SHADER_SOURCE_FX)
{
@@ -1920,11 +1941,14 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info,
else
{
uint64_t config_flags = vkd3d_shader_init_config_flags();
struct vkd3d_shader_code reflection_data = {0};
struct vsir_program program;
if (!(ret = vsir_parse(compile_info, config_flags, &message_context, &program)))
if (!(ret = vsir_parse(compile_info, config_flags, &dump_data,
&message_context, &program, &reflection_data)))
{
ret = vsir_program_compile(&program, NULL, config_flags, compile_info, out, &message_context);
ret = vsir_program_compile(&program, &reflection_data, config_flags, compile_info, out, &message_context);
vkd3d_shader_free_shader_code(&reflection_data);
vsir_program_cleanup(&program);
}
}

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

@@ -1582,6 +1582,7 @@ struct vsir_program
struct vsir_features features;
struct vkd3d_shader_source_list source_files;
const char **block_names;
size_t block_name_count;
};
@@ -1591,9 +1592,6 @@ enum vkd3d_result vsir_allocate_temp_registers(struct vsir_program *program,
enum vkd3d_result vsir_update_dcl_temps(struct vsir_program *program,
struct vkd3d_shader_message_context *message_context);
void vsir_program_cleanup(struct vsir_program *program);
int vsir_program_compile(struct vsir_program *program, const struct vkd3d_shader_code *reflection_data,
uint64_t config_flags, const struct vkd3d_shader_compile_info *compile_info,
struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context);
const struct vkd3d_shader_parameter1 *vsir_program_get_parameter(
const struct vsir_program *program, enum vkd3d_shader_parameter_name name);
bool vsir_program_init(struct vsir_program *program, const struct vkd3d_shader_compile_info *compile_info,
@@ -1829,8 +1827,9 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info,
int hlsl_compile_effect(const struct vkd3d_shader_compile_info *compile_info,
struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_code *out);
int hlsl_compile_shader(const struct vkd3d_shader_compile_info *compile_info,
struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_code *out);
int hlsl_parse(const struct vkd3d_shader_compile_info *compile_info,
struct vkd3d_shader_message_context *message_context,
struct vsir_program *program, struct vkd3d_shader_code *reflection_data);
static inline enum vkd3d_shader_component_type vkd3d_component_type_from_data_type( enum vsir_data_type data_type)
{