Use the same binding base value for both combined samplers and textures

https://github.com/KhronosGroup/glslang/commit/5f6c7176c5483da9af6432afb3dd962e4f8873a1 introduced support for combined samplers in glslang.

Before that change, setShiftTextureBinding would set the binding base value for both textures and combined samplers.  With that change, shaderc needs to make a separate call for the combined sampler bindings in order to match the original behavior.

Change-Id: I443d43b34700e6970292b2ecd353392552988aa4

libshaderc_util/src/compiler.cc

diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc
index 570643f..06757cb 100644
--- a/libshaderc_util/src/compiler.cc
+++ b/libshaderc_util/src/compiler.cc
@@ -294,6 +294,8 @@
   shader.setShiftImageBinding(bases[static_cast<int>(UniformKind::Image)]);
   shader.setShiftSamplerBinding(bases[static_cast<int>(UniformKind::Sampler)]);
   shader.setShiftTextureBinding(bases[static_cast<int>(UniformKind::Texture)]);
+  shader.setShiftBinding(glslang::EResCombinedSampler,
+                         bases[static_cast<int>(UniformKind::Texture)]);
   shader.setShiftUboBinding(bases[static_cast<int>(UniformKind::Buffer)]);
   shader.setShiftSsboBinding(
       bases[static_cast<int>(UniformKind::StorageBuffer)]);