vkd3d-shader/msl: Implement VKD3DSIH_SAMPLE.

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

tests/hlsl/cbuffer.shader_test

@@ -569,7 +569,7 @@ float4 main() : sv_target
 uniform 0 float4 1.0 0.0 0.0 0.0
 uniform 4 float4 0.0 2.0 0.0 0.0
 uniform 8 float4 0.0 0.0 3.0 0.0
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 2.0, 0.0, 4.0)
 
 

tests/hlsl/combined-samplers.shader_test

@@ -62,7 +62,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (0, 0, 0, 1)
 
 
@@ -78,7 +78,7 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 0.5 0.0 0.0 0.0
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (0.5, 0.5, 0.5, 1.5)
 
 
@@ -94,7 +94,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 if(sm<4)  probe (0, 0) rgba(1, 1, 1, 11)
 if(sm>=4) probe (0, 0) rgba(10, 10, 10, 11)
 
@@ -109,7 +109,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 if(sm<4)  probe (0, 0) rgba(1, 1, 1, 11)
 if(sm>=4) probe (0, 0) rgba(10, 10, 10, 11)
 
@@ -124,7 +124,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (21, 21, 21, 11)
 
 
@@ -140,7 +140,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 if(sm<4)  probe (0, 0) rgba (102, 102, 102, 111)
 if(sm>=4) probe (0, 0) rgba (12, 12, 12, 111)
 
@@ -156,7 +156,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (104, 104, 104, 111)
 
 
@@ -180,7 +180,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (1, 1, 1, 11)
 
 
@@ -201,7 +201,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 if(sm<4)  probe (0, 0) rgba(453021, 453021, 453021, 111111)
 if(sm>=4) probe (0, 0) rgba(12333, 12333, 12333, 111111)
 
@@ -221,7 +221,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 if(sm<4)  probe (0, 0) rgba(4351, 4351, 4351, 1111)
 if(sm>=4) probe (0, 0) rgba(3125, 3125, 3125, 1111)
 

tests/hlsl/conditional.shader_test

@@ -243,10 +243,10 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float -2
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (0.0, 0.0, 0.0, 4.0)
 uniform 0 float 4
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0)
 
 
@@ -267,13 +267,13 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float 2
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (0.0, 0.0, 0.0, 4.0)
 uniform 0 float 1
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 0.0, 0.0, 4.0)
 uniform 0 float 0
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (1.0, 1.0, 0.0, 4.0)
 
 % Test 16-bit phi instructions.

tests/hlsl/object-references.shader_test

@@ -46,7 +46,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (77.77, 77.77, 77.77, 77.77)
 
 

tests/hlsl/register-reservations-numeric.shader_test

@@ -544,7 +544,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 if(sm<6) probe (0, 0) rgba(2.0, 2.0, 2.0, 2.0)
 if(sm>=6) probe (0, 0) rgba(0.5, 0.5, 0.5, 0.5)
 

tests/hlsl/sampler.shader_test

@@ -17,7 +17,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (0.25, 0, 0.25, 0)
 
 [pixel shader]
@@ -30,7 +30,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (0.25, 0, 0.25, 0)
 
 [pixel shader fail]
@@ -86,16 +86,16 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 50.0 50.0 42.0 100
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba(1.0, 1.0, 0, 1.0)
 uniform 0 float4 0.075 0.025 -42.0 0.1
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba(1.75, 0.25, 0, 1.0)
 uniform 0 float4 0.5 1.5 0.0 2.0
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba(0.25, 1.75, 0, 1.0)
 uniform 0 float4 1.0 1.0 0.0 0.0
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba(2.0, 2.0, 0, 1.0)
 
 [sampler 0]
@@ -160,7 +160,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 if(sm<4)  probe (0, 0) rgba(243, 243, 243, 111)
 if(sm>=4) probe (0, 0) rgba(234, 234, 234, 111)
 
