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/d3dbc: Normalise I/O register write masks when not disassembling.

Browse Source 
Sometimes SM1-3 shaders contain write masks that exceed the
signature element masks. That happens because SM1-3 shaders do not
have a concept of signature and signature masks, and OTOH aren't
always able to express any given write mask.

In VSIR we don't want to deal with I/O register masks exceeding the
corresponding signature element mask or usage mask, because, for
instance, for higher shader models it can complicate dealing with
DCL_INDEX_RANGE. In order to have uniform rules for all shader
models we normalise masks coming from SM1-3 shaders.

We don't do that normalisation when disassembling, in order to
preserve the expected output.
This commit is contained in:
Giovanni Mascellani
2024-12-06 22:27:01 +01:00
committed by Henri Verbeet
parent 64126a00c3
commit dd0ed989a1
Notes: Henri Verbeet 2024-12-12 17:48:46 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Francisco Casas (@fcasas)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1311
3 changed files with 46 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8098,29 +8098,20 @@ static void vsir_validate_signature_element(struct validation_context *ctx,
"element %u of %s signature: Non-contiguous mask %#x.",
idx, signature_type_name, element->mask);
/* Here we'd likely want to validate that the usage mask is a subset of the
* signature mask. Unfortunately the D3DBC parser sometimes violates this.
* For example I've seen a shader like this:
* ps_3_0
* [...]
* dcl_texcoord0 v0
* [...]
* texld r2.xyzw, v0.xyzw, s1.xyzw
* [...]
*
* The dcl_textcoord0 instruction secretly has a .xy mask, which is used to
* compute the signature mask, but the texld instruction apparently uses all
* the components. Of course the last two components are ignored, but
* formally they seem to be used. So we end up with a signature element with
* mask .xy and usage mask .xyzw.
*
* The correct fix would probably be to make the D3DBC parser aware of which
* components are really used for each instruction, but that would take some
* time. */
if (element->used_mask & ~0xf)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SIGNATURE,
"element %u of %s signature: Invalid usage mask %#x.",
idx, signature_type_name, element->used_mask);
if (ctx->program->normalisation_level >= VSIR_NORMALISED_SM4)
{
if ((element->used_mask & element->mask) != element->used_mask)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SIGNATURE,
"element %u of %s signature: Invalid usage mask %#x with mask %#x.",
idx, signature_type_name, element->used_mask, element->mask);
}
else
{
if (element->used_mask & ~0xf)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SIGNATURE,
"element %u of %s signature: Invalid usage mask %#x.",
idx, signature_type_name, element->used_mask);
}
switch (element->sysval_semantic)
{