Module: vkd3d Branch: master Commit: 049d21ad7a6fa059678d48b3945c6a186016cb7e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=049d21ad7a6fa059678d48b3...
Author: Józef Kucia jkucia@codeweavers.com Date: Wed Oct 24 13:16:24 2018 +0200
vkd3d-shader: Fix typo in vkd3d_dxbc_compiler_have_combined_sampler().
Signed-off-by: Józef Kucia jkucia@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
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 0813f49..f6e5746 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; }