commit 9ab615059ee5b9f21b21823931ad58f7f3c436b6
author Chia-I Wu <olv@lunarg.com> Fri Nov 06 06:42:02 2015 +0800
committer Jon Ashburn <jon@lunarg.com> Fri Nov 06 15:08:05 2015 -0700
tree 443d4b0e38b01b2841c3a12a5942a5dfaa183c37
parent 2b1764b0901ed2fb279f5574133d860af175cd77

bug 15068: Use hardfp calling convention on Android for 32-bit ARM targets

Update python scripts.

s/(VKAPI \*/(VKAPI_PTR */g
s/void VKAPI\b/VKAPI_ATTR void VKAPI_CALL/g
s/VkResult VKAPI\b/VKAPI_ATTR VkResult VKAPI_CALL/g
s/PFN_vkVoidFunction VKAPI\b/VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL/g
s/void\* VKAPI\b/VKAPI_ATTR void* VKAPI_CALL/g

https://cvs.khronos.org/bugzilla/show_bug.cgi?id=15068

tests/image_tests.cpp

diff --git a/tests/image_tests.cpp b/tests/image_tests.cpp
index 62d6a23..29f6abe 100644
--- a/tests/image_tests.cpp
+++ b/tests/image_tests.cpp
@@ -210,7 +210,7 @@
     imageCreateInfo.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT |
                             VK_IMAGE_USAGE_SAMPLED_BIT;
 
-    //    VkResult VKAPI vkCreateImage(
+    //    VKAPI_ATTR VkResult VKAPI_CALL vkCreateImage(
     //        VkDevice                                  device,
     //        const VkImageCreateInfo*                pCreateInfo,
     //        VkImage*                                  pImage);
@@ -297,7 +297,7 @@
     viewInfo.subresourceRange.levelCount = 1;
     viewInfo.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
 
-    //    VkResult VKAPI vkCreateImageView(
+    //    VKAPI_ATTR VkResult VKAPI_CALL vkCreateImageView(
     //        VkDevice                                  device,
     //        const VkImageViewCreateInfo*           pCreateInfo,
     //        VkImageView*                             pView);

tests/init.cpp

diff --git a/tests/init.cpp b/tests/init.cpp
index 5a96441..06cecbe 100644
--- a/tests/init.cpp
+++ b/tests/init.cpp
@@ -239,7 +239,7 @@
     query_info.queryType = VK_QUERY_TYPE_OCCLUSION;
     query_info.entryCount = MAX_QUERY_SLOTS;
 
-    //        VkResult VKAPI vkCreateQueryPool(
+    //        VKAPI_ATTR VkResult VKAPI_CALL vkCreateQueryPool(
     //            VkDevice                                  device,
     //            const VkQueryPoolCreateInfo*           pCreateInfo,
     //            VkQueryPool*                             pQueryPool);
@@ -354,7 +354,7 @@
     imageCreateInfo.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT |
                             VK_IMAGE_USAGE_SAMPLED_BIT;
 
-//    VkResult VKAPI vkCreateImage(
+//    VKAPI_ATTR VkResult VKAPI_CALL vkCreateImage(
 //        VkDevice                                  device,
 //        const VkImageCreateInfo*                pCreateInfo,
 //        VkImage*                                  pImage);
@@ -362,7 +362,7 @@
     ASSERT_VK_SUCCESS(err);
 
     // Verify image resources
-//    void VKAPI vkGetImageSubresourceLayout(
+//    VKAPI_ATTR void VKAPI_CALL vkGetImageSubresourceLayout(
 //        VkImage                                   image,
 //        const VkImageSubresource*                pSubresource,
 //        VkSubresourceLayout*                     pLayout);
@@ -410,7 +410,7 @@
 
     if (mem_req.size) {
 
-        //        VkResult VKAPI vkAllocateMemory(
+        //        VKAPI_ATTR VkResult VKAPI_CALL vkAllocateMemory(
         //            VkDevice                                  device,
         //            const VkMemoryAllocateInfo*                pAllocateInfo,
         //            VkDeviceMemory*                             pMemory);
@@ -460,7 +460,7 @@
     viewInfo.subresourceRange.levelCount = 1;
     viewInfo.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
 
-//    VkResult VKAPI vkCreateImageView(
+//    VKAPI_ATTR VkResult VKAPI_CALL vkCreateImageView(
 //        VkDevice                                  device,
 //        const VkImageViewCreateInfo*           pCreateInfo,
 //        VkImageView*                             pView);

tests/render_tests.cpp

diff --git a/tests/render_tests.cpp b/tests/render_tests.cpp
index 5b79813..63e9d9b 100644
--- a/tests/render_tests.cpp
+++ b/tests/render_tests.cpp
@@ -86,7 +86,7 @@
 
 #include "vkrenderframework.h"
 #ifdef DEBUG_CALLBACK
-void VKAPI myDbgFunc(
+VKAPI_ATTR void VKAPI_CALL myDbgFunc(
     VK_DBG_MSG_TYPE     msgType,
     VkValidationLevel validationLevel,
     VkObject             srcObject,