[PATCH vkd3d v2 7/7] vkd3d-shader/hlsl: Write SM4 right shift instructions.

Matteo Bruni mbruni at codeweavers.com
Wed Apr 6 14:24:48 CDT 2022


From: Giovanni Mascellani <gmascellani at codeweavers.com>

Signed-off-by: Giovanni Mascellani <gmascellani at codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
---
 Makefile.am                  | 1 -
 libs/vkd3d-shader/hlsl_sm4.c | 7 +++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 2c049cb5..f08bb926 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -318,7 +318,6 @@ SHADER_TEST_LOG_COMPILER = tests/shader_runner
 XFAIL_TESTS = \
 	tests/arithmetic-float.shader_test \
 	tests/arithmetic-int.shader_test \
-	tests/bitwise.shader_test \
 	tests/cast-to-float.shader_test \
 	tests/cast-to-half.shader_test \
 	tests/cast-to-int.shader_test \
diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c
index 1eefe450..76f08339 100644
--- a/libs/vkd3d-shader/hlsl_sm4.c
+++ b/libs/vkd3d-shader/hlsl_sm4.c
@@ -1866,6 +1866,13 @@ static void write_sm4_expr(struct hlsl_ctx *ctx,
             break;
         }
 
+        case HLSL_OP2_RSHIFT:
+            assert(type_is_integer(dst_type));
+            assert(dst_type->base_type != HLSL_TYPE_BOOL);
+            write_sm4_binary_op(buffer, dst_type->base_type == HLSL_TYPE_INT ? VKD3D_SM4_OP_ISHR : VKD3D_SM4_OP_USHR,
+                    &expr->node, arg1, arg2);
+            break;
+
         default:
             hlsl_fixme(ctx, &expr->node.loc, "SM4 %s expression.", debug_hlsl_expr_op(expr->op));
     }
-- 
2.34.1




More information about the wine-devel mailing list