Out parameters to handles now use ref instead of * (#3)

* Out parameters to handles now use ref instead of *

* Bumped cosmicolor version

Author: miss-programgamer

modules/vulkan/dub.sdl

@@ -19,8 +19,6 @@ dependency "inmath" version="~>1.3"
 libs "vulkan-1" platform="windows"
 lflags "/libpath:$VULKAN_SDK\\Lib\\" platform="windows"
 
-preBuildCommands "dub run :vulkan-generator -- vk"
-
 # Posix Platforms don't need $VULKAN_SDL
 libs "vulkan" platform="posix"
 

modules/vulkan/generator/dub.sdl

@@ -9,7 +9,7 @@ workingDirectory ".."
 
 stringImportPaths "text"
 
-dependency "cosmicolor" version="~>0.1.4"
+dependency "cosmicolor" version="~>0.1.5"
 dependency "yxml" version="~>0.1.7"
 
 configuration "application" {

modules/vulkan/generator/source/emitter.d

@@ -356,15 +356,7 @@ class VkRegistryEmitter {
                     file.writeln();
                 }
 
-                if (command.params.empty) {
-                    file.writefln!"extern %s %s();"(command.type, command.name);
-                } else {
-                    file.openf!"extern %s %s("(command.type, command.name);
-                    foreach (param; command.params) {
-                        file.writefln!"%s %s,"(param.type, param.safename);
-                    }
-                    file.close(");");
-                }
+                emitCommand(command);
             }
 
             if (feature.minor > 0) {
@@ -739,6 +731,18 @@ class VkRegistryEmitter {
         }
     }
 
+    private void emitCommand(const ref VkCommand command) {
+        if (command.params.empty) {
+            file.writefln!"extern %s %s();"(command.type, command.name);
+        } else {
+            file.openf!"extern %s %s("(command.type, command.name);
+            foreach (param; command.params) {
+                file.writefln!"%s %s,"(param.type, param.safename);
+            }
+            file.close(");");
+        }
+    }
+
     private void emitDeprecation(bool deprecated_, string reason) {
         if (deprecated_) {
             file.writefln!"deprecated(\"%s\")"(reason);

modules/vulkan/generator/source/parser.d

@@ -397,11 +397,7 @@ class VkRegistryParser {
 
                     auto postfix = child.textContent[$ - postNameLength + member.name.length .. $ - commentLength];
                     auto whole = child.textContent[0 .. $ - postNameLength] ~ postfix;
-                    member.type = parseTypeString(type.textContent, whole, &member.width);
-
-                    // if (auto length = child.firstChildByTagName("enum")) {
-                    //     member.type = format!"%s[%s]"(member.type, length.textContent);
-                    // }
+                    member.type = parseTypeString(type.textContent, whole, width: &member.width);
                 }
             }
 
@@ -465,10 +461,6 @@ class VkRegistryParser {
                     auto postfix = child.textContent[$ - postNameLength + member.name.length .. $ - commentLength];
                     auto whole = child.textContent[0 .. $ - postNameLength] ~ postfix;
                     member.type = parseTypeString(type.textContent, whole);
-
-                    // if (auto length = child.firstChildByTagName("enum")) {
-                    //     member.type = format!"%s[%s]"(member.type, length.textContent);
-                    // }
                 }
             }
 
@@ -748,6 +740,12 @@ class VkRegistryParser {
 
             VkParam param;
 
+            if (auto length = child.getAttribute("len")) {
+                param.optional = true;
+            } else if (auto optional = child.getAttribute("optional")) {
+                param.optional = true;
+            }
+
             if (auto name = child.firstChildByTagName("name")) {
                 param.name = name.textContent.idup;
 
@@ -759,7 +757,7 @@ class VkRegistryParser {
                 if (auto type = child.firstChildByTagName("type")) {
                     auto postfix = child.textContent[$ - postNameLength + param.name.length .. $];
                     auto whole = child.textContent[0 .. $ - postNameLength] ~ postfix;
-                    param.type = parseTypeString(type.textContent, whole);
+                    param.type = parseTypeString(type.textContent, whole, refify: !param.optional);
                 }
             }
 
@@ -1066,11 +1064,13 @@ class VkRegistryParser {
      * 
      * Params:
      *   name = A type in string form as obtained from an XML document.
+     *   width = Out parameter for returning the bit width of bitfields.
+     *   refify = Whether to convert pointers to handles into refs.
      * 
      * Returns: the D equivalent of the given type.
      */
-    private static string parseTypeString(xmlstring name, uint* width = null) {
-        return parseTypeString(name, name, width);
+    private string parseTypeString(xmlstring name, uint* width = null, bool refify = false) {
+        return parseTypeString(name, name, width, refify);
     }
 
     /** 
@@ -1079,10 +1079,12 @@ class VkRegistryParser {
      * Params:
      *   name = A type in string form as obtained from an XML document.
      *   whole = The surrounding text of the given type name.
+     *   width = Out parameter for returning the bit width of bitfields.
+     *   refify = Whether to convert pointers to handles into refs.
      * 
      * Returns: the D equivalent of the given type.
      */
-    private static string parseTypeString(xmlstring name, xmlstring whole, uint* width = null) {
+    private string parseTypeString(xmlstring name, xmlstring whole, uint* width = null, bool refify = false) {
         import std.ascii;
 
         string result = typemap.get(name, name).idup;
@@ -1132,6 +1134,11 @@ class VkRegistryParser {
             }
         }
 
+        // Convert pointers to handles into refs instead.
+        if (refify && name in registry.handles && result.endsWith("*")) {
+            result = format!"ref %s"(result[0 .. $ - 1]);
+        }
+
         return result;
     }
 }

modules/vulkan/source/vulkan/arm/data_graph.d

@@ -286,7 +286,7 @@ alias PFN_vkCreateDataGraphPipelineSessionARM = VkResult function(
     VkDevice device,
     const(VkDataGraphPipelineSessionCreateInfoARM)* pCreateInfo,
     const(VkAllocationCallbacks)* pAllocator,
-    VkDataGraphPipelineSessionARM* pSession,
+    ref VkDataGraphPipelineSessionARM pSession,
 );
 
 alias PFN_vkGetDataGraphPipelineSessionBindPointRequirementsARM = VkResult function(

modules/vulkan/source/vulkan/arm/tensors.d

@@ -275,7 +275,7 @@ alias PFN_vkCreateTensorARM = VkResult function(
     VkDevice device,
     const(VkTensorCreateInfoARM)* pCreateInfo,
     const(VkAllocationCallbacks)* pAllocator,
-    VkTensorARM* pTensor,
+    ref VkTensorARM pTensor,
 );
 
 alias PFN_vkDestroyTensorARM = void function(
@@ -288,7 +288,7 @@ alias PFN_vkCreateTensorViewARM = VkResult function(
     VkDevice device,
     const(VkTensorViewCreateInfoARM)* pCreateInfo,
     const(VkAllocationCallbacks)* pAllocator,
-    VkTensorViewARM* pView,
+    ref VkTensorViewARM pView,
 );
 
 alias PFN_vkDestroyTensorViewARM = void function(