Module: vkd3d Branch: master Commit: 38d7913f5f573bbf7a5fd6af672c552219d005dd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=38d7913f5f573bbf7a5fd6af...
Author: Giovanni Mascellani gmascellani@codeweavers.com Date: Thu Apr 28 15:32:04 2022 +0200
vkd3d-shader/hlsl: Allow storing to matrices.
Signed-off-by: Giovanni Mascellani gmascellani@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Zebediah Figura zfigura@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
libs/vkd3d-shader/hlsl_sm4.c | 6 ------ tests/hlsl-initializer-matrix.shader_test | 2 +- tests/hlsl-matrix-indexing.shader_test | 2 +- tests/hlsl-numeric-types.shader_test | 4 ++-- 4 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 8afa9333..a5fc094b 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -2047,12 +2047,6 @@ static void write_sm4_store(struct hlsl_ctx *ctx, struct sm4_instruction instr; unsigned int writemask;
- if (store->lhs.var->data_type->type == HLSL_CLASS_MATRIX) - { - hlsl_fixme(ctx, &store->node.loc, "Store to a matrix variable."); - return; - } - memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_MOV;
diff --git a/tests/hlsl-initializer-matrix.shader_test b/tests/hlsl-initializer-matrix.shader_test index 790d402d..ea9de9c0 100644 --- a/tests/hlsl-initializer-matrix.shader_test +++ b/tests/hlsl-initializer-matrix.shader_test @@ -68,5 +68,5 @@ float4 main() : SV_TARGET }
[test] -todo draw quad +draw quad probe all rgba (21, 22, 31, 32) diff --git a/tests/hlsl-matrix-indexing.shader_test b/tests/hlsl-matrix-indexing.shader_test index 9336a67a..716b43d4 100644 --- a/tests/hlsl-matrix-indexing.shader_test +++ b/tests/hlsl-matrix-indexing.shader_test @@ -74,5 +74,5 @@ float4 main() : SV_TARGET }
[test] -todo draw quad +draw quad probe all rgba (1.0, 5.0, 7.0, 12.0) diff --git a/tests/hlsl-numeric-types.shader_test b/tests/hlsl-numeric-types.shader_test index 58612191..7504f95a 100644 --- a/tests/hlsl-numeric-types.shader_test +++ b/tests/hlsl-numeric-types.shader_test @@ -56,7 +56,7 @@ float4 main() : sv_target }
[test] -todo draw quad +draw quad probe all rgba (5.0, 6.0, 7.0, 8.0)
[pixel shader] @@ -68,7 +68,7 @@ float4 main() : sv_target }
[test] -todo draw quad +draw quad probe all rgba (5.0, 6.0, 7.0, 0.0)
[pixel shader fail]