@@ -182,7 +182,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba(655.0, 0, -655.0, 0) 4096
 
 [require]

tests/hlsl/static-initializer.shader_test

@@ -173,7 +173,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (1, 2, 3, 4)
 
 
@@ -189,7 +189,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (1, 2, 3, 4)
 
 

tests/hlsl/texture-ordering.shader_test

@@ -136,7 +136,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (450, 139, 876, 333)
 
 
@@ -189,7 +189,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (450, 138, 796, 333)
 
 
@@ -242,7 +242,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (478, 913, 256, 333)
 
 
@@ -275,7 +275,7 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (215, 215, 215, 111)
 
 
@@ -305,5 +305,5 @@ float4 main() : sv_target
 }
 
 [test]
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba (5, 4, 2, 0)

tests/shader_runner_metal.m

@@ -121,6 +121,26 @@ static MTLPrimitiveType get_metal_primitive_type(D3D_PRIMITIVE_TOPOLOGY topology
     }
 }
 
+static MTLSamplerAddressMode get_metal_address_mode(D3D12_TEXTURE_ADDRESS_MODE mode)
+{
+    switch (mode)
+    {
+        case D3D12_TEXTURE_ADDRESS_MODE_WRAP:
+            return MTLSamplerAddressModeRepeat;
+        case D3D12_TEXTURE_ADDRESS_MODE_MIRROR:
+            return MTLSamplerAddressModeMirrorRepeat;
+        case D3D12_TEXTURE_ADDRESS_MODE_CLAMP:
+            return MTLSamplerAddressModeClampToEdge;
+        case D3D12_TEXTURE_ADDRESS_MODE_BORDER:
+            return MTLSamplerAddressModeClampToBorderColor;
+        case D3D12_TEXTURE_ADDRESS_MODE_MIRROR_ONCE:
+            return MTLSamplerAddressModeMirrorClampToEdge;
+
+        default:
+            fatal_error("Unhandled address mode %#x.\n", mode);
+    }
+}
+
 static MTLCompareFunction get_metal_compare_function(D3D12_COMPARISON_FUNC func)
 {
     switch (func)
@@ -410,6 +430,20 @@ static bool compile_shader(struct metal_runner *runner, enum shader_type type, s
         }
     }
 
+    for (i = 0; i < runner->r.sampler_count; ++i)
+    {
+        binding = &bindings[interface_info.binding_count];
+        binding->type = VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER;
+        binding->register_space = 0;
+        binding->register_index = runner->r.samplers[i].slot;
+        binding->shader_visibility = VKD3D_SHADER_VISIBILITY_ALL;
+        binding->flags = 0;
+        binding->binding.set = 0;
+        binding->binding.binding = interface_info.binding_count;
+        binding->binding.count = 1;
+        ++interface_info.binding_count;
+    }
+
     interface_info.bindings = bindings;
     interface_info.next = &runner->signatures[type];
     runner->signatures[type].type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_SIGNATURE_INFO;
@@ -446,7 +480,7 @@ static id<MTLFunction> compile_stage(struct metal_runner *runner, enum shader_ty
 }
 
 static bool encode_argument_buffer(struct metal_runner *runner,
-        id<MTLRenderCommandEncoder> command_encoder)
+        id<MTLRenderCommandEncoder> command_encoder, id<MTLSamplerState> *samplers)
 {
     NSMutableArray<MTLArgumentDescriptor *> *argument_descriptors;
     id<MTLDevice> device = runner->device;
@@ -489,6 +523,15 @@ static bool encode_argument_buffer(struct metal_runner *runner,
         }
     }
 
+    for (i = 0; i < runner->r.sampler_count; ++i)
+    {
+        arg_desc = [MTLArgumentDescriptor argumentDescriptor];
+        arg_desc.dataType = MTLDataTypeSampler;
+        arg_desc.index = [argument_descriptors count];
+        arg_desc.access = MTLBindingAccessReadOnly;
+        [argument_descriptors addObject:arg_desc];
+    }
+
     if (![argument_descriptors count])
         return true;
 
