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_INPUT_PRIMITIVE instructions.

Browse Source
This commit is contained in:
Henri Verbeet
2025-08-08 20:41:02 +02:00
parent b9b9920593
commit 392da43dd3
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 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1750,6 +1750,7 @@ static enum vkd3d_result vsir_program_lower_instructions(struct vsir_program *pr
case VSIR_OP_DCL: case VSIR_OP_DCL:
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_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:

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

@@ -7209,10 +7209,9 @@ static void spirv_compiler_emit_output_vertex_count(struct spirv_compiler *compi
SpvExecutionModeOutputVertices, instruction->declaration.count); SpvExecutionModeOutputVertices, instruction->declaration.count);
} }
static void spirv_compiler_emit_dcl_input_primitive(struct spirv_compiler *compiler, static void spirv_compiler_emit_input_primitive(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->input_primitive;
SpvExecutionMode mode; SpvExecutionMode mode;
switch (primitive_type) switch (primitive_type)
@@ -7233,7 +7232,8 @@ static void spirv_compiler_emit_dcl_input_primitive(struct spirv_compiler *compi
mode = SpvExecutionModeInputTrianglesAdjacency; mode = SpvExecutionModeInputTrianglesAdjacency;
break; break;
default: default:
FIXME("Unhandled primitive type %#x.\n", primitive_type); spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_NOT_IMPLEMENTED,
"Unhandled input primitive type %#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_INPUT_PRIMITIVE:
spirv_compiler_emit_dcl_input_primitive(compiler, instruction);
break;
case VSIR_OP_DCL_OUTPUT_TOPOLOGY: case VSIR_OP_DCL_OUTPUT_TOPOLOGY:
spirv_compiler_emit_dcl_output_topology(compiler, instruction); spirv_compiler_emit_dcl_output_topology(compiler, instruction);
break; break;
@@ -11067,6 +11064,8 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler,
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)
spirv_compiler_emit_input_primitive(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);