commit 9c1e6e19a4bcf5ea6f58240f4802470813146f74
author Craig Stout <cstout@google.com> Tue Jun 20 11:35:19 2017 -0700
committer Craig Stout <cstout@google.com> Tue Jun 20 11:35:21 2017 -0700
tree 4cc0d8e99dfebcbf6cd35957383f1e97634d98b1
parent 5bc3969f93a02d2fdb07f2d5312e513c3fe0a917

Remove ifdef guard on VK_GOOGLE_external_memory_magma

Needed to allow mesa to compile after upcoming vulkan header sync.

Change-Id: I20ce806c38c9752ef4e76c8cb47a9413ea9b1cc2

include/vulkan/vulkan.h

diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index 23a70ca..228a8b4 100644
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -5843,7 +5843,6 @@
 #endif
 #endif /* VK_USE_PLATFORM_MACOS_MVK */
 
-#ifdef VK_USE_PLATFORM_MAGMA_KHR
 #define VK_GOOGLE_external_memory_magma 1
 #define VK_GOOGLE_EXTERNAL_MEMORY_MAGMA_SPEC_VERSION 1
 #define VK_GOOGLE_EXTERNAL_MEMORY_MAGMA_EXTENSION_NAME "VK_GOOGLE_external_memory_magma"
@@ -5863,7 +5862,6 @@
     const VkAllocationCallbacks*                pAllocator,
     VkDeviceMemory*                             pMemory);
 #endif
-#endif /* VK_USE_PLATFORM_MAGMA_KHR */
 
 #ifdef __cplusplus
 }

scripts/vk.xml

diff --git a/scripts/vk.xml b/scripts/vk.xml
index 847ec2b..5b21d6f 100644
--- a/scripts/vk.xml
+++ b/scripts/vk.xml
@@ -5556,7 +5556,7 @@
                 <command name="vkGetMemoryWin32HandleNV"/>
             </require>
         </extension>
-        <extension name="VK_GOOGLE_external_memory_magma" number="258" type="device" protect="VK_USE_PLATFORM_MAGMA_KHR" supported="vulkan">
+        <extension name="VK_GOOGLE_external_memory_magma" number="258" type="device" supported="vulkan">
             <require>
                 <enum value="1"                                         name="VK_GOOGLE_EXTERNAL_MEMORY_MAGMA_SPEC_VERSION"/>
                 <enum value="&quot;VK_GOOGLE_external_memory_magma&quot;" name="VK_GOOGLE_EXTERNAL_MEMORY_MAGMA_EXTENSION_NAME"/>