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

vulkan.py

diff --git a/vulkan.py b/vulkan.py
index f6350db..918351a 100755
--- a/vulkan.py
+++ b/vulkan.py
@@ -93,15 +93,19 @@
 
     def c_decl(self, name, attr="", typed=False, need_param_names=True):
         """Return a named declaration in C."""
-        format_vals = (self.ret,
-                attr + " " if attr else "",
+        if typed:
+            return "%s (%s*%s)(%s)" % (
+                self.ret,
+                attr + "_PTR " if attr else "",
                 name,
                 self.c_params(need_name=need_param_names))
-
-        if typed:
-            return "%s (%s*%s)(%s)" % format_vals
         else:
-            return "%s %s%s(%s)" % format_vals
+            return "%s%s %s%s(%s)" % (
+                attr + "_ATTR " if attr else "",
+                self.ret,
+                attr + "_CALL " if attr else "",
+                name,
+                self.c_params(need_name=need_param_names))
 
     def c_pretty_decl(self, name, attr=""):
         """Return a named declaration in C, with vulkan.h formatting."""
@@ -118,8 +122,10 @@
             plist.append("    %s%s%s%s" % (param.ty[:idx],
                 " " * pad, param.name, param.ty[idx:]))
 
-        return "%s %s%s(\n%s)" % (self.ret,
-                attr + " " if attr else "",
+        return "%s%s %s%s(\n%s)" % (
+                attr + "_ATTR " if attr else "",
+                self.ret,
+                attr + "_CALL " if attr else "",
                 name,
                 ",\n".join(plist))
 
@@ -1181,7 +1187,7 @@
     # parse proto_lines to protos
     protos = []
     for line in proto_lines:
-        first, rest = line.split(" (VKAPI *PFN_vk")
+        first, rest = line.split(" (VKAPI_PTR *PFN_vk")
         second, third = rest.split(")(")
 
         # get the return type, no space before "*"