wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/ir: Structurize each function of a hull shader.

Browse Source
This commit is contained in:
Giovanni Mascellani 2024-04-11 16:33:19 +02:00 committed by Alexandre Julliard
parent d8e4b19cdc
commit c8af142bb0
Notes: Alexandre Julliard 2024-04-23 22:57:52 +02:00 
Approved-by: Conor McCarthy (@cmccarthy)
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/807
1 changed files with 62 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3342,20 +3342,13 @@ static void vsir_cfg_dump_structured_program(struct vsir_cfg *cfg)
} }
static enum vkd3d_result vsir_cfg_init(struct vsir_cfg *cfg, struct vsir_program *program, static enum vkd3d_result vsir_cfg_init(struct vsir_cfg *cfg, struct vsir_program *program,
struct vkd3d_shader_message_context *message_context, struct vsir_cfg_emit_target *target) struct vkd3d_shader_message_context *message_context, struct vsir_cfg_emit_target *target,
size_t *pos)
{ {
struct vsir_block *current_block = NULL; struct vsir_block *current_block = NULL;
enum vkd3d_result ret; enum vkd3d_result ret;
size_t i; size_t i;
if (program->shader_version.type == VKD3D_SHADER_TYPE_HULL)
{
FIXME("Hull shaders are not supported.\n");
vkd3d_shader_error(message_context, NULL, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED,
"The structurizer does not support hull shaders.");
return VKD3D_ERROR_INVALID_SHADER;
}
memset(cfg, 0, sizeof(*cfg)); memset(cfg, 0, sizeof(*cfg));
cfg->message_context = message_context; cfg->message_context = message_context;
cfg->program = program; cfg->program = program;
@ -3370,9 +3363,10 @@ static enum vkd3d_result vsir_cfg_init(struct vsir_cfg *cfg, struct vsir_program
if (TRACE_ON()) if (TRACE_ON())
vkd3d_string_buffer_init(&cfg->debug_buffer); vkd3d_string_buffer_init(&cfg->debug_buffer);
for (i = 0; i < program->instructions.count; ++i) for (i = *pos; i < program->instructions.count; ++i)
{ {
struct vkd3d_shader_instruction *instruction = &program->instructions.elements[i]; struct vkd3d_shader_instruction *instruction = &program->instructions.elements[i];
bool finish = false;
switch (instruction->handler_idx) switch (instruction->handler_idx)
{ {
@ -3404,11 +3398,23 @@ static enum vkd3d_result vsir_cfg_init(struct vsir_cfg *cfg, struct vsir_program
current_block = NULL; current_block = NULL;
break; break;
case VKD3DSIH_HS_CONTROL_POINT_PHASE:
case VKD3DSIH_HS_FORK_PHASE:
case VKD3DSIH_HS_JOIN_PHASE:
assert(!current_block);
finish = true;
break;
default: default:
break; break;
} }
if (finish)
break;
} }
*pos = i;
for (i = 0; i < cfg->block_count; ++i) for (i = 0; i < cfg->block_count; ++i)
{ {
struct vsir_block *block = &cfg->blocks[i]; struct vsir_block *block = &cfg->blocks[i];
@ -4881,12 +4887,13 @@ static enum vkd3d_result vsir_cfg_emit_structured_program(struct vsir_cfg *cfg)
} }
static enum vkd3d_result vsir_program_structurize_function(struct vsir_program *program, static enum vkd3d_result vsir_program_structurize_function(struct vsir_program *program,
struct vkd3d_shader_message_context *message_context, struct vsir_cfg_emit_target *target) struct vkd3d_shader_message_context *message_context, struct vsir_cfg_emit_target *target,
size_t *pos)
{ {
enum vkd3d_result ret; enum vkd3d_result ret;
struct vsir_cfg cfg; struct vsir_cfg cfg;
if ((ret = vsir_cfg_init(&cfg, program, message_context, target)) < 0) if ((ret = vsir_cfg_init(&cfg, program, message_context, target, pos)) < 0)
return ret; return ret;
vsir_cfg_compute_dominators(&cfg); vsir_cfg_compute_dominators(&cfg);
@ -4919,7 +4926,7 @@ static enum vkd3d_result vsir_program_structurize(struct vsir_program *program,
{ {
struct vsir_cfg_emit_target target = {0}; struct vsir_cfg_emit_target target = {0};
enum vkd3d_result ret; enum vkd3d_result ret;
unsigned int i; size_t i;
target.jump_target_temp_idx = program->temp_count; target.jump_target_temp_idx = program->temp_count;
target.temp_count = program->temp_count + 1; target.temp_count = program->temp_count + 1;
@ -4927,20 +4934,42 @@ static enum vkd3d_result vsir_program_structurize(struct vsir_program *program,
if (!reserve_instructions(&target.instructions, &target.ins_capacity, program->instructions.count)) if (!reserve_instructions(&target.instructions, &target.ins_capacity, program->instructions.count))
return VKD3D_ERROR_OUT_OF_MEMORY; return VKD3D_ERROR_OUT_OF_MEMORY;
/* Copy declarations until the first block. */ for (i = 0; i < program->instructions.count;)
for (i = 0; i < program->instructions.count; ++i)
{ {
struct vkd3d_shader_instruction *ins = &program->instructions.elements[i]; struct vkd3d_shader_instruction *ins = &program->instructions.elements[i];
if (ins->handler_idx == VKD3DSIH_LABEL) switch (ins->handler_idx)
break; {
case VKD3DSIH_LABEL:
assert(program->shader_version.type != VKD3D_SHADER_TYPE_HULL);
TRACE("Structurizing a non-hull shader.\n");
if ((ret = vsir_program_structurize_function(program, message_context,
&target, &i)) < 0)
goto fail;
assert(i == program->instructions.count);
break;
target.instructions[target.ins_count++] = *ins; case VKD3DSIH_HS_CONTROL_POINT_PHASE:
case VKD3DSIH_HS_FORK_PHASE:
case VKD3DSIH_HS_JOIN_PHASE:
assert(program->shader_version.type == VKD3D_SHADER_TYPE_HULL);
TRACE("Structurizing phase %u of a hull shader.\n", ins->handler_idx);
target.instructions[target.ins_count++] = *ins;
++i;
if ((ret = vsir_program_structurize_function(program, message_context,
&target, &i)) < 0)
goto fail;
break;
default:
if (!reserve_instructions(&target.instructions, &target.ins_capacity, target.ins_count + 1))
return VKD3D_ERROR_OUT_OF_MEMORY;
target.instructions[target.ins_count++] = *ins;
++i;
break;
}
} }
if ((ret = vsir_program_structurize_function(program, message_context, &target)) < 0)
goto fail;
vkd3d_free(program->instructions.elements); vkd3d_free(program->instructions.elements);
program->instructions.elements = target.instructions; program->instructions.elements = target.instructions;
program->instructions.capacity = target.ins_capacity; program->instructions.capacity = target.ins_capacity;
@ -5058,10 +5087,21 @@ static enum vkd3d_result vsir_program_materialize_undominated_ssas_to_temps(stru
{ {
enum vkd3d_result ret; enum vkd3d_result ret;
struct vsir_cfg cfg; struct vsir_cfg cfg;
size_t stop_pos = 0;
if ((ret = vsir_cfg_init(&cfg, program, message_context, NULL)) < 0) if (program->shader_version.type == VKD3D_SHADER_TYPE_HULL)
{
FIXME("Hull shaders are not supported.\n");
vkd3d_shader_error(message_context, NULL, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED,
"The structurizer does not support hull shaders.");
return VKD3D_ERROR_INVALID_SHADER;
}
if ((ret = vsir_cfg_init(&cfg, program, message_context, NULL, &stop_pos)) < 0)
return ret; return ret;
assert(stop_pos == program->instructions.count);
vsir_cfg_compute_dominators(&cfg); vsir_cfg_compute_dominators(&cfg);
ret = vsir_cfg_materialize_undominated_ssas_to_temps(&cfg); ret = vsir_cfg_materialize_undominated_ssas_to_temps(&cfg);