vkd3d-shader/glsl: Implement VKD3DSIH_MOVC.

Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1097

libs/vkd3d-shader/glsl.c

@@ -472,6 +472,31 @@ static void shader_glsl_mov(struct vkd3d_glsl_generator *gen, const struct vkd3d
     glsl_dst_cleanup(&dst, &gen->string_buffers);
 }
 
+static void shader_glsl_movc(struct vkd3d_glsl_generator *gen, const struct vkd3d_shader_instruction *ins)
+{
+    unsigned int component_count;
+    struct glsl_src src[3];
+    struct glsl_dst dst;
+    uint32_t mask;
+
+    mask = glsl_dst_init(&dst, gen, ins, &ins->dst[0]);
+    glsl_src_init(&src[0], gen, &ins->src[0], mask);
+    glsl_src_init(&src[1], gen, &ins->src[1], mask);
+    glsl_src_init(&src[2], gen, &ins->src[2], mask);
+
+    if ((component_count = vsir_write_mask_component_count(mask)) > 1)
+        shader_glsl_print_assignment(gen, &dst, "mix(%s, %s, bvec%u(%s))",
+                src[2].str->buffer, src[1].str->buffer, component_count, src[0].str->buffer);
+    else
+        shader_glsl_print_assignment(gen, &dst, "mix(%s, %s, bool(%s))",
+                src[2].str->buffer, src[1].str->buffer, src[0].str->buffer);
+
+    glsl_src_cleanup(&src[2], &gen->string_buffers);
+    glsl_src_cleanup(&src[1], &gen->string_buffers);
+    glsl_src_cleanup(&src[0], &gen->string_buffers);
+    glsl_dst_cleanup(&dst, &gen->string_buffers);
+}
+
 static void shader_glsl_print_sysval_name(struct vkd3d_string_buffer *buffer, struct vkd3d_glsl_generator *gen,
         enum vkd3d_shader_sysval_semantic sysval, unsigned int idx)
 {
@@ -643,6 +668,9 @@ static void vkd3d_glsl_handle_instruction(struct vkd3d_glsl_generator *gen,
         case VKD3DSIH_MOV:
             shader_glsl_mov(gen, ins);
             break;
+        case VKD3DSIH_MOVC:
+            shader_glsl_movc(gen, ins);
+            break;
         case VKD3DSIH_MUL:
             shader_glsl_binop(gen, ins, "*");
             break;

tests/hlsl/arithmetic-float-uniform.shader_test

@@ -25,7 +25,7 @@ float4 main() : SV_TARGET
 
 [test]
 uniform 0 float4 5.0 15.0 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (5.0, 5.0, -5.0, 3.0) 1
 
 [pixel shader]
@@ -40,7 +40,7 @@ float4 main() : SV_TARGET
 
 [test]
 uniform 0 float4 42.0 5.0 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (2.0, -2.0, 2.0, -2.0) 16
 
 [pixel shader]
@@ -55,7 +55,7 @@ float4 main() : SV_TARGET
 
 [test]
 uniform 0 float4 45.0 5.0 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0)
 
 [pixel shader]
@@ -69,7 +69,7 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 5.0 -42.1 4.0 45.0
 uniform 4 float4 15.0 -5.0 4.1 5.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (5.0, -2.1, 4.0, 0.0) 6
 
 [require]

tests/hlsl/fmod.shader_test

@@ -8,10 +8,10 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 -0.5 6.5 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (-0.5, 0.0, 0.0, 0.0) 4
 uniform 0 float4 1.1 0.3 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.2, 0.0, 0.0, 0.0) 4
 
 [pixel shader]
@@ -24,8 +24,8 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 -0.5 6.5 2.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (-0.5, 0.5, 0.0, 0.0) 4
 uniform 0 float4 1.1 0.3 3.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.1, 0.3, 0.0, 0.0) 4

tests/hlsl/ternary.shader_test

@@ -13,10 +13,10 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 2.0 3.0 4.0 5.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (2.0, 3.0, 4.0, 5.0)
 uniform 0 float4 0.0 10.0 11.0 12.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (-1.0, 9.0, 10.0, 11.0)
 
 
@@ -35,7 +35,7 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 1.1 3.0 4.0 5.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.1, 2.0, 0.0, 0.0)
 
 
@@ -51,7 +51,7 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 1.0 0.0 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.5, 0.6, 0.7, 0.0)
 
 
@@ -67,7 +67,7 @@ float4 main() : sv_target
 uniform 0 float4 0.0 1.0 0.0 -3.0
 uniform 4 float4 1.0 2.0 3.0 4.0
 uniform 8 float4 5.0 6.0 7.0 8.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (5.0, 2.0, 7.0, 4.0)
 
 
@@ -260,7 +260,7 @@ float4 main() : sv_target
 uniform 0 float4 1.0 0.0 0.0 0.0
 uniform 4 float4 1.0 2.0 3.0 4.0
 uniform 8 float4 5.0 6.0 7.0 8.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0)
 
 
@@ -295,7 +295,7 @@ float4 main() : sv_target
 uniform 0 float4 1.0 0.0 1.0 0.0
 uniform 4 float4 1.0 2.0 3.0 4.0
 uniform 8 float4 5.0 6.0 7.0 8.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 5.0, 1.0, 5.0)