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: Store the control point counts in struct vkd3d_shader_desc.

Browse Source
This commit is contained in:
Zebediah Figura
2023-10-23 22:14:09 -05:00
committed by Alexandre Julliard
parent 3ff22ac5af
commit 0058764f01
Notes: Alexandre Julliard 2023-11-07 22:40:55 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/439
3 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9338,11 +9338,7 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler,
case VKD3DSIH_DCL_GS_INSTANCES: case VKD3DSIH_DCL_GS_INSTANCES:
spirv_compiler_emit_dcl_gs_instances(compiler, instruction); spirv_compiler_emit_dcl_gs_instances(compiler, instruction);
break; break;
case VKD3DSIH_DCL_INPUT_CONTROL_POINT_COUNT:
compiler->input_control_point_count = instruction->declaration.count;
break;
case VKD3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT: case VKD3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT:
compiler->output_control_point_count = instruction->declaration.count;
spirv_compiler_emit_output_vertex_count(compiler, instruction); spirv_compiler_emit_output_vertex_count(compiler, instruction);
break; break;
case VKD3DSIH_DCL_TESSELLATOR_DOMAIN: case VKD3DSIH_DCL_TESSELLATOR_DOMAIN:
@ -9602,6 +9598,7 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler,
case VKD3DSIH_DCL: case VKD3DSIH_DCL:
case VKD3DSIH_DCL_CONSTANT_BUFFER: case VKD3DSIH_DCL_CONSTANT_BUFFER:
case VKD3DSIH_DCL_HS_MAX_TESSFACTOR: case VKD3DSIH_DCL_HS_MAX_TESSFACTOR:
case VKD3DSIH_DCL_INPUT_CONTROL_POINT_COUNT:
case VKD3DSIH_DCL_RESOURCE_RAW: case VKD3DSIH_DCL_RESOURCE_RAW:
case VKD3DSIH_DCL_RESOURCE_STRUCTURED: case VKD3DSIH_DCL_RESOURCE_STRUCTURED:
case VKD3DSIH_DCL_SAMPLER: case VKD3DSIH_DCL_SAMPLER:
@ -9700,6 +9697,9 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler,
memset(&shader_desc->patch_constant_signature, 0, sizeof(shader_desc->patch_constant_signature)); memset(&shader_desc->patch_constant_signature, 0, sizeof(shader_desc->patch_constant_signature));
compiler->use_vocp = parser->shader_desc.use_vocp; compiler->use_vocp = parser->shader_desc.use_vocp;
compiler->input_control_point_count = shader_desc->input_control_point_count;
compiler->output_control_point_count = shader_desc->output_control_point_count;
if (compiler->shader_type != VKD3D_SHADER_TYPE_HULL) if (compiler->shader_type != VKD3D_SHADER_TYPE_HULL)
spirv_compiler_emit_shader_signature_outputs(compiler); spirv_compiler_emit_shader_signature_outputs(compiler);

29
libs/vkd3d-shader/tpf.c
View File

