wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/ir: Validate INPUT destination parameters using a uniform helper.

Browse Source
This commit is contained in:
Giovanni Mascellani 2024-12-13 16:32:46 +01:00 committed by Henri Verbeet
parent 8d4b790eb2
commit 38a5c905db
Notes: Henri Verbeet 2024-12-17 16:53:02 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1320
1 changed files with 54 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7242,8 +7242,9 @@ struct vsir_io_register_data
enum enum
{ {
ACCESS_BIT = (1u << 0), INPUT_BIT = (1u << 0),
CONTROL_POINT_BIT = (1u << 1), OUTPUT_BIT = (1u << 1),
CONTROL_POINT_BIT = (1u << 2),
}; };
static const struct vsir_io_register_data vsir_sm4_io_register_data static const struct vsir_io_register_data vsir_sm4_io_register_data
@ -7251,46 +7252,46 @@ static const struct vsir_io_register_data vsir_sm4_io_register_data
{ {
[VKD3D_SHADER_TYPE_PIXEL][PHASE_NONE] = [VKD3D_SHADER_TYPE_PIXEL][PHASE_NONE] =
{ {
[REG_V] = {ACCESS_BIT, SIGNATURE_TYPE_INPUT}, [REG_V] = {INPUT_BIT, SIGNATURE_TYPE_INPUT},
[REG_O] = {ACCESS_BIT, SIGNATURE_TYPE_OUTPUT}, [REG_O] = {OUTPUT_BIT, SIGNATURE_TYPE_OUTPUT},
}, },
[VKD3D_SHADER_TYPE_VERTEX][PHASE_NONE] = [VKD3D_SHADER_TYPE_VERTEX][PHASE_NONE] =
{ {
[REG_V] = {ACCESS_BIT, SIGNATURE_TYPE_INPUT}, [REG_V] = {INPUT_BIT, SIGNATURE_TYPE_INPUT},
[REG_O] = {ACCESS_BIT, SIGNATURE_TYPE_OUTPUT}, [REG_O] = {OUTPUT_BIT, SIGNATURE_TYPE_OUTPUT},
}, },
[VKD3D_SHADER_TYPE_GEOMETRY][PHASE_NONE] = [VKD3D_SHADER_TYPE_GEOMETRY][PHASE_NONE] =
{ {
[REG_V] = {ACCESS_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_INPUT}, [REG_V] = {INPUT_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_INPUT},
[REG_O] = {ACCESS_BIT, SIGNATURE_TYPE_OUTPUT}, [REG_O] = {OUTPUT_BIT, SIGNATURE_TYPE_OUTPUT},
}, },
[VKD3D_SHADER_TYPE_HULL][PHASE_CONTROL_POINT] = [VKD3D_SHADER_TYPE_HULL][PHASE_CONTROL_POINT] =
{ {
[REG_V] = {ACCESS_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_INPUT}, [REG_V] = {INPUT_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_INPUT},
[REG_O] = {ACCESS_BIT, SIGNATURE_TYPE_OUTPUT}, [REG_O] = {OUTPUT_BIT, SIGNATURE_TYPE_OUTPUT},
}, },
[VKD3D_SHADER_TYPE_HULL][PHASE_FORK] = [VKD3D_SHADER_TYPE_HULL][PHASE_FORK] =
{ {
[REG_VICP] = {ACCESS_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_INPUT}, [REG_VICP] = {INPUT_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_INPUT},
[REG_VOCP] = {ACCESS_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_OUTPUT}, [REG_VOCP] = {INPUT_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_OUTPUT},
/* According to MSDN, vpc is not allowed in fork phases. However we /* According to MSDN, vpc is not allowed in fork phases. However we
* don't really distinguish between fork and join phases, so we * don't really distinguish between fork and join phases, so we
* allow it. */ * allow it. */
[REG_VPC] = {ACCESS_BIT, SIGNATURE_TYPE_PATCH_CONSTANT}, [REG_VPC] = {INPUT_BIT, SIGNATURE_TYPE_PATCH_CONSTANT},
[REG_O] = {ACCESS_BIT, SIGNATURE_TYPE_PATCH_CONSTANT}, [REG_O] = {OUTPUT_BIT, SIGNATURE_TYPE_PATCH_CONSTANT},
}, },
[VKD3D_SHADER_TYPE_HULL][PHASE_JOIN] = [VKD3D_SHADER_TYPE_HULL][PHASE_JOIN] =
{ {
[REG_VICP] = {ACCESS_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_INPUT}, [REG_VICP] = {INPUT_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_INPUT},
[REG_VOCP] = {ACCESS_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_OUTPUT}, [REG_VOCP] = {INPUT_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_OUTPUT},
[REG_VPC] = {ACCESS_BIT, SIGNATURE_TYPE_PATCH_CONSTANT}, [REG_VPC] = {INPUT_BIT, SIGNATURE_TYPE_PATCH_CONSTANT},
[REG_O] = {ACCESS_BIT, SIGNATURE_TYPE_PATCH_CONSTANT}, [REG_O] = {OUTPUT_BIT, SIGNATURE_TYPE_PATCH_CONSTANT},
}, },
[VKD3D_SHADER_TYPE_DOMAIN][PHASE_NONE] = [VKD3D_SHADER_TYPE_DOMAIN][PHASE_NONE] =
{ {
[REG_VICP] = {ACCESS_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_INPUT}, [REG_VICP] = {INPUT_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_INPUT},
[REG_VPC] = {ACCESS_BIT, SIGNATURE_TYPE_PATCH_CONSTANT}, [REG_VPC] = {INPUT_BIT, SIGNATURE_TYPE_PATCH_CONSTANT},
[REG_O] = {ACCESS_BIT, SIGNATURE_TYPE_OUTPUT}, [REG_O] = {OUTPUT_BIT, SIGNATURE_TYPE_OUTPUT},
}, },
}; };
@ -7299,41 +7300,41 @@ static const struct vsir_io_register_data vsir_sm6_io_register_data
{ {
[VKD3D_SHADER_TYPE_PIXEL][PHASE_NONE] = [VKD3D_SHADER_TYPE_PIXEL][PHASE_NONE] =
{ {
[REG_V] = {ACCESS_BIT, SIGNATURE_TYPE_INPUT}, [REG_V] = {INPUT_BIT, SIGNATURE_TYPE_INPUT},
[REG_O] = {ACCESS_BIT, SIGNATURE_TYPE_OUTPUT}, [REG_O] = {OUTPUT_BIT, SIGNATURE_TYPE_OUTPUT},
}, },
[VKD3D_SHADER_TYPE_VERTEX][PHASE_NONE] = [VKD3D_SHADER_TYPE_VERTEX][PHASE_NONE] =
{ {
[REG_V] = {ACCESS_BIT, SIGNATURE_TYPE_INPUT}, [REG_V] = {INPUT_BIT, SIGNATURE_TYPE_INPUT},
[REG_O] = {ACCESS_BIT, SIGNATURE_TYPE_OUTPUT}, [REG_O] = {OUTPUT_BIT, SIGNATURE_TYPE_OUTPUT},
}, },
[VKD3D_SHADER_TYPE_GEOMETRY][PHASE_NONE] = [VKD3D_SHADER_TYPE_GEOMETRY][PHASE_NONE] =
{ {
[REG_V] = {ACCESS_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_INPUT}, [REG_V] = {INPUT_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_INPUT},
[REG_O] = {ACCESS_BIT, SIGNATURE_TYPE_OUTPUT}, [REG_O] = {OUTPUT_BIT, SIGNATURE_TYPE_OUTPUT},
}, },
[VKD3D_SHADER_TYPE_HULL][PHASE_CONTROL_POINT] = [VKD3D_SHADER_TYPE_HULL][PHASE_CONTROL_POINT] =
{ {
[REG_V] = {ACCESS_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_INPUT}, [REG_V] = {INPUT_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_INPUT},
[REG_O] = {ACCESS_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_OUTPUT}, [REG_O] = {OUTPUT_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_OUTPUT},
}, },
[VKD3D_SHADER_TYPE_HULL][PHASE_FORK] = [VKD3D_SHADER_TYPE_HULL][PHASE_FORK] =
{ {
[REG_V] = {ACCESS_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_INPUT}, [REG_V] = {INPUT_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_INPUT},
[REG_O] = {ACCESS_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_OUTPUT}, [REG_O] = {INPUT_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_OUTPUT},
[REG_VPC] = {ACCESS_BIT, SIGNATURE_TYPE_PATCH_CONSTANT}, [REG_VPC] = {INPUT_BIT | OUTPUT_BIT, SIGNATURE_TYPE_PATCH_CONSTANT},
}, },
[VKD3D_SHADER_TYPE_HULL][PHASE_JOIN] = [VKD3D_SHADER_TYPE_HULL][PHASE_JOIN] =
{ {
[REG_V] = {ACCESS_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_INPUT}, [REG_V] = {INPUT_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_INPUT},
[REG_O] = {ACCESS_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_OUTPUT}, [REG_O] = {INPUT_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_OUTPUT},
[REG_VPC] = {ACCESS_BIT, SIGNATURE_TYPE_PATCH_CONSTANT}, [REG_VPC] = {INPUT_BIT | OUTPUT_BIT, SIGNATURE_TYPE_PATCH_CONSTANT},
}, },
[VKD3D_SHADER_TYPE_DOMAIN][PHASE_NONE] = [VKD3D_SHADER_TYPE_DOMAIN][PHASE_NONE] =
{ {
[REG_V] = {ACCESS_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_INPUT}, [REG_V] = {INPUT_BIT | CONTROL_POINT_BIT, SIGNATURE_TYPE_INPUT},
[REG_VPC] = {ACCESS_BIT, SIGNATURE_TYPE_PATCH_CONSTANT}, [REG_VPC] = {INPUT_BIT, SIGNATURE_TYPE_PATCH_CONSTANT},
[REG_O] = {ACCESS_BIT, SIGNATURE_TYPE_OUTPUT}, [REG_O] = {OUTPUT_BIT, SIGNATURE_TYPE_OUTPUT},
}, },
}; };
@ -7378,7 +7379,7 @@ static const bool vsir_get_io_register_data(struct validation_context *ctx,
*data = (*signature_register_data)[ctx->program->shader_version.type][phase][io_reg_type]; *data = (*signature_register_data)[ctx->program->shader_version.type][phase][io_reg_type];
if (!(data->flags & ACCESS_BIT)) if (!(data->flags & (INPUT_BIT | OUTPUT_BIT)))
return false; return false;
/* VSIR_NORMALISED_HULL_CONTROL_POINT_IO differs from VSIR_NORMALISED_SM4 /* VSIR_NORMALISED_HULL_CONTROL_POINT_IO differs from VSIR_NORMALISED_SM4
@ -7982,6 +7983,16 @@ static void vsir_validate_register(struct validation_context *ctx,
} }
} }
static void vsir_validate_io_dst_param(struct validation_context *ctx,
const struct vkd3d_shader_dst_param *dst)
{
struct vsir_io_register_data io_reg_data;
if (!vsir_get_io_register_data(ctx, dst->reg.type, &io_reg_data) || !(io_reg_data.flags & OUTPUT_BIT))
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE,
"Invalid register type %#x used as destination parameter.", dst->reg.type);
}
static void vsir_validate_dst_param(struct validation_context *ctx, static void vsir_validate_dst_param(struct validation_context *ctx,
const struct vkd3d_shader_dst_param *dst) const struct vkd3d_shader_dst_param *dst)
{ {
@ -8056,11 +8067,14 @@ static void vsir_validate_dst_param(struct validation_context *ctx,
case VKD3DSPR_IMMCONST64: case VKD3DSPR_IMMCONST64:
case VKD3DSPR_SAMPLER: case VKD3DSPR_SAMPLER:
case VKD3DSPR_RESOURCE: case VKD3DSPR_RESOURCE:
case VKD3DSPR_INPUT:
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE, validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE,
"Invalid %#x register used as destination parameter.", dst->reg.type); "Invalid %#x register used as destination parameter.", dst->reg.type);
break; break;
case VKD3DSPR_INPUT:
vsir_validate_io_dst_param(ctx, dst);
break;
case VKD3DSPR_PATCHCONST: case VKD3DSPR_PATCHCONST:
if (ctx->program->shader_version.type != VKD3D_SHADER_TYPE_HULL) if (ctx->program->shader_version.type != VKD3D_SHADER_TYPE_HULL)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE, validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE,