4 files changed, 45 insertions, 14 deletions
diff --git a/graphics/vulkan-loader/files/patch-loader_allocation.h b/graphics/vulkan-loader/files/patch-loader_allocation.h
new file mode 100644
index 000000000000..b756ec0b7540
--- /dev/null
+++ b/graphics/vulkan-loader/files/patch-loader_allocation.h
@@ -0,0 +1,11 @@
+--- loader/allocation.h.orig	2021-09-15 16:41:50 UTC
++++ loader/allocation.h
+@@ -39,7 +39,7 @@ void loader_device_heap_free(const struct loader_devic
+ void *loader_device_heap_realloc(const struct loader_device *device, void *pMemory, size_t orig_size, size_t size,
+                                  VkSystemAllocationScope alloc_scope);
+ 
+-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__)
++#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__)
+ #define loader_stack_alloc(size) alloca(size)
+ #elif defined(_WIN32)
+ #define loader_stack_alloc(size) _alloca(size)
diff --git a/graphics/vulkan-loader/files/patch-loader_loader.c b/graphics/vulkan-loader/files/patch-loader_get__environment.c
index efbe9d26058e..553951da1f88 100644
--- a/graphics/vulkan-loader/files/patch-loader_loader.c
+++ b/graphics/vulkan-loader/files/patch-loader_get__environment.c
@@ -1,18 +1,18 @@
---- loader/loader.c.orig	2021-04-29 17:49:58 UTC
-+++ loader/loader.c
-@@ -253,7 +253,7 @@ void *loader_device_heap_realloc(const struct loader_d
- }
+--- loader/get_environment.c.orig	2021-09-15 16:41:50 UTC
++++ loader/get_environment.c
+@@ -31,7 +31,7 @@
+ #include "log.h"
  
  // Environment variables
 -#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__)
 +#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__)
  
- static inline bool IsHighIntegrity() {
-     return geteuid() != getuid() || getegid() != getgid();
-@@ -267,7 +267,7 @@ static inline char *loader_getenv(const char *name, co
+ bool is_high_integrity() { return geteuid() != getuid() || getegid() != getgid(); }
+ 
+@@ -43,7 +43,7 @@ char *loader_getenv(const char *name, const struct loa
  }
  
- static inline char *loader_secure_getenv(const char *name, const struct loader_instance *inst) {
+ char *loader_secure_getenv(const char *name, const struct loader_instance *inst) {
 -#if defined(__APPLE__)
 +#if !defined(__linux__)
      // Apple does not appear to have a secure getenv implementation.
diff --git a/graphics/vulkan-loader/files/patch-loader_get__environment.h b/graphics/vulkan-loader/files/patch-loader_get__environment.h
new file mode 100644
index 000000000000..5b192b3e69e4
--- /dev/null
+++ b/graphics/vulkan-loader/files/patch-loader_get__environment.h
@@ -0,0 +1,11 @@
+--- loader/get_environment.h.orig	2021-09-15 16:41:50 UTC
++++ loader/get_environment.h
+@@ -35,7 +35,7 @@
+ char *loader_getenv(const char *name, const struct loader_instance *inst);
+ void loader_free_getenv(char *val, const struct loader_instance *inst);
+ 
+-#if defined(WIN32) || defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__)
++#if defined(WIN32) || defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__)
+ 
+ bool is_high_integrity();
+ 
diff --git a/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h b/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h
index 888712684920..9be2f5fdc6f3 100644
--- a/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h
+++ b/graphics/vulkan-loader/files/patch-loader_vk__loader__platform.h
@@ -1,15 +1,24 @@
---- loader/vk_loader_platform.h.orig	2021-04-20 16:45:05 UTC
+--- loader/vk_loader_platform.h.orig	2021-09-15 16:41:50 UTC
 +++ loader/vk_loader_platform.h
-@@ -35,7 +35,7 @@
- #include "vulkan/vk_platform.h"
- #include "vulkan/vk_sdk_platform.h"
+@@ -37,7 +37,7 @@
+ #include "dlopen_fuchsia.h"
+ #endif  // defined(__Fuchsia__)
+ 
+-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__)
++#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__)
+ #include <unistd.h>
+ // Note: The following file is for dynamic loading:
+ #include <dlfcn.h>
+@@ -97,7 +97,7 @@
+ // Override layer information
+ #define VK_OVERRIDE_LAYER_NAME "VK_LAYER_LUNARG_override"
  
 -#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__)
 +#if defined(__unix__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__)
  /* Linux-specific common code: */
  
- // Headers:
-@@ -120,6 +120,26 @@ static inline char *loader_platform_executable_path(ch
+ // VK Library Filenames, Paths, etc.:
+@@ -168,6 +168,26 @@ static inline char *loader_platform_executable_path(ch
      int ret = proc_pidpath(pid, buffer, size);
      if (ret <= 0) return NULL;
      buffer[ret] = '\0';