@ -659,16 +659,18 @@ static const enum vkd3d_primitive_type output_primitive_type_table[] =
/* VKD3D_SM4_OUTPUT_PT_TRIANGLESTRIP */ VKD3D_PT_TRIANGLESTRIP, /* VKD3D_SM4_OUTPUT_PT_TRIANGLESTRIP */ VKD3D_PT_TRIANGLESTRIP,
}; };
static const enum vkd3d_primitive_type input_primitive_type_table[] = static const struct
{ {
/* UNKNOWN */ VKD3D_PT_UNDEFINED, unsigned int control_point_count;
/* VKD3D_SM4_INPUT_PT_POINT */ VKD3D_PT_POINTLIST, enum vkd3d_primitive_type vkd3d_type;
/* VKD3D_SM4_INPUT_PT_LINE */ VKD3D_PT_LINELIST, }
/* VKD3D_SM4_INPUT_PT_TRIANGLE */ VKD3D_PT_TRIANGLELIST, input_primitive_type_table[] =
/* UNKNOWN */ VKD3D_PT_UNDEFINED, {
/* UNKNOWN */ VKD3D_PT_UNDEFINED, [VKD3D_SM4_INPUT_PT_POINT] = {1, VKD3D_PT_POINTLIST},
/* VKD3D_SM4_INPUT_PT_LINEADJ */ VKD3D_PT_LINELIST_ADJ, [VKD3D_SM4_INPUT_PT_LINE] = {2, VKD3D_PT_LINELIST},
/* VKD3D_SM4_INPUT_PT_TRIANGLEADJ */ VKD3D_PT_TRIANGLELIST_ADJ, [VKD3D_SM4_INPUT_PT_TRIANGLE] = {3, VKD3D_PT_TRIANGLELIST},
[VKD3D_SM4_INPUT_PT_LINEADJ] = {4, VKD3D_PT_LINELIST_ADJ},
[VKD3D_SM4_INPUT_PT_TRIANGLEADJ] = {6, VKD3D_PT_TRIANGLELIST_ADJ},
}; };
static const enum vkd3d_shader_resource_type resource_type_table[] = static const enum vkd3d_shader_resource_type resource_type_table[] =
@ -1037,6 +1039,7 @@ static void shader_sm4_read_dcl_input_primitive(struct vkd3d_shader_instruction
{ {
ins->declaration.primitive_type.type = VKD3D_PT_PATCH; ins->declaration.primitive_type.type = VKD3D_PT_PATCH;
ins->declaration.primitive_type.patch_vertex_count = primitive_type - VKD3D_SM5_INPUT_PT_PATCH1 + 1; ins->declaration.primitive_type.patch_vertex_count = primitive_type - VKD3D_SM5_INPUT_PT_PATCH1 + 1;
priv->p.shader_desc.input_control_point_count = ins->declaration.primitive_type.patch_vertex_count;
} }
else if (primitive_type >= ARRAY_SIZE(input_primitive_type_table)) else if (primitive_type >= ARRAY_SIZE(input_primitive_type_table))
{ {
@ -1044,7 +1047,8 @@ static void shader_sm4_read_dcl_input_primitive(struct vkd3d_shader_instruction
} }
else else
{ {
ins->declaration.primitive_type.type = input_primitive_type_table[primitive_type]; ins->declaration.primitive_type.type = input_primitive_type_table[primitive_type].vkd3d_type;
priv->p.shader_desc.input_control_point_count = input_primitive_type_table[primitive_type].control_point_count;
} }
if (ins->declaration.primitive_type.type == VKD3D_PT_UNDEFINED) if (ins->declaration.primitive_type.type == VKD3D_PT_UNDEFINED)
@ -1154,6 +1158,11 @@ static void shader_sm5_read_control_point_count(struct vkd3d_shader_instruction
{ {
ins->declaration.count = (opcode_token & VKD3D_SM5_CONTROL_POINT_COUNT_MASK) ins->declaration.count = (opcode_token & VKD3D_SM5_CONTROL_POINT_COUNT_MASK)
>> VKD3D_SM5_CONTROL_POINT_COUNT_SHIFT; >> VKD3D_SM5_CONTROL_POINT_COUNT_SHIFT;
if (opcode == VKD3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT)
priv->p.shader_desc.input_control_point_count = ins->declaration.count;
else
priv->p.shader_desc.output_control_point_count = ins->declaration.count;
} }
static void shader_sm5_read_dcl_tessellator_domain(struct vkd3d_shader_instruction *ins, uint32_t opcode, static void shader_sm5_read_dcl_tessellator_domain(struct vkd3d_shader_instruction *ins, uint32_t opcode,

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

@ -955,6 +955,8 @@ struct vkd3d_shader_desc
struct shader_signature output_signature; struct shader_signature output_signature;
struct shader_signature patch_constant_signature; struct shader_signature patch_constant_signature;
unsigned int input_control_point_count, output_control_point_count;
uint32_t temp_count; uint32_t temp_count;
unsigned int ssa_count; unsigned int ssa_count;