layers:Update shared_mutex check

ANGLE build uses custom, older SDK that doesn't include shared_mutex to modifying the shared_mutex preprocessor checks to account for this config.
KhronosGroup · Aug 23, 2019 · e2a6c44 · e2a6c44
1 parent fd3bb24
commit e2a6c44
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/layers/generated/layer_chassis_dispatch.cpp b/layers/generated/layer_chassis_dispatch.cpp
@@ -31,7 +31,7 @@
 #include "vk_safe_struct.cpp"
 
 // shared_mutex support added in MSVC 2015 update 2
-#if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023918
+#if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023918 && NTDDI_VERSION > NTDDI_WIN10_RS2
     #include <shared_mutex>
     typedef std::shared_mutex dispatch_lock_t;
     typedef std::shared_lock<dispatch_lock_t> read_dispatch_lock_guard_t;

diff --git a/layers/object_lifetime_validation.h b/layers/object_lifetime_validation.h
@@ -21,7 +21,7 @@
  */
 
 // shared_mutex support added in MSVC 2015 update 2
-#if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023918
+#if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023918 && NTDDI_VERSION > NTDDI_WIN10_RS2
 #include <shared_mutex>
 typedef std::shared_mutex object_lifetime_mutex_t;
 typedef std::shared_lock<object_lifetime_mutex_t> read_object_lifetime_mutex_t;

diff --git a/layers/vk_layer_utils.h b/layers/vk_layer_utils.h
@@ -161,7 +161,7 @@ static inline int u_ffs(int val) {
 #endif
 
 // shared_mutex support added in MSVC 2015 update 2
-#if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023918
+#if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023918 && NTDDI_VERSION > NTDDI_WIN10_RS2
 #include <shared_mutex>
 #endif
 
@@ -291,7 +291,7 @@ class vl_concurrent_unordered_map {
    private:
     static const int BUCKETS = (1 << BUCKETSLOG2);
 // shared_mutex support added in MSVC 2015 update 2
-#if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023918
+#if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023918 && NTDDI_VERSION > NTDDI_WIN10_RS2
 #include <shared_mutex>
     typedef std::shared_mutex lock_t;
     typedef std::shared_lock<lock_t> read_lock_guard_t;

diff --git a/layers/vk_mem_alloc.h b/layers/vk_mem_alloc.h
@@ -3137,7 +3137,7 @@ the containers.
 
 #ifndef VMA_USE_STL_SHARED_MUTEX
     // Minimum Visual Studio 2015 Update 2
-    #if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023918
+    #if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023918 && NTDDI_VERSION > NTDDI_WIN10_RS2
         #define VMA_USE_STL_SHARED_MUTEX 1
     #endif
 #endif

diff --git a/scripts/layer_chassis_dispatch_generator.py b/scripts/layer_chassis_dispatch_generator.py
@@ -1122,7 +1122,7 @@ def endFile(self):
             write('#include "vk_safe_struct.cpp"', file=self.outFile)
             self.newline()
             write('// shared_mutex support added in MSVC 2015 update 2', file=self.outFile)
-            write('#if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023918', file=self.outFile)
+            write('#if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023918 && NTDDI_VERSION > NTDDI_WIN10_RS2', file=self.outFile)
             write('    #include <shared_mutex>', file=self.outFile)
             write('    typedef std::shared_mutex dispatch_lock_t;', file=self.outFile)
             write('    typedef std::shared_lock<dispatch_lock_t> read_dispatch_lock_guard_t;', file=self.outFile)