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/ir: Remove VSIR_OP_DCL_OUTPUT_TOPOLOGY instructions.

Browse Source
This commit is contained in:
Henri Verbeet
2025-08-08 20:52:57 +02:00
parent 392da43dd3
commit 979d7e4b85
Notes: Henri Verbeet 2025-09-01 15:21:55 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1705
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1751,6 +1751,7 @@ static enum vkd3d_result vsir_program_lower_instructions(struct vsir_program *pr
case VSIR_OP_DCL_CONSTANT_BUFFER: case VSIR_OP_DCL_CONSTANT_BUFFER:
case VSIR_OP_DCL_GLOBAL_FLAGS: case VSIR_OP_DCL_GLOBAL_FLAGS:
case VSIR_OP_DCL_INPUT_PRIMITIVE: case VSIR_OP_DCL_INPUT_PRIMITIVE:
case VSIR_OP_DCL_OUTPUT_TOPOLOGY:
case VSIR_OP_DCL_SAMPLER: case VSIR_OP_DCL_SAMPLER:
case VSIR_OP_DCL_TEMPS: case VSIR_OP_DCL_TEMPS:
case VSIR_OP_DCL_TESSELLATOR_DOMAIN: case VSIR_OP_DCL_TESSELLATOR_DOMAIN:

16
libs/vkd3d-shader/spirv.c
View File

@@ -7263,10 +7263,9 @@ static void spirv_compiler_emit_point_size(struct spirv_compiler *compiler)
} }
} }
static void spirv_compiler_emit_dcl_output_topology(struct spirv_compiler *compiler, static void spirv_compiler_emit_output_topology(struct spirv_compiler *compiler)
const struct vkd3d_shader_instruction *instruction)
{ {
enum vkd3d_primitive_type primitive_type = instruction->declaration.primitive_type.type; enum vkd3d_primitive_type primitive_type = compiler->program->output_topology;
SpvExecutionMode mode; SpvExecutionMode mode;
switch (primitive_type) switch (primitive_type)
@@ -7282,7 +7281,8 @@ static void spirv_compiler_emit_dcl_output_topology(struct spirv_compiler *compi
mode = SpvExecutionModeOutputTriangleStrip; mode = SpvExecutionModeOutputTriangleStrip;
break; break;
default: default:
ERR("Unexpected primitive type %#x.\n", primitive_type); spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_NOT_IMPLEMENTED,
"Unhandled output topology %#x.", primitive_type);
return; return;
} }
@@ -10608,9 +10608,6 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler,
case VSIR_OP_DCL_VERTICES_OUT: case VSIR_OP_DCL_VERTICES_OUT:
spirv_compiler_emit_output_vertex_count(compiler, instruction); spirv_compiler_emit_output_vertex_count(compiler, instruction);
break; break;
case VSIR_OP_DCL_OUTPUT_TOPOLOGY:
spirv_compiler_emit_dcl_output_topology(compiler, instruction);
break;
case VSIR_OP_DCL_GS_INSTANCES: case VSIR_OP_DCL_GS_INSTANCES:
spirv_compiler_emit_dcl_gs_instances(compiler, instruction); spirv_compiler_emit_dcl_gs_instances(compiler, instruction);
break; break;
@@ -11063,9 +11060,14 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler,
if (program->ssa_count) if (program->ssa_count)
spirv_compiler_allocate_ssa_register_ids(compiler, program->ssa_count); spirv_compiler_allocate_ssa_register_ids(compiler, program->ssa_count);
if (compiler->shader_type == VKD3D_SHADER_TYPE_COMPUTE) if (compiler->shader_type == VKD3D_SHADER_TYPE_COMPUTE)
{
spirv_compiler_emit_thread_group_size(compiler, &program->thread_group_size); spirv_compiler_emit_thread_group_size(compiler, &program->thread_group_size);
}
else if (compiler->shader_type == VKD3D_SHADER_TYPE_GEOMETRY) else if (compiler->shader_type == VKD3D_SHADER_TYPE_GEOMETRY)
{
spirv_compiler_emit_input_primitive(compiler); spirv_compiler_emit_input_primitive(compiler);
spirv_compiler_emit_output_topology(compiler);
}
spirv_compiler_emit_global_flags(compiler, program->global_flags); spirv_compiler_emit_global_flags(compiler, program->global_flags);
spirv_compiler_emit_descriptor_declarations(compiler); spirv_compiler_emit_descriptor_declarations(compiler);