@@ -536,6 +579,11 @@ static bool encode_argument_buffer(struct metal_runner *runner,
         }
     }
 
+    for (i = 0; i < runner->r.sampler_count; ++i)
+    {
+        [encoder setSamplerState:samplers[i] atIndex:index++];
+    }
+
     [argument_buffer didModifyRange:NSMakeRange(0, encoder.encodedLength)];
 
     [command_encoder setVertexBuffer:argument_buffer offset:0 atIndex:0];
@@ -597,6 +645,7 @@ static bool metal_runner_draw(struct shader_runner *r, D3D_PRIMITIVE_TOPOLOGY to
     unsigned int fb_width, fb_height, vb_idx, i, j;
     struct metal_runner *runner = metal_runner(r);
     MTLRenderPipelineDescriptor *pipeline_desc;
+    id<MTLSamplerState> samplers[MAX_SAMPLERS];
     MTLVertexBufferLayoutDescriptor *binding;
     id<MTLDepthStencilState> ds_state = nil;
     id<MTLDevice> device = runner->device;
@@ -605,9 +654,11 @@ static bool metal_runner_draw(struct shader_runner *r, D3D_PRIMITIVE_TOPOLOGY to
     id<MTLCommandBuffer> command_buffer;
     MTLDepthStencilDescriptor *ds_desc;
     MTLRenderPassDescriptor *pass_desc;
+    MTLSamplerDescriptor *sampler_desc;
     MTLVertexDescriptor *vertex_desc;
     struct metal_resource *resource;
     id<MTLRenderPipelineState> pso;
+    const struct sampler *sampler;
     bool ret = false;
     NSError *err;
 
@@ -635,6 +686,25 @@ static bool metal_runner_draw(struct shader_runner *r, D3D_PRIMITIVE_TOPOLOGY to
             goto done;
         }
 
+        sampler_desc = [[MTLSamplerDescriptor new] autorelease];
+        for (i = 0; i < runner->r.sampler_count; ++i)
+        {
+            sampler = &runner->r.samplers[i];
+            sampler_desc.sAddressMode = get_metal_address_mode(sampler->u_address);
+            sampler_desc.tAddressMode = get_metal_address_mode(sampler->v_address);
+            sampler_desc.rAddressMode = get_metal_address_mode(sampler->w_address);
+            sampler_desc.magFilter = (sampler->filter & 0x4)
+                    ? MTLSamplerMinMagFilterLinear : MTLSamplerMinMagFilterNearest;
+            sampler_desc.minFilter = (sampler->filter & 0x1)
+                    ? MTLSamplerMinMagFilterLinear : MTLSamplerMinMagFilterNearest;
+            sampler_desc.mipFilter = (sampler->filter & 0x10)
+                    ? MTLSamplerMipFilterLinear : MTLSamplerMipFilterNearest;
+            sampler_desc.compareFunction = sampler->func
+                    ? get_metal_compare_function(sampler->func) : MTLCompareFunctionNever;
+            sampler_desc.supportArgumentBuffers = true;
+            samplers[i] = [[device newSamplerStateWithDescriptor:sampler_desc] autorelease];
+        }
+
         fb_width = ~0u;
         fb_height = ~0u;
         /* [[buffer(0)]] is used for the descriptor argument buffer. */
@@ -705,7 +775,7 @@ static bool metal_runner_draw(struct shader_runner *r, D3D_PRIMITIVE_TOPOLOGY to
         command_buffer = [runner->queue commandBuffer];
         encoder = [command_buffer renderCommandEncoderWithDescriptor:pass_desc];
 
-        if (!encode_argument_buffer(runner, encoder))
+        if (!encode_argument_buffer(runner, encoder, samplers))
         {
             [encoder endEncoding];
             ret = false;