[PATCH vkd3d 1/6] vkd3d-shader: Fix typo in vkd3d_dxbc_compiler_have_combined_sampler().
From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0813f49516aa..f6e5746084e1 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2043,7 +2043,7 @@ static bool vkd3d_dxbc_compiler_have_combined_sampler(const struct vkd3d_dxbc_co { combined_sampler = &shader_interface->combined_samplers[i]; - if (!(resource || combined_sampler->resource_index == resource->idx[0].offset) + if ((!resource || combined_sampler->resource_index == resource->idx[0].offset) && (!sampler || combined_sampler->sampler_index == sampler->idx[0].offset)) return true; } -- 2.18.1
participants (2)
-
Henri Verbeet -
Józef Kucia