From ba87319c94337b3394057b4cfdde172a460a9286 Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Thu, 18 Feb 2021 11:04:23 -0800 Subject: [PATCH] microsoft/clc: Fix wrap modes for inline samplers for integer textures Fixes: ff05da7f ("microsoft: Add CLC frontend and kernel/compute support to DXIL converter") Reviewed-By: Bill Kristiansen Part-of: (cherry picked from commit d773257012a2fa3d67144263387cff670cccc97a) --- .pick_status.json | 2 +- src/microsoft/clc/clc_compiler.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 2e0f8b74bbe..1b06f7f4a2a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4207,7 +4207,7 @@ "description": "microsoft/clc: Fix wrap modes for inline samplers for integer textures", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "ff05da7f8dc4aa531704d48f718514e3b1fff45d" }, diff --git a/src/microsoft/clc/clc_compiler.c b/src/microsoft/clc/clc_compiler.c index 8e51e895bd6..78424678e58 100644 --- a/src/microsoft/clc/clc_compiler.c +++ b/src/microsoft/clc/clc_compiler.c @@ -1213,8 +1213,8 @@ clc_to_dxil(struct clc_context *ctx, nir_foreach_variable_with_modes(var, nir, nir_var_uniform) { if (glsl_type_is_sampler(var->type) && var->data.sampler.is_inline_sampler) { int_sampler_states[sampler_id].wrap[0] = - int_sampler_states[sampler_id].wrap[0] = - int_sampler_states[sampler_id].wrap[0] = + int_sampler_states[sampler_id].wrap[1] = + int_sampler_states[sampler_id].wrap[2] = wrap_from_cl_addressing(var->data.sampler.addressing_mode); int_sampler_states[sampler_id].is_nonnormalized_coords = !var->data.sampler.normalized_coordinates;