build: Fix Windows build issues

diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
index f660094..89ce34f 100644 (file)
--- a/layers/CMakeLists.txt
+++ b/layers/CMakeLists.txt
@@ -157,4 +157,4 @@ add_vk_layer(parameter_validation parameter_validation.cpp parameter_validation.
 # Core validation has additional dependencies
 target_include_directories(VkLayer_core_validation PRIVATE ${GLSLANG_SPIRV_INCLUDE_DIR})
 target_include_directories(VkLayer_core_validation PRIVATE ${SPIRV_TOOLS_INCLUDE_DIR})
-target_link_libraries(VkLayer_core_validation ${SPIRV_TOOLS_LIB})
+target_link_libraries(VkLayer_core_validation ${SPIRV_TOOLS_LIBRARIES})

diff --git a/layers/descriptor_sets.h b/layers/descriptor_sets.h
index ecc6601..6112088 100644 (file)
--- a/layers/descriptor_sets.h
+++ b/layers/descriptor_sets.h
@@ -91,7 +91,7 @@ class DescriptorSetLayout {
     uint32_t GetDynamicDescriptorCount() { return dynamic_descriptor_count_; };
     uint32_t GetBindingCount() { return binding_count_; };
     // Return true if given binding is present in this layout
-    bool HasBinding(const uint32_t binding) { return binding_to_index_map_.count(binding); };
+    bool HasBinding(const uint32_t binding) { return binding_to_index_map_.count(binding) > 0; };
     // Return true if this layout is compatible with passed in layout,
     //   else return false and update error_msg with description of incompatibility
     bool IsCompatible(DescriptorSetLayout *, string *error_msg);
@@ -195,7 +195,7 @@ VkDescriptorType DescriptorSetLayout::GetTypeFromIndex(const uint32_t index) {
 // For the given global index, return descriptorType
 //  Currently just counting up through bindings_, may improve this in future
 VkDescriptorType DescriptorSetLayout::GetTypeFromGlobalIndex(const uint32_t index) {
-    auto global_offset = 0;
+    uint32_t global_offset = 0;
     for (auto binding : bindings_) {
         global_offset += binding->descriptorCount;
         if (index < global_offset)