On Thu Nov 2 18:24:28 2023 +0000, Zebediah Figura wrote:
> It looks like this needs a rebase?
Sorry for submitting code that doesn't compile. This is going to require some more invasive changes. I will fix it tonight.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/4122#note_50687
Evan Tang reported that new fixmes appeared on the shader_runner when
running some of his tests after
f50d0ae2cbc5ee2a26fedd7b8aac2def62decd6c.
vkd3d:652593:fixme:shader_sm4_read_src_param Unhandled mask 0x4.
The change to blame seems to be this added line in
sm4_src_from_constant_value().
+ src->swizzle = VKD3D_SHADER_NO_SWIZZLE;
On tpf binaries the last 12 bytes of each src register in an instruction
specify the swizzle, and there are 5 possible combinations:
Dimension NONE
-------- 00
Dimension SCALAR
-------- 01
Dimension VEC4, with a 4 bit writemask:
---- xxxx 00 01
Dimension VEC4, with an 8 bit swizzle:
xx xx xx xx 01 01
Dimension VEC4, with a 2bit scalar dimension number:
------ xx 10 01
So far, we have only seen src registers use 4 bit writemasks in a
single case: for vec4 constants, and it is always zero.
So we expect this:
---- 0000 00 01
Now, I probably wanted to initialize src->swizzle to zero when writing
constants, but VKD3D_SHADER_NO_SWIZZLE is not zero, it is actually the
default swizzle:
11 10 01 00
And the last 4 bits (0x4) get written in the mask part, which causes
the reader to complain.
--
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/438
--
v6: vkd3d-shader/ir: Validate the index of a TEMP register.
vkd3d-shader/ir: Validate the DCL_TEMPS instruction.
vkd3d-shader/ir: Validate the register index count.
vkd3d-shader/ir: Validate the register dimension.
vkd3d-shader/ir: Validate the register data type.
vkd3d-shader/ir: Validate the register precision.
vkd3d-shader/dxil: Use vsir_register_init() to initialize registers.
vkd3d-shader: Deduplicate profile version comparison functions.
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/432