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: Check that DEPTHOUT registers have dimension SCALAR.

Browse Source 
Also fix the DXIL parser to emit them accordingly.
This commit is contained in:
Giovanni Mascellani
2025-07-18 20:03:42 +02:00
committed by Henri Verbeet
parent 3d23ef6bf8
commit 9f453fbb66
Notes: Henri Verbeet 2025-07-21 12:36:12 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1629
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libs/vkd3d-shader/dxil.c
View File

@@ -4068,8 +4068,8 @@ static enum vkd3d_result sm6_parser_globals_init(struct sm6_parser *sm6)
return VKD3D_OK; return VKD3D_OK;
} }
static void dst_param_io_init(struct vkd3d_shader_dst_param *param, static void dst_param_io_init(struct vkd3d_shader_dst_param *param, const struct signature_element *e,
const struct signature_element *e, enum vkd3d_shader_register_type reg_type) enum vkd3d_shader_register_type reg_type, enum vsir_dimension dimension)
{ {
enum vkd3d_shader_component_type component_type; enum vkd3d_shader_component_type component_type;
@@ -4079,7 +4079,7 @@ static void dst_param_io_init(struct vkd3d_shader_dst_param *param,
/* DXIL types do not have signedness. Load signed elements as unsigned. */ /* DXIL types do not have signedness. Load signed elements as unsigned. */
component_type = e->component_type == VKD3D_SHADER_COMPONENT_INT ? VKD3D_SHADER_COMPONENT_UINT : e->component_type; component_type = e->component_type == VKD3D_SHADER_COMPONENT_INT ? VKD3D_SHADER_COMPONENT_UINT : e->component_type;
vsir_register_init(&param->reg, reg_type, vsir_data_type_from_component_type(component_type), 0); vsir_register_init(&param->reg, reg_type, vsir_data_type_from_component_type(component_type), 0);
param->reg.dimension = VSIR_DIMENSION_VEC4; param->reg.dimension = dimension;
} }
static void src_params_init_from_operands(struct vkd3d_shader_src_param *src_params, static void src_params_init_from_operands(struct vkd3d_shader_src_param *src_params,
@@ -4092,8 +4092,10 @@ static void src_params_init_from_operands(struct vkd3d_shader_src_param *src_par
} }
static enum vkd3d_shader_register_type register_type_from_dxil_semantic_kind( static enum vkd3d_shader_register_type register_type_from_dxil_semantic_kind(
enum vkd3d_shader_sysval_semantic sysval_semantic, bool is_input) enum vkd3d_shader_sysval_semantic sysval_semantic, bool is_input, enum vsir_dimension *dimension)
{ {
*dimension = VSIR_DIMENSION_VEC4;
switch (sysval_semantic) switch (sysval_semantic)
{ {
/* VSIR does not use an I/O register for SV_SampleIndex, but its /* VSIR does not use an I/O register for SV_SampleIndex, but its
@@ -4104,6 +4106,7 @@ static enum vkd3d_shader_register_type register_type_from_dxil_semantic_kind(
case VKD3D_SHADER_SV_COVERAGE: case VKD3D_SHADER_SV_COVERAGE:
return is_input ? VKD3DSPR_COVERAGE : VKD3DSPR_SAMPLEMASK; return is_input ? VKD3DSPR_COVERAGE : VKD3DSPR_SAMPLEMASK;
case VKD3D_SHADER_SV_DEPTH: case VKD3D_SHADER_SV_DEPTH:
*dimension = VSIR_DIMENSION_SCALAR;
return VKD3DSPR_DEPTHOUT; return VKD3DSPR_DEPTHOUT;
case VKD3D_SHADER_SV_DEPTH_GREATER_EQUAL: case VKD3D_SHADER_SV_DEPTH_GREATER_EQUAL:
return VKD3DSPR_DEPTHOUTGE; return VKD3DSPR_DEPTHOUTGE;
@@ -4147,18 +4150,21 @@ static void sm6_parser_init_signature(struct sm6_parser *sm6, const struct shade
for (i = 0; i < s->element_count; ++i) for (i = 0; i < s->element_count; ++i)
{ {
enum vsir_dimension dimension;
e = &s->elements[i]; e = &s->elements[i];
param = &params[i]; param = &params[i];
if (e->register_index == UINT_MAX if (e->register_index == UINT_MAX
&& (io_reg_type = register_type_from_dxil_semantic_kind(e->sysval_semantic, is_input)) != VKD3DSPR_NULL) && (io_reg_type = register_type_from_dxil_semantic_kind(
e->sysval_semantic, is_input, &dimension)) != VKD3DSPR_NULL)
{ {
dst_param_io_init(param, e, io_reg_type); dst_param_io_init(param, e, io_reg_type, dimension);
continue; continue;
} }
dst_param_io_init(param, e, reg_type); dst_param_io_init(param, e, reg_type, VSIR_DIMENSION_VEC4);
count = 0; count = 0;
if (is_control_point) if (is_control_point)
@@ -9815,7 +9821,9 @@ static enum vkd3d_result sm6_parser_read_signature(struct sm6_parser *sm6, const
if ((is_register = e->register_index == UINT_MAX)) if ((is_register = e->register_index == UINT_MAX))
{ {
if (register_type_from_dxil_semantic_kind(e->sysval_semantic, is_input) == VKD3DSPR_INVALID) enum vsir_dimension dimension;
if (register_type_from_dxil_semantic_kind(e->sysval_semantic, is_input, &dimension) == VKD3DSPR_INVALID)
{ {
WARN("Unhandled I/O register semantic kind %u.\n", j); WARN("Unhandled I/O register semantic kind %u.\n", j);
vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_SIGNATURE, vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_SIGNATURE,

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

@@ -9542,6 +9542,7 @@ static void vsir_validate_register(struct validation_context *ctx,
} }
register_validation_data[] = register_validation_data[] =
{ {
[VKD3DSPR_DEPTHOUT] = {true, 0, VSIR_DIMENSION_SCALAR},
[VKD3DSPR_LOCALTHREADINDEX] = {true, 0, VSIR_DIMENSION_VEC4}, [VKD3DSPR_LOCALTHREADINDEX] = {true, 0, VSIR_DIMENSION_VEC4},
[VKD3DSPR_COVERAGE] = {true, 0, VSIR_DIMENSION_VEC4}, [VKD3DSPR_COVERAGE] = {true, 0, VSIR_DIMENSION_VEC4},
}; };
@@ -9612,10 +9613,6 @@ static void vsir_validate_register(struct validation_context *ctx,
vsir_validate_io_register(ctx, reg); vsir_validate_io_register(ctx, reg);
break; break;
case VKD3DSPR_DEPTHOUT:
vsir_validate_register_without_indices(ctx, reg);
break;
case VKD3DSPR_MISCTYPE: case VKD3DSPR_MISCTYPE:
vsir_validate_misctype_register(ctx, reg); vsir_validate_misctype_register(ctx, reg);
break; break;