cpp2ffi: take care of CIMGUI_VARGS0

README.md

@@ -11,12 +11,16 @@ History:
 Initially cimgui was developed by Stephan Dilly as hand-written code but lately turned into an auto-generated version by sonoro1234 in order to keep up with imgui more easily (letting the user select the desired branch and commit)
 
 Notes:
-* currently this wrapper is based on version [1.92.1 of Dear ImGui with internal api]
+* currently this wrapper is based on version [1.92.4 of Dear ImGui with internal api]
 * only functions, structs and enums from imgui.h (an optionally imgui_internal.h) are wrapped.
 * if you are interested in imgui backends you should look [LuaJIT-ImGui](https://github.com/sonoro1234/LuaJIT-ImGui) project.
 * All naming is algorithmic except for those names that were coded in cimgui_overloads table (https://github.com/cimgui/cimgui/blob/master/generator/generator.lua#L60). In the official version this table is empty.
 * Current overloaded function names can be found in (https://github.com/cimgui/cimgui/blob/master/generator/output/overloads.txt)
 
+#changes
+
+* 10/11/2025: Functions returning and taking as argument no POD structs is now doing a conversion internally to allow ARM64 compilation.
+
 # compilation
 
 * clone 
@@ -60,7 +64,8 @@ Notes:
   * retref : is set if original return type is a reference. (will be a pointer in cimgui)
   * argsT : an array of collections (each one with type: argument type and name: the argument name, when the argument is a function pointer also ret: return type and signature: the function signature)
   * args : a string of argsT concatenated and separated by commas
-  * call_args : a string with the argument names separated by commas for calling imgui function
+  * call_args_old : a string with the argument names separated by commas for calling imgui function
+  * call_args : call_args_old with conversion added.
   * defaults : a collection in which key is argument name and value is the default value.
   * manual : will be true if this function is hand-written (not generated)
   * skipped : will be true if this function is not generated (and not hand-written)
@@ -70,7 +75,7 @@ Notes:
   * realdestructor : is set if the function is a destructor for a class
   * templated : is set if the function belongs to a templated class (ImVector)
   * templatedgen: is set if the function belongs to a struct generated from template (ImVector_ImWchar)
-  * nonUDT : if present the original function was returning a user defined type so that signature has been changed to accept a pointer to the UDT as first argument.
+  * nonUDT : if present the original function was returning a user defined type.
   * location : name of the header file and linenumber this function comes from. (imgui:000, internal:123, imgui_impl_xxx:123)
   * is_static_function : is setted when it is an struct static function.
 ### structs_and_enums description
@@ -91,7 +96,6 @@ Notes:
 * use whatever method is in ImGui c++ namespace in the original [imgui.h](https://github.com/ocornut/imgui/blob/master/imgui.h) by prepending `ig`
 * methods have the same parameter list and return values (where possible)
 * functions that belong to a struct have an extra first argument with a pointer to the struct.
-* where a function returns UDT (user defined type) by value some compilers complain so the function is generated accepting a pointer to the UDT type as the first argument (or second if belongs to a struct).
 * constructors return pointer to struct and has been named Struct_name_Struct_name
 # usage with backends
 

backend_test/example_sdl3_vulkan/main.c

@@ -264,7 +264,7 @@ static void SetupVulkanWindow(ImGui_ImplVulkanH_Window* wd, VkSurfaceKHR surface
 
     // Create SwapChain, RenderPass, Framebuffer, etc.
     IM_ASSERT(g_MinImageCount >= 2);
-    ImGui_ImplVulkanH_CreateOrResizeWindow(g_Instance, g_PhysicalDevice, g_Device, wd, g_QueueFamily, g_Allocator, width, height, g_MinImageCount);
+    ImGui_ImplVulkanH_CreateOrResizeWindow(g_Instance, g_PhysicalDevice, g_Device, wd, g_QueueFamily, g_Allocator, width, height, g_MinImageCount, 0);
 }
 
 static void CleanupVulkan()
@@ -394,18 +394,18 @@ int main(int argc, char* argv[])
     // Create window with Vulkan graphics context
     float main_scale = SDL_GetDisplayContentScale(SDL_GetPrimaryDisplay());
     SDL_WindowFlags window_flags = SDL_WINDOW_VULKAN | SDL_WINDOW_RESIZABLE | SDL_WINDOW_HIDDEN | SDL_WINDOW_HIGH_PIXEL_DENSITY;
-    SDL_Window* window = SDL_CreateWindow("Dear ImGui SDL3+Vulkan example", (int)(1280 * main_scale), (int)(720 * main_scale), window_flags);
+    SDL_Window* window = SDL_CreateWindow("Dear ImGui SDL3+Vulkan example", (int)(1280 * main_scale), (int)(800 * main_scale), window_flags);
     if (window == NULL)
     {
         printf("Error: SDL_CreateWindow(): %s\n", SDL_GetError());
-        return -1;
+        return 1;
     }
   // Setup Vulkan
   uint32_t extensions_count = 0;
   const char *const *extensions_nude = SDL_Vulkan_GetInstanceExtensions(&extensions_count);
   if (extensions_nude == NULL) {
     printf("Error: SDL_Vulkan_GetInstanceExtensions(): %s\n", SDL_GetError());
-    return -1;
+    return 1;
   }
   const char** extensions = (const char**)malloc(extensions_count * sizeof(const char*));
   if (extensions == NULL) {
@@ -472,12 +472,12 @@ int main(int argc, char* argv[])
     init_info.Queue = g_Queue;
     init_info.PipelineCache = g_PipelineCache;
     init_info.DescriptorPool = g_DescriptorPool;
-    init_info.RenderPass = wd->RenderPass;
-    init_info.Subpass = 0;
     init_info.MinImageCount = g_MinImageCount;
     init_info.ImageCount = wd->ImageCount;
-    init_info.MSAASamples = VK_SAMPLE_COUNT_1_BIT;
     init_info.Allocator = g_Allocator;
+    init_info.PipelineInfoMain.RenderPass = wd->RenderPass;
+    init_info.PipelineInfoMain.Subpass = 0;
+    init_info.PipelineInfoMain.MSAASamples = VK_SAMPLE_COUNT_1_BIT;
     init_info.CheckVkResultFn = check_vk_result;
     ImGui_ImplVulkan_Init(&init_info);
 
@@ -536,7 +536,7 @@ int main(int argc, char* argv[])
         if (fb_width > 0 && fb_height > 0 && (g_SwapChainRebuild || g_MainWindowData.Width != fb_width || g_MainWindowData.Height != fb_height))
         {
             ImGui_ImplVulkan_SetMinImageCount(g_MinImageCount);
-            ImGui_ImplVulkanH_CreateOrResizeWindow(g_Instance, g_PhysicalDevice, g_Device, &g_MainWindowData, g_QueueFamily, g_Allocator, fb_width, fb_height, g_MinImageCount);
+            ImGui_ImplVulkanH_CreateOrResizeWindow(g_Instance, g_PhysicalDevice, g_Device, &g_MainWindowData, g_QueueFamily, g_Allocator, fb_width, fb_height, g_MinImageCount, 0);
             g_MainWindowData.FrameIndex = 0;
             g_SwapChainRebuild = false;
         }

backend_test/example_sdl_vulkan/main.c

@@ -268,7 +268,7 @@ static void SetupVulkanWindow(ImGui_ImplVulkanH_Window* wd, VkSurfaceKHR surface
 
     // Create SwapChain, RenderPass, Framebuffer, etc.
     IM_ASSERT(g_MinImageCount >= 2);
-    ImGui_ImplVulkanH_CreateOrResizeWindow(g_Instance, g_PhysicalDevice, g_Device, wd, g_QueueFamily, g_Allocator, width, height, g_MinImageCount);
+    ImGui_ImplVulkanH_CreateOrResizeWindow(g_Instance, g_PhysicalDevice, g_Device, wd, g_QueueFamily, g_Allocator, width, height, g_MinImageCount, 0);
 }
 
 static void CleanupVulkan()
@@ -390,7 +390,7 @@ int main(int argc, char* argv[])
     if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_GAMECONTROLLER) != 0)
     {
         printf("Error: %s\n", SDL_GetError());
-        return -1;
+        return 1;
     }
 
     // From 2.0.18: Enable native IME.
@@ -405,7 +405,7 @@ int main(int argc, char* argv[])
     if (window == NULL)
     {
         printf("Error: SDL_CreateWindow(): %s\n", SDL_GetError());
-        return -1;
+        return 1;
     }
   // Setup Vulkan
   uint32_t extensions_count = 0;
@@ -467,12 +467,12 @@ int main(int argc, char* argv[])
     init_info.Queue = g_Queue;
     init_info.PipelineCache = g_PipelineCache;
     init_info.DescriptorPool = g_DescriptorPool;
-    init_info.RenderPass = wd->RenderPass;
-    init_info.Subpass = 0;
     init_info.MinImageCount = g_MinImageCount;
     init_info.ImageCount = wd->ImageCount;
-    init_info.MSAASamples = VK_SAMPLE_COUNT_1_BIT;
     init_info.Allocator = g_Allocator;
+    init_info.PipelineInfoMain.RenderPass = wd->RenderPass;
+    init_info.PipelineInfoMain.Subpass = 0;
+    init_info.PipelineInfoMain.MSAASamples = VK_SAMPLE_COUNT_1_BIT;
     init_info.CheckVkResultFn = check_vk_result;
     ImGui_ImplVulkan_Init(&init_info);
 
@@ -531,7 +531,7 @@ int main(int argc, char* argv[])
         if (fb_width > 0 && fb_height > 0 && (g_SwapChainRebuild || g_MainWindowData.Width != fb_width || g_MainWindowData.Height != fb_height))
         {
             ImGui_ImplVulkan_SetMinImageCount(g_MinImageCount);
-            ImGui_ImplVulkanH_CreateOrResizeWindow(g_Instance, g_PhysicalDevice, g_Device, &g_MainWindowData, g_QueueFamily, g_Allocator, fb_width, fb_height, g_MinImageCount);
+            ImGui_ImplVulkanH_CreateOrResizeWindow(g_Instance, g_PhysicalDevice, g_Device, &g_MainWindowData, g_QueueFamily, g_Allocator, fb_width, fb_height, g_MinImageCount, 0);
             g_MainWindowData.FrameIndex = 0;
             g_SwapChainRebuild = false;
         }

cimgui_impl.h

@@ -8,44 +8,44 @@ typedef struct GLFWmonitor GLFWmonitor;
 struct GLFWwindow;
 struct GLFWmonitor;
 #endif //CIMGUI_DEFINE_ENUMS_AND_STRUCTS
-CIMGUI_API bool ImGui_ImplGlfw_InitForOpenGL(GLFWwindow* window,bool install_callbacks);
-CIMGUI_API bool ImGui_ImplGlfw_InitForVulkan(GLFWwindow* window,bool install_callbacks);
-CIMGUI_API bool ImGui_ImplGlfw_InitForOther(GLFWwindow* window,bool install_callbacks);
-CIMGUI_API void ImGui_ImplGlfw_Shutdown(void);
-CIMGUI_API void ImGui_ImplGlfw_NewFrame(void);
-CIMGUI_API void ImGui_ImplGlfw_InstallCallbacks(GLFWwindow* window);
-CIMGUI_API void ImGui_ImplGlfw_RestoreCallbacks(GLFWwindow* window);
-CIMGUI_API void ImGui_ImplGlfw_SetCallbacksChainForAllWindows(bool chain_for_all_windows);
-CIMGUI_API void ImGui_ImplGlfw_WindowFocusCallback(GLFWwindow* window,int focused);
+CIMGUI_API void ImGui_ImplGlfw_CharCallback(GLFWwindow* window,unsigned int c);
 CIMGUI_API void ImGui_ImplGlfw_CursorEnterCallback(GLFWwindow* window,int entered);
 CIMGUI_API void ImGui_ImplGlfw_CursorPosCallback(GLFWwindow* window,double x,double y);
-CIMGUI_API void ImGui_ImplGlfw_MouseButtonCallback(GLFWwindow* window,int button,int action,int mods);
-CIMGUI_API void ImGui_ImplGlfw_ScrollCallback(GLFWwindow* window,double xoffset,double yoffset);
-CIMGUI_API void ImGui_ImplGlfw_KeyCallback(GLFWwindow* window,int key,int scancode,int action,int mods);
-CIMGUI_API void ImGui_ImplGlfw_CharCallback(GLFWwindow* window,unsigned int c);
-CIMGUI_API void ImGui_ImplGlfw_MonitorCallback(GLFWmonitor* monitor,int event);
-CIMGUI_API void ImGui_ImplGlfw_Sleep(int milliseconds);
-CIMGUI_API float ImGui_ImplGlfw_GetContentScaleForWindow(GLFWwindow* window);
 CIMGUI_API float ImGui_ImplGlfw_GetContentScaleForMonitor(GLFWmonitor* monitor);
+CIMGUI_API float ImGui_ImplGlfw_GetContentScaleForWindow(GLFWwindow* window);
+CIMGUI_API bool ImGui_ImplGlfw_InitForOpenGL(GLFWwindow* window,bool install_callbacks);
+CIMGUI_API bool ImGui_ImplGlfw_InitForOther(GLFWwindow* window,bool install_callbacks);
+CIMGUI_API bool ImGui_ImplGlfw_InitForVulkan(GLFWwindow* window,bool install_callbacks);
+CIMGUI_API void ImGui_ImplGlfw_InstallCallbacks(GLFWwindow* window);
+CIMGUI_API void ImGui_ImplGlfw_KeyCallback(GLFWwindow* window,int key,int scancode,int action,int mods);
+CIMGUI_API void ImGui_ImplGlfw_MonitorCallback(GLFWmonitor* monitor,int event);
+CIMGUI_API void ImGui_ImplGlfw_MouseButtonCallback(GLFWwindow* window,int button,int action,int mods);
+CIMGUI_API void ImGui_ImplGlfw_NewFrame(void);
+CIMGUI_API void ImGui_ImplGlfw_RestoreCallbacks(GLFWwindow* window);
+CIMGUI_API void ImGui_ImplGlfw_ScrollCallback(GLFWwindow* window,double xoffset,double yoffset);
+CIMGUI_API void ImGui_ImplGlfw_SetCallbacksChainForAllWindows(bool chain_for_all_windows);
+CIMGUI_API void ImGui_ImplGlfw_Shutdown(void);
+CIMGUI_API void ImGui_ImplGlfw_Sleep(int milliseconds);
+CIMGUI_API void ImGui_ImplGlfw_WindowFocusCallback(GLFWwindow* window,int focused);
 
 #endif
 #ifdef CIMGUI_USE_OPENGL3
-CIMGUI_API bool ImGui_ImplOpenGL3_Init(const char* glsl_version);
-CIMGUI_API void ImGui_ImplOpenGL3_Shutdown(void);
-CIMGUI_API void ImGui_ImplOpenGL3_NewFrame(void);
-CIMGUI_API void ImGui_ImplOpenGL3_RenderDrawData(ImDrawData* draw_data);
 CIMGUI_API bool ImGui_ImplOpenGL3_CreateDeviceObjects(void);
 CIMGUI_API void ImGui_ImplOpenGL3_DestroyDeviceObjects(void);
+CIMGUI_API bool ImGui_ImplOpenGL3_Init(const char* glsl_version);
+CIMGUI_API void ImGui_ImplOpenGL3_NewFrame(void);
+CIMGUI_API void ImGui_ImplOpenGL3_RenderDrawData(ImDrawData* draw_data);
+CIMGUI_API void ImGui_ImplOpenGL3_Shutdown(void);
 CIMGUI_API void ImGui_ImplOpenGL3_UpdateTexture(ImTextureData* tex);
 
 #endif
 #ifdef CIMGUI_USE_OPENGL2
-CIMGUI_API bool ImGui_ImplOpenGL2_Init(void);
-CIMGUI_API void ImGui_ImplOpenGL2_Shutdown(void);
-CIMGUI_API void ImGui_ImplOpenGL2_NewFrame(void);
-CIMGUI_API void ImGui_ImplOpenGL2_RenderDrawData(ImDrawData* draw_data);
 CIMGUI_API bool ImGui_ImplOpenGL2_CreateDeviceObjects(void);
 CIMGUI_API void ImGui_ImplOpenGL2_DestroyDeviceObjects(void);
+CIMGUI_API bool ImGui_ImplOpenGL2_Init(void);
+CIMGUI_API void ImGui_ImplOpenGL2_NewFrame(void);
+CIMGUI_API void ImGui_ImplOpenGL2_RenderDrawData(ImDrawData* draw_data);
+CIMGUI_API void ImGui_ImplOpenGL2_Shutdown(void);
 CIMGUI_API void ImGui_ImplOpenGL2_UpdateTexture(ImTextureData* tex);
 
 #endif
@@ -61,18 +61,18 @@ struct _SDL_GameController;
 typedef union SDL_Event SDL_Event;
 typedef enum { ImGui_ImplSDL2_GamepadMode_AutoFirst, ImGui_ImplSDL2_GamepadMode_AutoAll, ImGui_ImplSDL2_GamepadMode_Manual }ImGui_ImplSDL2_GamepadMode;
 #endif //CIMGUI_DEFINE_ENUMS_AND_STRUCTS
-CIMGUI_API bool ImGui_ImplSDL2_InitForOpenGL(SDL_Window* window,void* sdl_gl_context);
-CIMGUI_API bool ImGui_ImplSDL2_InitForVulkan(SDL_Window* window);
+CIMGUI_API float ImGui_ImplSDL2_GetContentScaleForDisplay(int display_index);
+CIMGUI_API float ImGui_ImplSDL2_GetContentScaleForWindow(SDL_Window* window);
 CIMGUI_API bool ImGui_ImplSDL2_InitForD3D(SDL_Window* window);
 CIMGUI_API bool ImGui_ImplSDL2_InitForMetal(SDL_Window* window);
-CIMGUI_API bool ImGui_ImplSDL2_InitForSDLRenderer(SDL_Window* window,SDL_Renderer* renderer);
+CIMGUI_API bool ImGui_ImplSDL2_InitForOpenGL(SDL_Window* window,void* sdl_gl_context);
 CIMGUI_API bool ImGui_ImplSDL2_InitForOther(SDL_Window* window);
-CIMGUI_API void ImGui_ImplSDL2_Shutdown(void);
+CIMGUI_API bool ImGui_ImplSDL2_InitForSDLRenderer(SDL_Window* window,SDL_Renderer* renderer);
+CIMGUI_API bool ImGui_ImplSDL2_InitForVulkan(SDL_Window* window);
 CIMGUI_API void ImGui_ImplSDL2_NewFrame(void);
 CIMGUI_API bool ImGui_ImplSDL2_ProcessEvent(const SDL_Event* event);
-CIMGUI_API float ImGui_ImplSDL2_GetContentScaleForWindow(SDL_Window* window);
-CIMGUI_API float ImGui_ImplSDL2_GetContentScaleForDisplay(int display_index);
 CIMGUI_API void ImGui_ImplSDL2_SetGamepadMode(ImGui_ImplSDL2_GamepadMode mode,struct _SDL_GameController** manual_gamepads_array,int manual_gamepads_count);
+CIMGUI_API void ImGui_ImplSDL2_Shutdown(void);
 
 #endif
 #ifdef CIMGUI_USE_SDL3
@@ -87,17 +87,17 @@ struct SDL_Gamepad;
 typedef union SDL_Event SDL_Event;
 typedef enum { ImGui_ImplSDL3_GamepadMode_AutoFirst, ImGui_ImplSDL3_GamepadMode_AutoAll, ImGui_ImplSDL3_GamepadMode_Manual }ImGui_ImplSDL3_GamepadMode;
 #endif //CIMGUI_DEFINE_ENUMS_AND_STRUCTS
-CIMGUI_API bool ImGui_ImplSDL3_InitForOpenGL(SDL_Window* window,void* sdl_gl_context);
-CIMGUI_API bool ImGui_ImplSDL3_InitForVulkan(SDL_Window* window);
 CIMGUI_API bool ImGui_ImplSDL3_InitForD3D(SDL_Window* window);
 CIMGUI_API bool ImGui_ImplSDL3_InitForMetal(SDL_Window* window);
-CIMGUI_API bool ImGui_ImplSDL3_InitForSDLRenderer(SDL_Window* window,SDL_Renderer* renderer);
-CIMGUI_API bool ImGui_ImplSDL3_InitForSDLGPU(SDL_Window* window);
+CIMGUI_API bool ImGui_ImplSDL3_InitForOpenGL(SDL_Window* window,void* sdl_gl_context);
 CIMGUI_API bool ImGui_ImplSDL3_InitForOther(SDL_Window* window);
-CIMGUI_API void ImGui_ImplSDL3_Shutdown(void);
+CIMGUI_API bool ImGui_ImplSDL3_InitForSDLGPU(SDL_Window* window);
+CIMGUI_API bool ImGui_ImplSDL3_InitForSDLRenderer(SDL_Window* window,SDL_Renderer* renderer);
+CIMGUI_API bool ImGui_ImplSDL3_InitForVulkan(SDL_Window* window);
 CIMGUI_API void ImGui_ImplSDL3_NewFrame(void);
 CIMGUI_API bool ImGui_ImplSDL3_ProcessEvent(const SDL_Event* event);
 CIMGUI_API void ImGui_ImplSDL3_SetGamepadMode(ImGui_ImplSDL3_GamepadMode mode,SDL_Gamepad** manual_gamepads_array,int manual_gamepads_count);
+CIMGUI_API void ImGui_ImplSDL3_Shutdown(void);
 
 #endif
 #ifdef CIMGUI_USE_VULKAN
@@ -105,6 +105,15 @@ CIMGUI_API void ImGui_ImplSDL3_SetGamepadMode(ImGui_ImplSDL3_GamepadMode mode,SD
 
 typedef struct ImGui_ImplVulkanH_Frame ImGui_ImplVulkanH_Frame;
 typedef struct ImGui_ImplVulkanH_Window ImGui_ImplVulkanH_Window;
+typedef struct ImGui_ImplVulkan_PipelineInfo ImGui_ImplVulkan_PipelineInfo;
+struct ImGui_ImplVulkan_PipelineInfo
+{
+    VkRenderPass RenderPass;
+    uint32_t Subpass;
+    VkSampleCountFlagBits MSAASamples;
+    VkPipelineRenderingCreateInfoKHR PipelineRenderingCreateInfo;
+    VkImageUsageFlags SwapChainImageUsage;
+};
 typedef struct ImGui_ImplVulkan_InitInfo ImGui_ImplVulkan_InitInfo;
 struct ImGui_ImplVulkan_InitInfo
 {
@@ -115,18 +124,18 @@ struct ImGui_ImplVulkan_InitInfo
     uint32_t QueueFamily;
     VkQueue Queue;
     VkDescriptorPool DescriptorPool;
-    VkRenderPass RenderPass;
+    uint32_t DescriptorPoolSize;
     uint32_t MinImageCount;
     uint32_t ImageCount;
-    VkSampleCountFlagBits MSAASamples;
     VkPipelineCache PipelineCache;
-    uint32_t Subpass;
-    uint32_t DescriptorPoolSize;
+    ImGui_ImplVulkan_PipelineInfo PipelineInfoMain;
+    ImGui_ImplVulkan_PipelineInfo PipelineInfoForViewports;
     bool UseDynamicRendering;
-    VkPipelineRenderingCreateInfoKHR PipelineRenderingCreateInfo;
     const VkAllocationCallbacks* Allocator;
     void (*CheckVkResultFn)(VkResult err);
     VkDeviceSize MinAllocationSize;
+    VkShaderModuleCreateInfo CustomShaderVertCreateInfo;
+    VkShaderModuleCreateInfo CustomShaderFragCreateInfo;
 };
 typedef struct ImGui_ImplVulkan_RenderState ImGui_ImplVulkan_RenderState;
 struct ImGui_ImplVulkan_RenderState
@@ -180,23 +189,25 @@ struct ImGui_ImplVulkanH_Window
 typedef ImVector<ImGui_ImplVulkanH_Frame> ImVector_ImGui_ImplVulkanH_Frame;
 typedef ImVector<ImGui_ImplVulkanH_FrameSemaphores> ImVector_ImGui_ImplVulkanH_FrameSemaphores;
 #endif //CIMGUI_DEFINE_ENUMS_AND_STRUCTS
+CIMGUI_API void ImGui_ImplVulkanH_CreateOrResizeWindow(VkInstance instance,VkPhysicalDevice physical_device,VkDevice device,ImGui_ImplVulkanH_Window* wd,uint32_t queue_family,const VkAllocationCallbacks* allocator,int w,int h,uint32_t min_image_count,VkImageUsageFlags image_usage);
+CIMGUI_API void ImGui_ImplVulkanH_DestroyWindow(VkInstance instance,VkDevice device,ImGui_ImplVulkanH_Window* wd,const VkAllocationCallbacks* allocator);
+CIMGUI_API int ImGui_ImplVulkanH_GetMinImageCountFromPresentMode(VkPresentModeKHR present_mode);
+CIMGUI_API ImGui_ImplVulkanH_Window* ImGui_ImplVulkanH_GetWindowDataFromViewport(ImGuiViewport* viewport);
+CIMGUI_API VkPhysicalDevice ImGui_ImplVulkanH_SelectPhysicalDevice(VkInstance instance);
+CIMGUI_API VkPresentModeKHR ImGui_ImplVulkanH_SelectPresentMode(VkPhysicalDevice physical_device,VkSurfaceKHR surface,const VkPresentModeKHR* request_modes,int request_modes_count);
+CIMGUI_API uint32_t ImGui_ImplVulkanH_SelectQueueFamilyIndex(VkPhysicalDevice physical_device);
+CIMGUI_API VkSurfaceFormatKHR ImGui_ImplVulkanH_SelectSurfaceFormat(VkPhysicalDevice physical_device,VkSurfaceKHR surface,const VkFormat* request_formats,int request_formats_count,VkColorSpaceKHR request_color_space);
+CIMGUI_API ImGui_ImplVulkanH_Window* ImGui_ImplVulkanH_Window_ImGui_ImplVulkanH_Window(void);
+CIMGUI_API VkDescriptorSet ImGui_ImplVulkan_AddTexture(VkSampler sampler,VkImageView image_view,VkImageLayout image_layout);
+CIMGUI_API void ImGui_ImplVulkan_CreateMainPipeline(const ImGui_ImplVulkan_PipelineInfo* info);
 CIMGUI_API bool ImGui_ImplVulkan_Init(ImGui_ImplVulkan_InitInfo* info);
-CIMGUI_API void ImGui_ImplVulkan_Shutdown(void);
+CIMGUI_API bool ImGui_ImplVulkan_LoadFunctions(uint32_t api_version,PFN_vkVoidFunction(*loader_func)(const char* function_name,void* user_data),void* user_data);
 CIMGUI_API void ImGui_ImplVulkan_NewFrame(void);
+CIMGUI_API void ImGui_ImplVulkan_RemoveTexture(VkDescriptorSet descriptor_set);
 CIMGUI_API void ImGui_ImplVulkan_RenderDrawData(ImDrawData* draw_data,VkCommandBuffer command_buffer,VkPipeline pipeline);
 CIMGUI_API void ImGui_ImplVulkan_SetMinImageCount(uint32_t min_image_count);
+CIMGUI_API void ImGui_ImplVulkan_Shutdown(void);
 CIMGUI_API void ImGui_ImplVulkan_UpdateTexture(ImTextureData* tex);
-CIMGUI_API VkDescriptorSet ImGui_ImplVulkan_AddTexture(VkSampler sampler,VkImageView image_view,VkImageLayout image_layout);
-CIMGUI_API void ImGui_ImplVulkan_RemoveTexture(VkDescriptorSet descriptor_set);
-CIMGUI_API bool ImGui_ImplVulkan_LoadFunctions(uint32_t api_version,PFN_vkVoidFunction(*loader_func)(const char* function_name,void* user_data),void* user_data);
-CIMGUI_API void ImGui_ImplVulkanH_CreateOrResizeWindow(VkInstance instance,VkPhysicalDevice physical_device,VkDevice device,ImGui_ImplVulkanH_Window* wd,uint32_t queue_family,const VkAllocationCallbacks* allocator,int w,int h,uint32_t min_image_count);
-CIMGUI_API void ImGui_ImplVulkanH_DestroyWindow(VkInstance instance,VkDevice device,ImGui_ImplVulkanH_Window* wd,const VkAllocationCallbacks* allocator);
-CIMGUI_API VkSurfaceFormatKHR ImGui_ImplVulkanH_SelectSurfaceFormat(VkPhysicalDevice physical_device,VkSurfaceKHR surface,const VkFormat* request_formats,int request_formats_count,VkColorSpaceKHR request_color_space);
-CIMGUI_API VkPresentModeKHR ImGui_ImplVulkanH_SelectPresentMode(VkPhysicalDevice physical_device,VkSurfaceKHR surface,const VkPresentModeKHR* request_modes,int request_modes_count);
-CIMGUI_API VkPhysicalDevice ImGui_ImplVulkanH_SelectPhysicalDevice(VkInstance instance);
-CIMGUI_API uint32_t ImGui_ImplVulkanH_SelectQueueFamilyIndex(VkPhysicalDevice physical_device);
-CIMGUI_API int ImGui_ImplVulkanH_GetMinImageCountFromPresentMode(VkPresentModeKHR present_mode);
-CIMGUI_API ImGui_ImplVulkanH_Window* ImGui_ImplVulkanH_Window_ImGui_ImplVulkanH_Window(void);
 
 #endif
 #endif //CIMGUI_IMPL_DEFINED

generator/cimgui_template.h

@@ -49,6 +49,8 @@ struct SDL_Window;
 typedef union SDL_Event SDL_Event;
 #endif // CIMGUI_DEFINE_ENUMS_AND_STRUCTS
 
+PLACE_STRUCTS_C
+
 #include "auto_funcs.h"
 
 /////////////////////////hand written functions

generator/cpp2ffi.lua

@@ -1,5 +1,5 @@
 local M = {}
-
+local insert = table.insert
 local function ToStr(t,dometatables)
 	local function basicToStr (o)
 		if type(o) == "number" or type(o)=="boolean" then
@@ -936,7 +936,7 @@ local function itemsCount(items)
 		print(v,its and #its or 0)
 	end
 end
-
+--adding self argument for struct functions
 local function AdjustArguments(FP)
     for fun,defs in pairs(FP.defsT) do
         --struct function but no constructors or static functions or manuals
@@ -1083,6 +1083,7 @@ local function DefsByStruct(FP)
     end
     return structs
 end  
+M.DefsByStruct = DefsByStruct
 local function get_nonPOD(FP)
 	local defbystruct = DefsByStruct(FP)
 	--M.prtable(defbystruct)
@@ -1102,8 +1103,259 @@ local function get_nonPOD(FP)
 	FP.structs_and_enums_table.nonPOD = nonPOD
 	return nonPOD
 end
+local function recur_calc_depth(FP, structs, k,n)
+	--print("recur_calc_depth",k,n)
+	local struct = structs[k] or FP.cimgui_inherited.structs[k]
+	local n1 = n
+	for i,field in ipairs(struct) do
+		local typ = field.type:gsub("const ","") 
+		typ = typ:gsub("*","")
+		if k~=typ and FP.nP_used[typ] then
+			n1 = math.max(n1,recur_calc_depth(FP, structs, typ,n+1))
+		end
+	end
+	return n1
+end
+local function gen_structs_c(FP)
+	local structs = FP.structs_and_enums_table.structs
+	local nonPOD = FP.structs_and_enums_table.nonPOD
+	--sort nP_used by dependencies and name
+	nP_used_sorted = {}
+	for k,v in pairs(FP.nP_used) do
+		nP_used_sorted[k] = recur_calc_depth(FP, structs, k, 1)
+	end
+	--M.prtable(nP_used_sorted)
+	local npsorted ={}
+	for k,n in pairs(nP_used_sorted) do insert(npsorted,k) end
+	table.sort(npsorted, function(a,b) return (nP_used_sorted[a] < nP_used_sorted[b]) or ((nP_used_sorted[a] == nP_used_sorted[b]) and (a<b)) end)
+	--M.prtable(npsorted)
+	--error"DEUG"
+	----------
+	local tabs = {}
+	local tabs_c = {}
+	--for k,v in pairs(FP.nP_used) do
+	--M.table_do_sorted(FP.nP_used, function(k,v)
+	for _,k in ipairs(npsorted) do
+		if nonPOD[k]~="inherited" then
+		insert(tabs,"typedef struct "..k.."_c "..k.."_c;")
+		insert(tabs_c,"typedef struct "..k.."_c "..k..";")
+		insert(tabs,"struct "..k.."_c {")
+		local struct = structs[k] or FP.cimgui_inherited.structs[k]
+		for i,field in ipairs(struct) do
+			local typ = field.type:gsub("const ","") 
+			typ = typ:gsub("*","")
+			if FP.nP_used[typ] then
+				local ftype = field.type:gsub(typ,typ.."_c")
+				insert(tabs,"    "..ftype.." "..field.name..";")
+			else
+				insert(tabs,"    "..field.type.." "..field.name..";")
+			end
+		end
+		insert(tabs,"};")
+		end
+	end --)
+	if #tabs > 0 then
+		insert(tabs,1,"#ifndef CIMGUI_DEFINE_ENUMS_AND_STRUCTS")
+		insert(tabs,"#endif")
+	end
+	if #tabs_c > 0 then
+		insert(tabs_c,1,"#ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS")
+		insert(tabs_c,"#endif")
+	end
+	--print(table.concat(tabs_c,"\n"))
+	--print(table.concat(tabs,"\n"))
+	return table.concat(tabs_c,"\n").."\n"..table.concat(tabs,"\n")
+	--return table.concat(tabs,"\n")
+end
+local function gen_field_conversion(tab, struct,structs, FP, to,prefix)
+	--M.prtable("gen_field_conversion",struct)
+	prefix = prefix or ""
+	--local structs = FP.structs_and_enums_table.structs
+	for i,field in ipairs(struct) do
+		local ftype = field.type:gsub("*","")
+		if FP.nP_used[field.type] then
+			gen_field_conversion(tab, structs[field.type],structs,FP, to,prefix..field.name..".")
+		elseif FP.nP_used[ftype] then
+			local ftypec = field.type:gsub(ftype,not to and (ftype.."_c") or ftype)
+			insert(tab, "    dest."..prefix..field.name.." = reinterpret_cast<"..ftypec..">(src."..prefix..field.name..");")
+		else
+			insert(tab,"    dest."..prefix..field.name.." = src."..prefix..field.name..";")
+		end
+	end
+end
+local function genConversions(FP)
+	local structs = FP.structs_and_enums_table.structs
+	if FP.cimgui_inherited then
+		structs = {}
+		for k,v in pairs(FP.cimgui_inherited.structs) do
+			assert(not structs[k])
+			structs[k] = v
+		end
+		for k,v in pairs(FP.structs_and_enums_table.structs) do
+			structs[k] = v
+		end
+	end
+	local convers = {}
+	--for k,v in pairs(FP.nP_used) do
+	M.table_do_sorted(FP.nP_used, function(k,v)
+		--print("genConversions",k)
+		insert(convers,"static inline "..k.." ConvertToCPP_"..k.."(const "..k.."_c& src)")
+		insert(convers,"{")
+		insert(convers,"    "..k.." dest;")
+		local struct = structs[k]
+		gen_field_conversion(convers,struct,structs,FP, true)
+		insert(convers,"    return dest;")
+		insert(convers,"}")
+		insert(convers,"static inline "..k.."_c ConvertFromCPP_"..k.."(const "..k.."& src)")
+		insert(convers,"{")
+		insert(convers,"    "..k.."_c dest;")
+		local struct = structs[k]
+		gen_field_conversion(convers,struct,structs,FP,  false)
+		insert(convers,"    return dest;")
+		insert(convers,"}")
+	end)
+	--print(table.concat(convers,"\n"))
+	return table.concat(convers,"\n")
+end
+local function get_nonPODused(FP)
+	--print("get_nonPODused-----------------------------")
+	local nonPOD = FP.structs_and_enums_table.nonPOD
+	if FP.cimgui_inherited then
+		for k,v in pairs(FP.cimgui_inherited.nonPOD) do
+			nonPOD[k] = "inherited"
+		end
+	end
+	--M.prtable(nonPOD)
+	local typeargs = {}
+	local typeargs_ret = {}
+	for k,defs in pairs(FP.defsT) do 
+		--print(k)
+		for i, w in ipairs(defs) do
+			if not w.templated then --and not w.location:match"internal" then
+			for ii,arg in ipairs(w.argsT) do
+				local typ = (arg.type):gsub("&","")
+				--typ = (typ):gsub("*","")
+				typ = (typ):gsub("const ","")
+				if nonPOD[typ] then
+					--print(arg.type,w.ov_cimguiname,w.location)
+					typeargs[arg.type] = (arg.type):gsub(typ,typ.."_c")
+				end
+			end
+			local typret = (w.ret or ""):gsub("&","")
+			--typret = (typret):gsub("*","")
+			typret = (typret):gsub("const ","")
+			--print(typret)
+			if nonPOD[typret] then
+				--print(w.ret,w.ov_cimguiname,w.location)
+				typeargs_ret[w.ret] = (w.ret):gsub(typret,typret.."_c")
+			end
+			end
+		end
+	end
+	--M.prtable(nonPOD)
+	local all_type_nP = {}
+	for k,v in pairs(typeargs) do 
+		local k2 = k:gsub("const ","")
+		all_type_nP[k2] = true
+	end
+	for k,v in pairs(typeargs_ret) do 
+		local k2 = k:gsub("const ","")
+		all_type_nP[k2] = true
+	end
+	FP.nP_used = all_type_nP
+	--M.prtable("FP.nP_used",FP.nP_used)
+	FP.nP_args = typeargs
+	FP.nP_ret = typeargs_ret
+	--genConversions(FP)
+	--M.prtable(typeargs,typeargs_ret,all_type_nP)
+	-- local typeargs2 = {}
+	-- for k,v in pairs(typeargs) do table.insert(typeargs2,k) end
+	-- table.sort(typeargs2)
+	-- print"------------typeargs2----------------"
+	-- M.prtable(typeargs2)
+	
+	-- local typeargs2_ret = {}
+	-- for k,v in pairs(typeargs_ret) do table.insert(typeargs2_ret,k) end
+	-- table.sort(typeargs2_ret)
+	-- print"------------typeargs2_ret----------------"
+	-- M.prtable(typeargs2_ret)
+
+end
+local function header_subs_nonPOD(FP,txt)
+	--print("----------header_subs_nonPOD")
+	--M.prtable(FP.nP_used)
+	for k,v in pairs(FP.nP_used) do
+		--txt = txt:gsub("([%s;])"..k,"%1"..k.."_c")
+		for i=1,2 do
+		txt = txt:gsub("([%s;])"..k.."([%s;%*])", "%1"..k.."_c%2")
+		end
+		--txt = txt:gsub("%s"..k..";", " "..k.."_c;")
+		--txt = txt:gsub("%s"..k.."%*", " "..k.."_c*")
+	end
+	return txt
+end
+M.header_subs_nonPOD = header_subs_nonPOD
 local function ADDnonUDT(FP)
 	local nonPOD = get_nonPOD(FP)
+	get_nonPODused(FP)
+	for k,defs in pairs(FP.defsT) do
+		for i, def in ipairs(defs) do 
+			--ret
+			local rets = (def.ret or ""):gsub("const ","")
+			rets = rets:gsub("*","")
+			if FP.nP_ret[def.ret] then
+				def.conv = (def.ret):gsub("const ","")
+				def.ret = FP.nP_ret[def.ret]
+				def.nonUDT = 1
+			elseif FP.nP_ret[rets] then
+				def.ret = def.ret:gsub(rets, FP.nP_ret[rets])
+				def.nonUDT = 2
+			end
+			--args
+			local caar,asp
+			if #def.argsT > 0 then
+				caar = "("
+				asp = "("
+				for i,v in ipairs(def.argsT) do
+					local name = v.name 
+					if v.ret then --function pointer
+						local f_ = v.has_cdecl and "(__cdecl*" or "(*"
+						asp = asp .. v.ret .. f_ .. v.name .. ")" .. v.signature .. ","
+						caar = caar .. name .. ","
+					else
+						local typ = v.type:gsub("const ","")
+						local typ2 = typ:gsub("*","")
+						if FP.nP_args[v.type] then
+							caar = caar .. "ConvertToCPP_"..typ.."("..name.."),"
+							asp = asp .. v.type:gsub(typ,typ.."_c").." "..v.name..","
+						elseif FP.nP_args[typ2] then
+							local typ3 = v.type:gsub(typ2,typ2.."_c")
+							caar = caar .. "reinterpret_cast<"..v.type..">("..name.."),"
+							asp = asp .. typ3 .." "..v.name..","
+						else
+							local siz = v.type:match("(%[%d*%])") or ""
+							local typ = v.type:gsub("(%[%d*%])","")
+							asp = asp .. typ .. (v.name~="..." and " "..v.name or "") .. siz .. ","
+							local callname = v.reftoptr and "*"..name or name 
+							caar = caar .. callname .. ","
+						end
+					end
+				end
+				caar = caar:sub(1,-2)..")"
+				asp = asp:sub(1,-2)..")"
+			else
+				caar = "()"
+				asp = "()"
+			end
+			def.call_args_old = def.call_args
+			def.call_args = caar
+			def.args = asp
+		end
+	end
+end
+local function ADDnonUDT_OLD(FP)
+	local nonPOD = get_nonPOD(FP)
+	get_nonPODused(FP)
 	--print"nonPOD"
 	--M.prtable(nonPOD)
     local defsT = FP.defsT
@@ -1125,6 +1377,7 @@ local function ADDnonUDT(FP)
 		if (not isUDT) and FP.cimgui_inherited and FP.cimgui_inherited.nonPOD[defT.ret] then
 			isUDT = true
 		end
+		--given in generator.lua , could be skipped
 		for _,udt_ret in ipairs(FP.UDTs) do
 			if udt_ret == defT.ret then isUDT=true; break end
 		end
@@ -1289,6 +1542,8 @@ function M.Parser()
 	par.skipped = {}
 	par.UDTs = {}
 	
+	par.genConversors = genConversions
+	par.gen_structs_c = gen_structs_c
 	function par:insert(line,loca)
 		--table.insert(cdefs,{line,loca})
 		--table.insert(cdefs,{line:gsub("^%s*(.-)%s*$", "%1"),loca})
@@ -1343,8 +1598,9 @@ function M.Parser()
 	function par:do_parse()
 		self:parseItems()
 		self:gen_structs_and_enums_table()
-		self:gen_structs_and_enums()
 		self:compute_overloads()
+		self:gen_structs_and_enums()
+		--self:compute_overloads()
 		--self:compute_templated()
 		ADDdestructors(self)
 	end
@@ -1714,6 +1970,30 @@ function M.Parser()
 	function par:header_text_insert(tab,txt,it)
 		table.insert(tab, txt)
 	end
+	local function function_parse(self,it)
+		local stname = ""
+		local namespace
+		if it.parent then
+			if it.parent.re_name == "struct_re" or it.parent.re_name == "typedef_st_re" or it.parent.re_name == "class_re" then
+				stname = it.parent.name
+			elseif it.parent.re_name == "namespace_re" then
+				namespace = get_parents_nameC(it) --it.parent.name
+			end
+		end
+		if it.item:match"^%s*template%s+<" then
+			local ttype,fun = it.item:match"^%s*template%s+<%s*typename%s+([^>]+)%s*>%s*(.+)$"
+			if self.ftemplate_list and self.ftemplate_list[ttype] then
+				for iT,vT in ipairs(self.ftemplate_list[ttype]) do
+					local funT = fun:gsub("([< %(])"..ttype,"%1"..vT)
+					--funT = funT:gsub("sizeof%("..ttype.."%)","sizeof("..vT..")")
+					--local funT = fun:gsub(ttype,vT)
+					self:parseFunction(stname,{item=funT},namespace,it.locat)
+				end
+			end
+		else
+			self:parseFunction(stname,it,namespace,it.locat)
+		end
+	end
 	function par:gen_structs_and_enums()
 		print"--------------gen_structs_and_enums"
 		--M.prtable(self.typenames)
@@ -1820,13 +2100,15 @@ function M.Parser()
 				if not structname then print("NO NAME",cleanst,it.item) end
 				--if not void stname or templated
 				if structname and not self.typenames[structname] then
-					
-					--table.insert(typedefs_table,"typedef struct "..structname.." "..structname..";\n")
-					local tst = "\ntypedef struct "..structname.." "..structname..";"
-						if check_unique_typedefs(tst,uniques) then
-							--table.insert(outtab,tst)
-							self:header_text_insert(outtab, tst, it)
-						end
+					--dont add typedef to non POD
+					local tst = ""
+					--if not self.nP_used[structname] then
+						tst = "\ntypedef struct "..structname.." "..structname..";"
+					--end
+					if check_unique_typedefs(tst,uniques) then
+						--table.insert(outtab,tst)
+						self:header_text_insert(outtab, tst, it)
+					end
 					self.typedefs_dict[structname]="struct "..structname
 					--dont insert child structs as they are inserted before parent struct
 					if not (it.parent and it.parent.re_name == "struct_re") then
@@ -1851,28 +2133,7 @@ function M.Parser()
 			elseif it.re_name == "namespace_re" or it.re_name == "union_re" or it.re_name == "functype_re" then
 				--nop
 			elseif it.re_name == "functionD_re" or it.re_name == "function_re" then
-				local stname = ""
-				local namespace
-				if it.parent then
-					if it.parent.re_name == "struct_re" or it.parent.re_name == "typedef_st_re" or it.parent.re_name == "class_re" then
-						stname = it.parent.name
-					elseif it.parent.re_name == "namespace_re" then
-						namespace = get_parents_nameC(it) --it.parent.name
-					end
-				end
-				if it.item:match"^%s*template%s+<" then
-					local ttype,fun = it.item:match"^%s*template%s+<%s*typename%s+([^>]+)%s*>%s*(.+)$"
-					if self.ftemplate_list and self.ftemplate_list[ttype] then
-						for iT,vT in ipairs(self.ftemplate_list[ttype]) do
-							local funT = fun:gsub("([< %(])"..ttype,"%1"..vT)
-							--funT = funT:gsub("sizeof%("..ttype.."%)","sizeof("..vT..")")
-							--local funT = fun:gsub(ttype,vT)
-							self:parseFunction(stname,{item=funT},namespace,it.locat)
-						end
-					end
-				else
-					self:parseFunction(stname,it,namespace,it.locat)
-				end
+				--function_parse(self,it)
 			else
 				if it.re_name~="operator_re" then
 				print("not processed gen",it.re_name,it.item:sub(1,20))
@@ -1892,7 +2153,10 @@ function M.Parser()
 		--check arg detection failure if no name in function declaration
 		check_arg_detection(self.defsT,self.typedefs_dict)
 		local outtabprest, outtabst = table.concat(outtabpre,""),table.concat(outtab,"")
+		outtabprest = M.header_subs_nonPOD(self,outtabprest)
+		outtabst = M.header_subs_nonPOD(self,outtabst)
 		self.structs_and_enums = {outtabprest, outtabst or ""}
+		
 		return outtabprest, outtabst
 	end
 	-----------
@@ -2086,7 +2350,9 @@ function M.Parser()
 				end
 			elseif it.re_name == "namespace_re" or it.re_name == "union_re" or it.re_name == "functype_re" then
 				--nop
-			elseif it.re_name ~= "functionD_re" and it.re_name ~= "function_re" and it.re_name ~= "operator_re" then
+			elseif it.re_name ~= "functionD_re" or it.re_name ~= "function_re" then
+				function_parse(self,it)
+			elseif it.re_name ~= "operator_re" then
 				print("not processed gen table",it.re_name)
 			end
 		end
@@ -2215,9 +2481,9 @@ function M.Parser()
 		end)
         --print(numoverloaded, "overloaded")
         table.insert(strt,string.format("%d overloaded",numoverloaded))
-		--ADDIMSTR_S(self)
-		AdjustArguments(self)
 		ADDnonUDT(self)
+		AdjustArguments(self)
+		--ADDnonUDT(self)
 
 		--ADDdestructors(self)
         self.overloadstxt  = table.concat(strt,"\n")
@@ -2678,12 +2944,15 @@ local function ImGui_f_implementation(def)
 		table.insert(outtab, "#ifdef CIMGUI_VARGS0\n")
 		table.insert(outtab, "CIMGUI_API".." "..def.ret.." "..def.ov_cimguiname.."0"..paramListWithoutDots(def.args).."\n")
 		table.insert(outtab, "{\n")
-		table.insert(outtab, "    return "..def.ov_cimguiname..paramListWithoutDots(def.call_args)..";\n")
+		table.insert(outtab, "    return "..def.ov_cimguiname..paramListWithoutDots(def.call_args_old)..";\n")
 		table.insert(outtab, "}\n")
 		table.insert(outtab, "#endif\n")
     elseif def.nonUDT then
         if def.nonUDT == 1 then
-            table.insert(outtab,"    *pOut = "..namespace..def.funcname..def.call_args..";\n")
+            --table.insert(outtab,"    *pOut = "..namespace..def.funcname..def.call_args..";\n")
+			insert(outtab,"    return ConvertFromCPP_"..def.conv.."("..namespace..def.funcname..def.call_args..");\n")
+		elseif def.nonUDT == 2 then
+			insert(outtab,"    return reinterpret_cast<"..def.ret..">("..ptret..namespace..def.funcname..def.call_args..");\n")
         end
 		table.insert(outtab,"}\n")
     else --standard ImGui
@@ -2717,7 +2986,11 @@ local function struct_f_implementation(def)
         end
     elseif def.nonUDT then
         if def.nonUDT == 1 then
-            table.insert(outtab,"    *pOut = self->"..def.funcname..def.call_args..";\n")
+            --table.insert(outtab,"    *pOut = self->"..def.funcname..def.call_args..";\n")
+			--local typret = (def.ret):gsub("const ","")
+			insert(outtab,"    return ConvertFromCPP_"..def.conv.."(self->"..def.funcname..def.call_args..");\n")
+		elseif def.nonUDT == 2 then
+			insert(outtab,"    return reinterpret_cast<"..def.ret..">("..ptret.."self->"..def.funcname..def.call_args..");\n")
         end
     else --standard struct
         table.insert(outtab,"    return "..ptret.."self->"..def.funcname..def.call_args..";\n")
@@ -2775,7 +3048,9 @@ local function func_implementation(FP)
 		end
         until true
     end
-    return table.concat(outtab)
+	local conversors = FP:genConversors()
+	local cimplem = conversors .. table.concat(outtab)
+    return cimplem
 end
 
 M.func_implementation = func_implementation
@@ -2793,7 +3068,7 @@ M.table_do_sorted = table_do_sorted
 
 local function func_header_generate_structs(FP)
 
-    local outtab = {}
+    local outtab = {}--"\n/////func_header_generate_structs\n"}
 
 	table_do_sorted(FP.embeded_structs,function(k,v) 
 		table.insert(outtab,"typedef "..v.." "..k..";\n") 
@@ -2811,6 +3086,7 @@ local function func_header_generate_structs(FP)
 end
 M.func_header_generate_structs = func_header_generate_structs
 
+
 local function func_header_generate_funcs(FP)
 
     local outtab = {}
@@ -2839,17 +3115,18 @@ local function func_header_generate_funcs(FP)
             elseif def.destructor then
                 table.insert(outtab,"CIMGUI_API void "..def.ov_cimguiname..def.args..";"..addcoment.."\n")
             else --not constructor
-
+				--local ret = FP.nP_ret[def.ret] or def.ret
+				local ret = def.ret
                 if def.stname == "" or def.is_static_function then --ImGui namespace or top level
-                    table.insert(outtab,"CIMGUI_API "..def.ret.." ".. def.ov_cimguiname ..(empty and "(void)" or def.args)..";"..addcoment.."\n")
+                    table.insert(outtab,"CIMGUI_API "..ret.." ".. def.ov_cimguiname ..(empty and "(void)" or def.args)..";"..addcoment.."\n")
 					if def.isvararg then
 						-- For variadic functions we add a function implementation with zero argumets, for compatibility with languages such as C#.
 						table.insert(outtab, "#ifdef CIMGUI_VARGS0\n")
-						table.insert(outtab, "CIMGUI_API".." "..def.ret.." "..def.ov_cimguiname.."0"..paramListWithoutDots(def.args)..";\n")
+						table.insert(outtab, "CIMGUI_API".." "..ret.." "..def.ov_cimguiname.."0"..paramListWithoutDots(def.args)..";\n")
 						table.insert(outtab, "#endif\n")
 					end
                 else
-                    table.insert(outtab,"CIMGUI_API "..def.ret.." "..def.ov_cimguiname..def.args..";"..addcoment.."\n")
+                    table.insert(outtab,"CIMGUI_API "..ret.." "..def.ov_cimguiname..def.args..";"..addcoment.."\n")
                 end
             end 
         end
@@ -2869,13 +3146,16 @@ M.func_header_generate_funcs = func_header_generate_funcs
 local function func_header_generate(FP)
 
     local outtab = func_header_generate_structs(FP)
-    table.insert(outtab, 1, "#ifndef CIMGUI_DEFINE_ENUMS_AND_STRUCTS\n")
+    table.insert(outtab, 1, "\n#ifndef CIMGUI_DEFINE_ENUMS_AND_STRUCTS\n")
     table.insert(outtab,"#endif //CIMGUI_DEFINE_ENUMS_AND_STRUCTS\n")
     
     local outtabf = func_header_generate_funcs(FP)
-    
-    local cfuncsstr = table.concat(outtab)..table.concat(outtabf)
+	outtabf = table.concat(outtabf)
+	assert(type(outtabf)=="string")
+    --outtabf = M.header_subs_nonPOD(FP,outtabf)
+    local cfuncsstr = table.concat(outtab)..outtabf
     cfuncsstr = cfuncsstr:gsub("\n+","\n") --several empty lines to one empty line
+
     return cfuncsstr
 end
 

generator/generator.lua

@@ -124,10 +124,14 @@ local function func_header_impl_generate(FP)
 
     local outtab = {}
     
-    for _,t in ipairs(FP.funcdefs) do
-        if t.cimguiname then
-            local cimf = FP.defsT[t.cimguiname]
-            local def = cimf[t.signature]
+    -- for _,t in ipairs(FP.funcdefs) do
+        -- if t.cimguiname then
+            -- local cimf = FP.defsT[t.cimguiname]
+            -- local def = cimf[t.signature]
+		--for k,defs in pairs(FP.defsT) do
+		cpp2ffi.table_do_sorted(FP.defsT, function(i,defs)
+		   if true then
+		   for i, def in ipairs(defs) do
 			local addcoment = def.comment or ""
 			local empty = def.args:match("^%(%)") --no args
 			if def.constructor then
@@ -147,10 +151,11 @@ local function func_header_impl_generate(FP)
                     error("class function in implementations")
                 end
             end
+		end
         else --not cimguiname
             table.insert(outtab,t.comment:gsub("%%","%%%%").."\n")-- %% substitution for gsub
         end
-    end
+    end)
     local cfuncsstr = table.concat(outtab)
     cfuncsstr = cfuncsstr:gsub("\n+","\n") --several empty lines to one empty line
     return cfuncsstr
@@ -181,7 +186,7 @@ local function get_defines(t)
     end
     pipe:close()
     --require"anima.utils"
-    --prtable(defines)
+    --cpp2ffi.prtable(defines)
 	assert(next(defines), table.concat(compiler_output, "\n"))
     local ret = {}
     for i,v in ipairs(t) do
@@ -272,6 +277,9 @@ local function cimgui_generation(parser)
 	--------------------------------------------------
     local hstrfile = read_data"./cimgui_template.h"
 	
+	
+	--hstrfile = hstrfile:gsub([[PLACE_STRUCTS_C]],parser:gen_structs_c())
+	
 	local outpre,outpost = parser.structs_and_enums[1],parser.structs_and_enums[2]
 	cpp2ffi.prtable(parser.templates)
 	cpp2ffi.prtable(parser.typenames)
@@ -286,6 +294,9 @@ local function cimgui_generation(parser)
 	if gdefines.ImDrawCallback_ResetRenderState then
 		cstructsstr = cstructsstr.."\n#define ImDrawCallback_ResetRenderState       "..gdefines.ImDrawCallback_ResetRenderState.."\n"
 	end
+	if gdefines.ImTextureID_Invalid then
+		cstructsstr = cstructsstr.."\n#define ImTextureID_Invalid       "..gdefines.ImTextureID_Invalid.."\n"
+	end
 	if gdefines.IMGUI_HAS_IMSTR then
 		if not (NOCHAR or NOIMSTRV) then
 		cstructsstr = cstructsstr.."\n#define IMGUI_HAS_IMSTR       1\n"
@@ -295,6 +306,7 @@ local function cimgui_generation(parser)
 	cstructsstr = colapse_defines(cstructsstr, "IMGUI_ENABLE_FREETYPE")
 	
     hstrfile = hstrfile:gsub([[#include "imgui_structs%.h"]],cstructsstr)
+	hstrfile = hstrfile:gsub([[PLACE_STRUCTS_C]],parser:gen_structs_c())
     local cfuncsstr = func_header_generate(parser)
 	cfuncsstr = colapse_defines(cfuncsstr, "IMGUI_ENABLE_FREETYPE")
     hstrfile = hstrfile:gsub([[#include "auto_funcs%.h"]],cfuncsstr)
@@ -321,7 +333,7 @@ end
 --------------------------------------------------------
 --get imgui.h version and IMGUI_HAS_DOCK--------------------------
 --defines for the cl compiler must be present in the print_defines.cpp file
-gdefines = get_defines{"IMGUI_VERSION","IMGUI_VERSION_NUM","FLT_MAX","FLT_MIN","IMGUI_HAS_DOCK","IMGUI_HAS_IMSTR","ImDrawCallback_ResetRenderState","IMGUI_HAS_TEXTURES"}
+gdefines = get_defines{"IMGUI_VERSION","IMGUI_VERSION_NUM","FLT_MAX","FLT_MIN","IMGUI_HAS_DOCK","IMGUI_HAS_IMSTR","ImDrawCallback_ResetRenderState","IMGUI_HAS_TEXTURES","ImTextureID_Invalid"}
 cpp2ffi.prtable(gdefines)
 if gdefines.IMGUI_HAS_DOCK then gdefines.IMGUI_HAS_DOCK = true end
 if gdefines.IMGUI_HAS_IMSTR then gdefines.IMGUI_HAS_IMSTR = true end

generator/output/impl_definitions.json

@@ -14,6 +14,7 @@
       ],
       "argsoriginal": "(GLFWwindow* window,unsigned int c)",
       "call_args": "(window,c)",
+      "call_args_old": "(window,c)",
       "cimguiname": "ImGui_ImplGlfw_CharCallback",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_CharCallback",
@@ -39,6 +40,7 @@
       ],
       "argsoriginal": "(GLFWwindow* window,int entered)",
       "call_args": "(window,entered)",
+      "call_args_old": "(window,entered)",
       "cimguiname": "ImGui_ImplGlfw_CursorEnterCallback",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_CursorEnterCallback",
@@ -68,6 +70,7 @@
       ],
       "argsoriginal": "(GLFWwindow* window,double x,double y)",
       "call_args": "(window,x,y)",
+      "call_args_old": "(window,x,y)",
       "cimguiname": "ImGui_ImplGlfw_CursorPosCallback",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_CursorPosCallback",
@@ -89,6 +92,7 @@
       ],
       "argsoriginal": "(GLFWmonitor* monitor)",
       "call_args": "(monitor)",
+      "call_args_old": "(monitor)",
       "cimguiname": "ImGui_ImplGlfw_GetContentScaleForMonitor",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_GetContentScaleForMonitor",
@@ -110,6 +114,7 @@
       ],
       "argsoriginal": "(GLFWwindow* window)",
       "call_args": "(window)",
+      "call_args_old": "(window)",
       "cimguiname": "ImGui_ImplGlfw_GetContentScaleForWindow",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_GetContentScaleForWindow",
@@ -135,6 +140,7 @@
       ],
       "argsoriginal": "(GLFWwindow* window,bool install_callbacks)",
       "call_args": "(window,install_callbacks)",
+      "call_args_old": "(window,install_callbacks)",
       "cimguiname": "ImGui_ImplGlfw_InitForOpenGL",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_InitForOpenGL",
@@ -160,6 +166,7 @@
       ],
       "argsoriginal": "(GLFWwindow* window,bool install_callbacks)",
       "call_args": "(window,install_callbacks)",
+      "call_args_old": "(window,install_callbacks)",
       "cimguiname": "ImGui_ImplGlfw_InitForOther",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_InitForOther",
@@ -185,6 +192,7 @@
       ],
       "argsoriginal": "(GLFWwindow* window,bool install_callbacks)",
       "call_args": "(window,install_callbacks)",
+      "call_args_old": "(window,install_callbacks)",
       "cimguiname": "ImGui_ImplGlfw_InitForVulkan",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_InitForVulkan",
@@ -206,6 +214,7 @@
       ],
       "argsoriginal": "(GLFWwindow* window)",
       "call_args": "(window)",
+      "call_args_old": "(window)",
       "cimguiname": "ImGui_ImplGlfw_InstallCallbacks",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_InstallCallbacks",
@@ -243,6 +252,7 @@
       ],
       "argsoriginal": "(GLFWwindow* window,int key,int scancode,int action,int mods)",
       "call_args": "(window,key,scancode,action,mods)",
+      "call_args_old": "(window,key,scancode,action,mods)",
       "cimguiname": "ImGui_ImplGlfw_KeyCallback",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_KeyCallback",
@@ -268,6 +278,7 @@
       ],
       "argsoriginal": "(GLFWmonitor* monitor,int event)",
       "call_args": "(monitor,event)",
+      "call_args_old": "(monitor,event)",
       "cimguiname": "ImGui_ImplGlfw_MonitorCallback",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_MonitorCallback",
@@ -301,6 +312,7 @@
       ],
       "argsoriginal": "(GLFWwindow* window,int button,int action,int mods)",
       "call_args": "(window,button,action,mods)",
+      "call_args_old": "(window,button,action,mods)",
       "cimguiname": "ImGui_ImplGlfw_MouseButtonCallback",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_MouseButtonCallback",
@@ -317,6 +329,7 @@
       "argsT": [],
       "argsoriginal": "()",
       "call_args": "()",
+      "call_args_old": "()",
       "cimguiname": "ImGui_ImplGlfw_NewFrame",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_NewFrame",
@@ -338,6 +351,7 @@
       ],
       "argsoriginal": "(GLFWwindow* window)",
       "call_args": "(window)",
+      "call_args_old": "(window)",
       "cimguiname": "ImGui_ImplGlfw_RestoreCallbacks",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_RestoreCallbacks",
@@ -367,6 +381,7 @@
       ],
       "argsoriginal": "(GLFWwindow* window,double xoffset,double yoffset)",
       "call_args": "(window,xoffset,yoffset)",
+      "call_args_old": "(window,xoffset,yoffset)",
       "cimguiname": "ImGui_ImplGlfw_ScrollCallback",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_ScrollCallback",
@@ -388,6 +403,7 @@
       ],
       "argsoriginal": "(bool chain_for_all_windows)",
       "call_args": "(chain_for_all_windows)",
+      "call_args_old": "(chain_for_all_windows)",
       "cimguiname": "ImGui_ImplGlfw_SetCallbacksChainForAllWindows",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_SetCallbacksChainForAllWindows",
@@ -404,6 +420,7 @@
       "argsT": [],
       "argsoriginal": "()",
       "call_args": "()",
+      "call_args_old": "()",
       "cimguiname": "ImGui_ImplGlfw_Shutdown",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_Shutdown",
@@ -425,6 +442,7 @@
       ],
       "argsoriginal": "(int milliseconds)",
       "call_args": "(milliseconds)",
+      "call_args_old": "(milliseconds)",
       "cimguiname": "ImGui_ImplGlfw_Sleep",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_Sleep",
@@ -450,6 +468,7 @@
       ],
       "argsoriginal": "(GLFWwindow* window,int focused)",
       "call_args": "(window,focused)",
+      "call_args_old": "(window,focused)",
       "cimguiname": "ImGui_ImplGlfw_WindowFocusCallback",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_WindowFocusCallback",
@@ -466,6 +485,7 @@
       "argsT": [],
       "argsoriginal": "()",
       "call_args": "()",
+      "call_args_old": "()",
       "cimguiname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
       "defaults": {},
       "funcname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
@@ -482,6 +502,7 @@
       "argsT": [],
       "argsoriginal": "()",
       "call_args": "()",
+      "call_args_old": "()",
       "cimguiname": "ImGui_ImplOpenGL2_DestroyDeviceObjects",
       "defaults": {},
       "funcname": "ImGui_ImplOpenGL2_DestroyDeviceObjects",
@@ -498,6 +519,7 @@
       "argsT": [],
       "argsoriginal": "()",
       "call_args": "()",
+      "call_args_old": "()",
       "cimguiname": "ImGui_ImplOpenGL2_Init",
       "defaults": {},
       "funcname": "ImGui_ImplOpenGL2_Init",
@@ -514,6 +536,7 @@
       "argsT": [],
       "argsoriginal": "()",
       "call_args": "()",
+      "call_args_old": "()",
       "cimguiname": "ImGui_ImplOpenGL2_NewFrame",
       "defaults": {},
       "funcname": "ImGui_ImplOpenGL2_NewFrame",
@@ -535,6 +558,7 @@
       ],
       "argsoriginal": "(ImDrawData* draw_data)",
       "call_args": "(draw_data)",
+      "call_args_old": "(draw_data)",
       "cimguiname": "ImGui_ImplOpenGL2_RenderDrawData",
       "defaults": {},
       "funcname": "ImGui_ImplOpenGL2_RenderDrawData",
@@ -551,6 +575,7 @@
       "argsT": [],
       "argsoriginal": "()",
       "call_args": "()",
+      "call_args_old": "()",
       "cimguiname": "ImGui_ImplOpenGL2_Shutdown",
       "defaults": {},
       "funcname": "ImGui_ImplOpenGL2_Shutdown",
@@ -572,6 +597,7 @@
       ],
       "argsoriginal": "(ImTextureData* tex)",
       "call_args": "(tex)",
+      "call_args_old": "(tex)",
       "cimguiname": "ImGui_ImplOpenGL2_UpdateTexture",
       "defaults": {},
       "funcname": "ImGui_ImplOpenGL2_UpdateTexture",
@@ -588,6 +614,7 @@
       "argsT": [],
       "argsoriginal": "()",
       "call_args": "()",
+      "call_args_old": "()",
       "cimguiname": "ImGui_ImplOpenGL3_CreateDeviceObjects",
       "defaults": {},
       "funcname": "ImGui_ImplOpenGL3_CreateDeviceObjects",
@@ -604,6 +631,7 @@
       "argsT": [],
       "argsoriginal": "()",
       "call_args": "()",
+      "call_args_old": "()",
       "cimguiname": "ImGui_ImplOpenGL3_DestroyDeviceObjects",
       "defaults": {},
       "funcname": "ImGui_ImplOpenGL3_DestroyDeviceObjects",
@@ -625,6 +653,7 @@
       ],
       "argsoriginal": "(const char* glsl_version=nullptr)",
       "call_args": "(glsl_version)",
+      "call_args_old": "(glsl_version)",
       "cimguiname": "ImGui_ImplOpenGL3_Init",
       "defaults": {
         "glsl_version": "nullptr"
@@ -643,6 +672,7 @@
       "argsT": [],
       "argsoriginal": "()",
       "call_args": "()",
+      "call_args_old": "()",
       "cimguiname": "ImGui_ImplOpenGL3_NewFrame",
       "defaults": {},
       "funcname": "ImGui_ImplOpenGL3_NewFrame",
@@ -664,6 +694,7 @@
       ],
       "argsoriginal": "(ImDrawData* draw_data)",
       "call_args": "(draw_data)",
+      "call_args_old": "(draw_data)",
       "cimguiname": "ImGui_ImplOpenGL3_RenderDrawData",
       "defaults": {},
       "funcname": "ImGui_ImplOpenGL3_RenderDrawData",
@@ -680,6 +711,7 @@
       "argsT": [],
       "argsoriginal": "()",
       "call_args": "()",
+      "call_args_old": "()",
       "cimguiname": "ImGui_ImplOpenGL3_Shutdown",
       "defaults": {},
       "funcname": "ImGui_ImplOpenGL3_Shutdown",
@@ -701,6 +733,7 @@
       ],
       "argsoriginal": "(ImTextureData* tex)",
       "call_args": "(tex)",
+      "call_args_old": "(tex)",
       "cimguiname": "ImGui_ImplOpenGL3_UpdateTexture",
       "defaults": {},
       "funcname": "ImGui_ImplOpenGL3_UpdateTexture",
@@ -722,6 +755,7 @@
       ],
       "argsoriginal": "(int display_index)",
       "call_args": "(display_index)",
+      "call_args_old": "(display_index)",
       "cimguiname": "ImGui_ImplSDL2_GetContentScaleForDisplay",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_GetContentScaleForDisplay",
@@ -743,6 +777,7 @@
       ],
       "argsoriginal": "(SDL_Window* window)",
       "call_args": "(window)",
+      "call_args_old": "(window)",
       "cimguiname": "ImGui_ImplSDL2_GetContentScaleForWindow",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_GetContentScaleForWindow",
@@ -764,6 +799,7 @@
       ],
       "argsoriginal": "(SDL_Window* window)",
       "call_args": "(window)",
+      "call_args_old": "(window)",
       "cimguiname": "ImGui_ImplSDL2_InitForD3D",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_InitForD3D",
@@ -785,6 +821,7 @@
       ],
       "argsoriginal": "(SDL_Window* window)",
       "call_args": "(window)",
+      "call_args_old": "(window)",
       "cimguiname": "ImGui_ImplSDL2_InitForMetal",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_InitForMetal",
@@ -810,6 +847,7 @@
       ],
       "argsoriginal": "(SDL_Window* window,void* sdl_gl_context)",
       "call_args": "(window,sdl_gl_context)",
+      "call_args_old": "(window,sdl_gl_context)",
       "cimguiname": "ImGui_ImplSDL2_InitForOpenGL",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_InitForOpenGL",
@@ -831,6 +869,7 @@
       ],
       "argsoriginal": "(SDL_Window* window)",
       "call_args": "(window)",
+      "call_args_old": "(window)",
       "cimguiname": "ImGui_ImplSDL2_InitForOther",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_InitForOther",
@@ -856,6 +895,7 @@
       ],
       "argsoriginal": "(SDL_Window* window,SDL_Renderer* renderer)",
       "call_args": "(window,renderer)",
+      "call_args_old": "(window,renderer)",
       "cimguiname": "ImGui_ImplSDL2_InitForSDLRenderer",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_InitForSDLRenderer",
@@ -877,6 +917,7 @@
       ],
       "argsoriginal": "(SDL_Window* window)",
       "call_args": "(window)",
+      "call_args_old": "(window)",
       "cimguiname": "ImGui_ImplSDL2_InitForVulkan",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_InitForVulkan",
@@ -893,6 +934,7 @@
       "argsT": [],
       "argsoriginal": "()",
       "call_args": "()",
+      "call_args_old": "()",
       "cimguiname": "ImGui_ImplSDL2_NewFrame",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_NewFrame",
@@ -914,6 +956,7 @@
       ],
       "argsoriginal": "(const SDL_Event* event)",
       "call_args": "(event)",
+      "call_args_old": "(event)",
       "cimguiname": "ImGui_ImplSDL2_ProcessEvent",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_ProcessEvent",
@@ -943,6 +986,7 @@
       ],
       "argsoriginal": "(ImGui_ImplSDL2_GamepadMode mode,struct _SDL_GameController** manual_gamepads_array=nullptr,int manual_gamepads_count=-1)",
       "call_args": "(mode,manual_gamepads_array,manual_gamepads_count)",
+      "call_args_old": "(mode,manual_gamepads_array,manual_gamepads_count)",
       "cimguiname": "ImGui_ImplSDL2_SetGamepadMode",
       "defaults": {
         "manual_gamepads_array": "nullptr",
@@ -962,6 +1006,7 @@
       "argsT": [],
       "argsoriginal": "()",
       "call_args": "()",
+      "call_args_old": "()",
       "cimguiname": "ImGui_ImplSDL2_Shutdown",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_Shutdown",
@@ -983,6 +1028,7 @@
       ],
       "argsoriginal": "(SDL_Window* window)",
       "call_args": "(window)",
+      "call_args_old": "(window)",
       "cimguiname": "ImGui_ImplSDL3_InitForD3D",
       "defaults": {},
       "funcname": "ImGui_ImplSDL3_InitForD3D",
@@ -1004,6 +1050,7 @@
       ],
       "argsoriginal": "(SDL_Window* window)",
       "call_args": "(window)",
+      "call_args_old": "(window)",
       "cimguiname": "ImGui_ImplSDL3_InitForMetal",
       "defaults": {},
       "funcname": "ImGui_ImplSDL3_InitForMetal",
@@ -1029,6 +1076,7 @@
       ],
       "argsoriginal": "(SDL_Window* window,void* sdl_gl_context)",
       "call_args": "(window,sdl_gl_context)",
+      "call_args_old": "(window,sdl_gl_context)",
       "cimguiname": "ImGui_ImplSDL3_InitForOpenGL",
       "defaults": {},
       "funcname": "ImGui_ImplSDL3_InitForOpenGL",
@@ -1050,6 +1098,7 @@
       ],
       "argsoriginal": "(SDL_Window* window)",
       "call_args": "(window)",
+      "call_args_old": "(window)",
       "cimguiname": "ImGui_ImplSDL3_InitForOther",
       "defaults": {},
       "funcname": "ImGui_ImplSDL3_InitForOther",
@@ -1071,6 +1120,7 @@
       ],
       "argsoriginal": "(SDL_Window* window)",
       "call_args": "(window)",
+      "call_args_old": "(window)",
       "cimguiname": "ImGui_ImplSDL3_InitForSDLGPU",
       "defaults": {},
       "funcname": "ImGui_ImplSDL3_InitForSDLGPU",
@@ -1096,6 +1146,7 @@
       ],
       "argsoriginal": "(SDL_Window* window,SDL_Renderer* renderer)",
       "call_args": "(window,renderer)",
+      "call_args_old": "(window,renderer)",
       "cimguiname": "ImGui_ImplSDL3_InitForSDLRenderer",
       "defaults": {},
       "funcname": "ImGui_ImplSDL3_InitForSDLRenderer",
@@ -1117,6 +1168,7 @@
       ],
       "argsoriginal": "(SDL_Window* window)",
       "call_args": "(window)",
+      "call_args_old": "(window)",
       "cimguiname": "ImGui_ImplSDL3_InitForVulkan",
       "defaults": {},
       "funcname": "ImGui_ImplSDL3_InitForVulkan",
@@ -1133,6 +1185,7 @@
       "argsT": [],
       "argsoriginal": "()",
       "call_args": "()",
+      "call_args_old": "()",
       "cimguiname": "ImGui_ImplSDL3_NewFrame",
       "defaults": {},
       "funcname": "ImGui_ImplSDL3_NewFrame",
@@ -1154,6 +1207,7 @@
       ],
       "argsoriginal": "(const SDL_Event* event)",
       "call_args": "(event)",
+      "call_args_old": "(event)",
       "cimguiname": "ImGui_ImplSDL3_ProcessEvent",
       "defaults": {},
       "funcname": "ImGui_ImplSDL3_ProcessEvent",
@@ -1183,6 +1237,7 @@
       ],
       "argsoriginal": "(ImGui_ImplSDL3_GamepadMode mode,SDL_Gamepad** manual_gamepads_array=nullptr,int manual_gamepads_count=-1)",
       "call_args": "(mode,manual_gamepads_array,manual_gamepads_count)",
+      "call_args_old": "(mode,manual_gamepads_array,manual_gamepads_count)",
       "cimguiname": "ImGui_ImplSDL3_SetGamepadMode",
       "defaults": {
         "manual_gamepads_array": "nullptr",
@@ -1202,6 +1257,7 @@
       "argsT": [],
       "argsoriginal": "()",
       "call_args": "()",
+      "call_args_old": "()",
       "cimguiname": "ImGui_ImplSDL3_Shutdown",
       "defaults": {},
       "funcname": "ImGui_ImplSDL3_Shutdown",
@@ -1214,7 +1270,7 @@
   ],
   "ImGui_ImplVulkanH_CreateOrResizeWindow": [
     {
-      "args": "(VkInstance instance,VkPhysicalDevice physical_device,VkDevice device,ImGui_ImplVulkanH_Window* wd,uint32_t queue_family,const VkAllocationCallbacks* allocator,int w,int h,uint32_t min_image_count)",
+      "args": "(VkInstance instance,VkPhysicalDevice physical_device,VkDevice device,ImGui_ImplVulkanH_Window* wd,uint32_t queue_family,const VkAllocationCallbacks* allocator,int w,int h,uint32_t min_image_count,VkImageUsageFlags image_usage)",
       "argsT": [
         {
           "name": "instance",
@@ -1251,17 +1307,22 @@
         {
           "name": "min_image_count",
           "type": "uint32_t"
+        },
+        {
+          "name": "image_usage",
+          "type": "VkImageUsageFlags"
         }
       ],
-      "argsoriginal": "(VkInstance instance,VkPhysicalDevice physical_device,VkDevice device,ImGui_ImplVulkanH_Window* wd,uint32_t queue_family,const VkAllocationCallbacks* allocator,int w,int h,uint32_t min_image_count)",
-      "call_args": "(instance,physical_device,device,wd,queue_family,allocator,w,h,min_image_count)",
+      "argsoriginal": "(VkInstance instance,VkPhysicalDevice physical_device,VkDevice device,ImGui_ImplVulkanH_Window* wd,uint32_t queue_family,const VkAllocationCallbacks* allocator,int w,int h,uint32_t min_image_count,VkImageUsageFlags image_usage)",
+      "call_args": "(instance,physical_device,device,wd,queue_family,allocator,w,h,min_image_count,image_usage)",
+      "call_args_old": "(instance,physical_device,device,wd,queue_family,allocator,w,h,min_image_count,image_usage)",
       "cimguiname": "ImGui_ImplVulkanH_CreateOrResizeWindow",
       "defaults": {},
       "funcname": "ImGui_ImplVulkanH_CreateOrResizeWindow",
-      "location": "imgui_impl_vulkan:167",
+      "location": "imgui_impl_vulkan:193",
       "ov_cimguiname": "ImGui_ImplVulkanH_CreateOrResizeWindow",
       "ret": "void",
-      "signature": "(VkInstance,VkPhysicalDevice,VkDevice,ImGui_ImplVulkanH_Window*,uint32_t,const VkAllocationCallbacks*,int,int,uint32_t)",
+      "signature": "(VkInstance,VkPhysicalDevice,VkDevice,ImGui_ImplVulkanH_Window*,uint32_t,const VkAllocationCallbacks*,int,int,uint32_t,VkImageUsageFlags)",
       "stname": ""
     }
   ],
@@ -1288,10 +1349,11 @@
       ],
       "argsoriginal": "(VkInstance instance,VkDevice device,ImGui_ImplVulkanH_Window* wd,const VkAllocationCallbacks* allocator)",
       "call_args": "(instance,device,wd,allocator)",
+      "call_args_old": "(instance,device,wd,allocator)",
       "cimguiname": "ImGui_ImplVulkanH_DestroyWindow",
       "defaults": {},
       "funcname": "ImGui_ImplVulkanH_DestroyWindow",
-      "location": "imgui_impl_vulkan:168",
+      "location": "imgui_impl_vulkan:194",
       "ov_cimguiname": "ImGui_ImplVulkanH_DestroyWindow",
       "ret": "void",
       "signature": "(VkInstance,VkDevice,ImGui_ImplVulkanH_Window*,const VkAllocationCallbacks*)",
@@ -1309,16 +1371,39 @@
       ],
       "argsoriginal": "(VkPresentModeKHR present_mode)",
       "call_args": "(present_mode)",
+      "call_args_old": "(present_mode)",
       "cimguiname": "ImGui_ImplVulkanH_GetMinImageCountFromPresentMode",
       "defaults": {},
       "funcname": "ImGui_ImplVulkanH_GetMinImageCountFromPresentMode",
-      "location": "imgui_impl_vulkan:173",
+      "location": "imgui_impl_vulkan:199",
       "ov_cimguiname": "ImGui_ImplVulkanH_GetMinImageCountFromPresentMode",
       "ret": "int",
       "signature": "(VkPresentModeKHR)",
       "stname": ""
     }
   ],
+  "ImGui_ImplVulkanH_GetWindowDataFromViewport": [
+    {
+      "args": "(ImGuiViewport* viewport)",
+      "argsT": [
+        {
+          "name": "viewport",
+          "type": "ImGuiViewport*"
+        }
+      ],
+      "argsoriginal": "(ImGuiViewport* viewport)",
+      "call_args": "(viewport)",
+      "call_args_old": "(viewport)",
+      "cimguiname": "ImGui_ImplVulkanH_GetWindowDataFromViewport",
+      "defaults": {},
+      "funcname": "ImGui_ImplVulkanH_GetWindowDataFromViewport",
+      "location": "imgui_impl_vulkan:200",
+      "ov_cimguiname": "ImGui_ImplVulkanH_GetWindowDataFromViewport",
+      "ret": "ImGui_ImplVulkanH_Window*",
+      "signature": "(ImGuiViewport*)",
+      "stname": ""
+    }
+  ],
   "ImGui_ImplVulkanH_SelectPhysicalDevice": [
     {
       "args": "(VkInstance instance)",
@@ -1330,10 +1415,11 @@
       ],
       "argsoriginal": "(VkInstance instance)",
       "call_args": "(instance)",
+      "call_args_old": "(instance)",
       "cimguiname": "ImGui_ImplVulkanH_SelectPhysicalDevice",
       "defaults": {},
       "funcname": "ImGui_ImplVulkanH_SelectPhysicalDevice",
-      "location": "imgui_impl_vulkan:171",
+      "location": "imgui_impl_vulkan:197",
       "ov_cimguiname": "ImGui_ImplVulkanH_SelectPhysicalDevice",
       "ret": "VkPhysicalDevice",
       "signature": "(VkInstance)",
@@ -1363,10 +1449,11 @@
       ],
       "argsoriginal": "(VkPhysicalDevice physical_device,VkSurfaceKHR surface,const VkPresentModeKHR* request_modes,int request_modes_count)",
       "call_args": "(physical_device,surface,request_modes,request_modes_count)",
+      "call_args_old": "(physical_device,surface,request_modes,request_modes_count)",
       "cimguiname": "ImGui_ImplVulkanH_SelectPresentMode",
       "defaults": {},
       "funcname": "ImGui_ImplVulkanH_SelectPresentMode",
-      "location": "imgui_impl_vulkan:170",
+      "location": "imgui_impl_vulkan:196",
       "ov_cimguiname": "ImGui_ImplVulkanH_SelectPresentMode",
       "ret": "VkPresentModeKHR",
       "signature": "(VkPhysicalDevice,VkSurfaceKHR,const VkPresentModeKHR*,int)",
@@ -1384,10 +1471,11 @@
       ],
       "argsoriginal": "(VkPhysicalDevice physical_device)",
       "call_args": "(physical_device)",
+      "call_args_old": "(physical_device)",
       "cimguiname": "ImGui_ImplVulkanH_SelectQueueFamilyIndex",
       "defaults": {},
       "funcname": "ImGui_ImplVulkanH_SelectQueueFamilyIndex",
-      "location": "imgui_impl_vulkan:172",
+      "location": "imgui_impl_vulkan:198",
       "ov_cimguiname": "ImGui_ImplVulkanH_SelectQueueFamilyIndex",
       "ret": "uint32_t",
       "signature": "(VkPhysicalDevice)",
@@ -1421,10 +1509,11 @@
       ],
       "argsoriginal": "(VkPhysicalDevice physical_device,VkSurfaceKHR surface,const VkFormat* request_formats,int request_formats_count,VkColorSpaceKHR request_color_space)",
       "call_args": "(physical_device,surface,request_formats,request_formats_count,request_color_space)",
+      "call_args_old": "(physical_device,surface,request_formats,request_formats_count,request_color_space)",
       "cimguiname": "ImGui_ImplVulkanH_SelectSurfaceFormat",
       "defaults": {},
       "funcname": "ImGui_ImplVulkanH_SelectSurfaceFormat",
-      "location": "imgui_impl_vulkan:169",
+      "location": "imgui_impl_vulkan:195",
       "ov_cimguiname": "ImGui_ImplVulkanH_SelectSurfaceFormat",
       "ret": "VkSurfaceFormatKHR",
       "signature": "(VkPhysicalDevice,VkSurfaceKHR,const VkFormat*,int,VkColorSpaceKHR)",
@@ -1437,11 +1526,12 @@
       "argsT": [],
       "argsoriginal": "()",
       "call_args": "()",
+      "call_args_old": "()",
       "cimguiname": "ImGui_ImplVulkanH_Window_ImGui_ImplVulkanH_Window",
       "constructor": true,
       "defaults": {},
       "funcname": "ImGui_ImplVulkanH_Window",
-      "location": "imgui_impl_vulkan:215",
+      "location": "imgui_impl_vulkan:242",
       "ov_cimguiname": "ImGui_ImplVulkanH_Window_ImGui_ImplVulkanH_Window",
       "signature": "()",
       "stname": "ImGui_ImplVulkanH_Window"
@@ -1460,7 +1550,7 @@
       "cimguiname": "ImGui_ImplVulkanH_Window_destroy",
       "defaults": {},
       "destructor": true,
-      "location": "imgui_impl_vulkan:215",
+      "location": "imgui_impl_vulkan:242",
       "ov_cimguiname": "ImGui_ImplVulkanH_Window_destroy",
       "ret": "void",
       "signature": "(ImGui_ImplVulkanH_Window*)",
@@ -1486,16 +1576,39 @@
       ],
       "argsoriginal": "(VkSampler sampler,VkImageView image_view,VkImageLayout image_layout)",
       "call_args": "(sampler,image_view,image_layout)",
+      "call_args_old": "(sampler,image_view,image_layout)",
       "cimguiname": "ImGui_ImplVulkan_AddTexture",
       "defaults": {},
       "funcname": "ImGui_ImplVulkan_AddTexture",
-      "location": "imgui_impl_vulkan:124",
+      "location": "imgui_impl_vulkan:150",
       "ov_cimguiname": "ImGui_ImplVulkan_AddTexture",
       "ret": "VkDescriptorSet",
       "signature": "(VkSampler,VkImageView,VkImageLayout)",
       "stname": ""
     }
   ],
+  "ImGui_ImplVulkan_CreateMainPipeline": [
+    {
+      "args": "(const ImGui_ImplVulkan_PipelineInfo* info)",
+      "argsT": [
+        {
+          "name": "info",
+          "type": "const ImGui_ImplVulkan_PipelineInfo*"
+        }
+      ],
+      "argsoriginal": "(const ImGui_ImplVulkan_PipelineInfo* info)",
+      "call_args": "(info)",
+      "call_args_old": "(info)",
+      "cimguiname": "ImGui_ImplVulkan_CreateMainPipeline",
+      "defaults": {},
+      "funcname": "ImGui_ImplVulkan_CreateMainPipeline",
+      "location": "imgui_impl_vulkan:142",
+      "ov_cimguiname": "ImGui_ImplVulkan_CreateMainPipeline",
+      "ret": "void",
+      "signature": "(const ImGui_ImplVulkan_PipelineInfo*)",
+      "stname": ""
+    }
+  ],
   "ImGui_ImplVulkan_Init": [
     {
       "args": "(ImGui_ImplVulkan_InitInfo* info)",
@@ -1507,10 +1620,11 @@
       ],
       "argsoriginal": "(ImGui_ImplVulkan_InitInfo* info)",
       "call_args": "(info)",
+      "call_args_old": "(info)",
       "cimguiname": "ImGui_ImplVulkan_Init",
       "defaults": {},
       "funcname": "ImGui_ImplVulkan_Init",
-      "location": "imgui_impl_vulkan:112",
+      "location": "imgui_impl_vulkan:133",
       "ov_cimguiname": "ImGui_ImplVulkan_Init",
       "ret": "bool",
       "signature": "(ImGui_ImplVulkan_InitInfo*)",
@@ -1536,12 +1650,13 @@
       ],
       "argsoriginal": "(uint32_t api_version,PFN_vkVoidFunction(*loader_func)(const char* function_name,void* user_data),void* user_data=nullptr)",
       "call_args": "(api_version,user_data),user_data)",
+      "call_args_old": "(api_version,user_data),user_data)",
       "cimguiname": "ImGui_ImplVulkan_LoadFunctions",
       "defaults": {
         "user_data": "nullptr"
       },
       "funcname": "ImGui_ImplVulkan_LoadFunctions",
-      "location": "imgui_impl_vulkan:129",
+      "location": "imgui_impl_vulkan:155",
       "ov_cimguiname": "ImGui_ImplVulkan_LoadFunctions",
       "ret": "bool",
       "signature": "(uint32_t,PFN_vkVoidFunction(*loader_func)(const char* function_name,void*,void*)",
@@ -1554,10 +1669,11 @@
       "argsT": [],
       "argsoriginal": "()",
       "call_args": "()",
+      "call_args_old": "()",
       "cimguiname": "ImGui_ImplVulkan_NewFrame",
       "defaults": {},
       "funcname": "ImGui_ImplVulkan_NewFrame",
-      "location": "imgui_impl_vulkan:114",
+      "location": "imgui_impl_vulkan:135",
       "ov_cimguiname": "ImGui_ImplVulkan_NewFrame",
       "ret": "void",
       "signature": "()",
@@ -1575,10 +1691,11 @@
       ],
       "argsoriginal": "(VkDescriptorSet descriptor_set)",
       "call_args": "(descriptor_set)",
+      "call_args_old": "(descriptor_set)",
       "cimguiname": "ImGui_ImplVulkan_RemoveTexture",
       "defaults": {},
       "funcname": "ImGui_ImplVulkan_RemoveTexture",
-      "location": "imgui_impl_vulkan:125",
+      "location": "imgui_impl_vulkan:151",
       "ov_cimguiname": "ImGui_ImplVulkan_RemoveTexture",
       "ret": "void",
       "signature": "(VkDescriptorSet)",
@@ -1604,12 +1721,13 @@
       ],
       "argsoriginal": "(ImDrawData* draw_data,VkCommandBuffer command_buffer,VkPipeline pipeline=0ULL)",
       "call_args": "(draw_data,command_buffer,pipeline)",
+      "call_args_old": "(draw_data,command_buffer,pipeline)",
       "cimguiname": "ImGui_ImplVulkan_RenderDrawData",
       "defaults": {
         "pipeline": "0ULL"
       },
       "funcname": "ImGui_ImplVulkan_RenderDrawData",
-      "location": "imgui_impl_vulkan:115",
+      "location": "imgui_impl_vulkan:136",
       "ov_cimguiname": "ImGui_ImplVulkan_RenderDrawData",
       "ret": "void",
       "signature": "(ImDrawData*,VkCommandBuffer,VkPipeline)",
@@ -1627,10 +1745,11 @@
       ],
       "argsoriginal": "(uint32_t min_image_count)",
       "call_args": "(min_image_count)",
+      "call_args_old": "(min_image_count)",
       "cimguiname": "ImGui_ImplVulkan_SetMinImageCount",
       "defaults": {},
       "funcname": "ImGui_ImplVulkan_SetMinImageCount",
-      "location": "imgui_impl_vulkan:116",
+      "location": "imgui_impl_vulkan:137",
       "ov_cimguiname": "ImGui_ImplVulkan_SetMinImageCount",
       "ret": "void",
       "signature": "(uint32_t)",
@@ -1643,10 +1762,11 @@
       "argsT": [],
       "argsoriginal": "()",
       "call_args": "()",
+      "call_args_old": "()",
       "cimguiname": "ImGui_ImplVulkan_Shutdown",
       "defaults": {},
       "funcname": "ImGui_ImplVulkan_Shutdown",
-      "location": "imgui_impl_vulkan:113",
+      "location": "imgui_impl_vulkan:134",
       "ov_cimguiname": "ImGui_ImplVulkan_Shutdown",
       "ret": "void",
       "signature": "()",
@@ -1664,10 +1784,11 @@
       ],
       "argsoriginal": "(ImTextureData* tex)",
       "call_args": "(tex)",
+      "call_args_old": "(tex)",
       "cimguiname": "ImGui_ImplVulkan_UpdateTexture",
       "defaults": {},
       "funcname": "ImGui_ImplVulkan_UpdateTexture",
-      "location": "imgui_impl_vulkan:119",
+      "location": "imgui_impl_vulkan:145",
       "ov_cimguiname": "ImGui_ImplVulkan_UpdateTexture",
       "ret": "void",
       "signature": "(ImTextureData*)",

generator/output/impl_definitions.lua

@@ -11,6 +11,7 @@ local t={
           type="unsigned int"}},
       argsoriginal="(GLFWwindow* window,unsigned int c)",
       call_args="(window,c)",
+      call_args_old="(window,c)",
       cimguiname="ImGui_ImplGlfw_CharCallback",
       defaults={},
       funcname="ImGui_ImplGlfw_CharCallback",
@@ -32,6 +33,7 @@ local t={
           type="int"}},
       argsoriginal="(GLFWwindow* window,int entered)",
       call_args="(window,entered)",
+      call_args_old="(window,entered)",
       cimguiname="ImGui_ImplGlfw_CursorEnterCallback",
       defaults={},
       funcname="ImGui_ImplGlfw_CursorEnterCallback",
@@ -56,6 +58,7 @@ local t={
           type="double"}},
       argsoriginal="(GLFWwindow* window,double x,double y)",
       call_args="(window,x,y)",
+      call_args_old="(window,x,y)",
       cimguiname="ImGui_ImplGlfw_CursorPosCallback",
       defaults={},
       funcname="ImGui_ImplGlfw_CursorPosCallback",
@@ -74,6 +77,7 @@ local t={
           type="GLFWmonitor*"}},
       argsoriginal="(GLFWmonitor* monitor)",
       call_args="(monitor)",
+      call_args_old="(monitor)",
       cimguiname="ImGui_ImplGlfw_GetContentScaleForMonitor",
       defaults={},
       funcname="ImGui_ImplGlfw_GetContentScaleForMonitor",
@@ -92,6 +96,7 @@ local t={
           type="GLFWwindow*"}},
       argsoriginal="(GLFWwindow* window)",
       call_args="(window)",
+      call_args_old="(window)",
       cimguiname="ImGui_ImplGlfw_GetContentScaleForWindow",
       defaults={},
       funcname="ImGui_ImplGlfw_GetContentScaleForWindow",
@@ -113,6 +118,7 @@ local t={
           type="bool"}},
       argsoriginal="(GLFWwindow* window,bool install_callbacks)",
       call_args="(window,install_callbacks)",
+      call_args_old="(window,install_callbacks)",
       cimguiname="ImGui_ImplGlfw_InitForOpenGL",
       defaults={},
       funcname="ImGui_ImplGlfw_InitForOpenGL",
@@ -134,6 +140,7 @@ local t={
           type="bool"}},
       argsoriginal="(GLFWwindow* window,bool install_callbacks)",
       call_args="(window,install_callbacks)",
+      call_args_old="(window,install_callbacks)",
       cimguiname="ImGui_ImplGlfw_InitForOther",
       defaults={},
       funcname="ImGui_ImplGlfw_InitForOther",
@@ -155,6 +162,7 @@ local t={
           type="bool"}},
       argsoriginal="(GLFWwindow* window,bool install_callbacks)",
       call_args="(window,install_callbacks)",
+      call_args_old="(window,install_callbacks)",
       cimguiname="ImGui_ImplGlfw_InitForVulkan",
       defaults={},
       funcname="ImGui_ImplGlfw_InitForVulkan",
@@ -173,6 +181,7 @@ local t={
           type="GLFWwindow*"}},
       argsoriginal="(GLFWwindow* window)",
       call_args="(window)",
+      call_args_old="(window)",
       cimguiname="ImGui_ImplGlfw_InstallCallbacks",
       defaults={},
       funcname="ImGui_ImplGlfw_InstallCallbacks",
@@ -203,6 +212,7 @@ local t={
           type="int"}},
       argsoriginal="(GLFWwindow* window,int key,int scancode,int action,int mods)",
       call_args="(window,key,scancode,action,mods)",
+      call_args_old="(window,key,scancode,action,mods)",
       cimguiname="ImGui_ImplGlfw_KeyCallback",
       defaults={},
       funcname="ImGui_ImplGlfw_KeyCallback",
@@ -224,6 +234,7 @@ local t={
           type="int"}},
       argsoriginal="(GLFWmonitor* monitor,int event)",
       call_args="(monitor,event)",
+      call_args_old="(monitor,event)",
       cimguiname="ImGui_ImplGlfw_MonitorCallback",
       defaults={},
       funcname="ImGui_ImplGlfw_MonitorCallback",
@@ -251,6 +262,7 @@ local t={
           type="int"}},
       argsoriginal="(GLFWwindow* window,int button,int action,int mods)",
       call_args="(window,button,action,mods)",
+      call_args_old="(window,button,action,mods)",
       cimguiname="ImGui_ImplGlfw_MouseButtonCallback",
       defaults={},
       funcname="ImGui_ImplGlfw_MouseButtonCallback",
@@ -266,6 +278,7 @@ local t={
       argsT={},
       argsoriginal="()",
       call_args="()",
+      call_args_old="()",
       cimguiname="ImGui_ImplGlfw_NewFrame",
       defaults={},
       funcname="ImGui_ImplGlfw_NewFrame",
@@ -284,6 +297,7 @@ local t={
           type="GLFWwindow*"}},
       argsoriginal="(GLFWwindow* window)",
       call_args="(window)",
+      call_args_old="(window)",
       cimguiname="ImGui_ImplGlfw_RestoreCallbacks",
       defaults={},
       funcname="ImGui_ImplGlfw_RestoreCallbacks",
@@ -308,6 +322,7 @@ local t={
           type="double"}},
       argsoriginal="(GLFWwindow* window,double xoffset,double yoffset)",
       call_args="(window,xoffset,yoffset)",
+      call_args_old="(window,xoffset,yoffset)",
       cimguiname="ImGui_ImplGlfw_ScrollCallback",
       defaults={},
       funcname="ImGui_ImplGlfw_ScrollCallback",
@@ -326,6 +341,7 @@ local t={
           type="bool"}},
       argsoriginal="(bool chain_for_all_windows)",
       call_args="(chain_for_all_windows)",
+      call_args_old="(chain_for_all_windows)",
       cimguiname="ImGui_ImplGlfw_SetCallbacksChainForAllWindows",
       defaults={},
       funcname="ImGui_ImplGlfw_SetCallbacksChainForAllWindows",
@@ -341,6 +357,7 @@ local t={
       argsT={},
       argsoriginal="()",
       call_args="()",
+      call_args_old="()",
       cimguiname="ImGui_ImplGlfw_Shutdown",
       defaults={},
       funcname="ImGui_ImplGlfw_Shutdown",
@@ -359,6 +376,7 @@ local t={
           type="int"}},
       argsoriginal="(int milliseconds)",
       call_args="(milliseconds)",
+      call_args_old="(milliseconds)",
       cimguiname="ImGui_ImplGlfw_Sleep",
       defaults={},
       funcname="ImGui_ImplGlfw_Sleep",
@@ -380,6 +398,7 @@ local t={
           type="int"}},
       argsoriginal="(GLFWwindow* window,int focused)",
       call_args="(window,focused)",
+      call_args_old="(window,focused)",
       cimguiname="ImGui_ImplGlfw_WindowFocusCallback",
       defaults={},
       funcname="ImGui_ImplGlfw_WindowFocusCallback",
@@ -395,6 +414,7 @@ local t={
       argsT={},
       argsoriginal="()",
       call_args="()",
+      call_args_old="()",
       cimguiname="ImGui_ImplOpenGL2_CreateDeviceObjects",
       defaults={},
       funcname="ImGui_ImplOpenGL2_CreateDeviceObjects",
@@ -410,6 +430,7 @@ local t={
       argsT={},
       argsoriginal="()",
       call_args="()",
+      call_args_old="()",
       cimguiname="ImGui_ImplOpenGL2_DestroyDeviceObjects",
       defaults={},
       funcname="ImGui_ImplOpenGL2_DestroyDeviceObjects",
@@ -425,6 +446,7 @@ local t={
       argsT={},
       argsoriginal="()",
       call_args="()",
+      call_args_old="()",
       cimguiname="ImGui_ImplOpenGL2_Init",
       defaults={},
       funcname="ImGui_ImplOpenGL2_Init",
@@ -440,6 +462,7 @@ local t={
       argsT={},
       argsoriginal="()",
       call_args="()",
+      call_args_old="()",
       cimguiname="ImGui_ImplOpenGL2_NewFrame",
       defaults={},
       funcname="ImGui_ImplOpenGL2_NewFrame",
@@ -458,6 +481,7 @@ local t={
           type="ImDrawData*"}},
       argsoriginal="(ImDrawData* draw_data)",
       call_args="(draw_data)",
+      call_args_old="(draw_data)",
       cimguiname="ImGui_ImplOpenGL2_RenderDrawData",
       defaults={},
       funcname="ImGui_ImplOpenGL2_RenderDrawData",
@@ -473,6 +497,7 @@ local t={
       argsT={},
       argsoriginal="()",
       call_args="()",
+      call_args_old="()",
       cimguiname="ImGui_ImplOpenGL2_Shutdown",
       defaults={},
       funcname="ImGui_ImplOpenGL2_Shutdown",
@@ -491,6 +516,7 @@ local t={
           type="ImTextureData*"}},
       argsoriginal="(ImTextureData* tex)",
       call_args="(tex)",
+      call_args_old="(tex)",
       cimguiname="ImGui_ImplOpenGL2_UpdateTexture",
       defaults={},
       funcname="ImGui_ImplOpenGL2_UpdateTexture",
@@ -506,6 +532,7 @@ local t={
       argsT={},
       argsoriginal="()",
       call_args="()",
+      call_args_old="()",
       cimguiname="ImGui_ImplOpenGL3_CreateDeviceObjects",
       defaults={},
       funcname="ImGui_ImplOpenGL3_CreateDeviceObjects",
@@ -521,6 +548,7 @@ local t={
       argsT={},
       argsoriginal="()",
       call_args="()",
+      call_args_old="()",
       cimguiname="ImGui_ImplOpenGL3_DestroyDeviceObjects",
       defaults={},
       funcname="ImGui_ImplOpenGL3_DestroyDeviceObjects",
@@ -539,6 +567,7 @@ local t={
           type="const char*"}},
       argsoriginal="(const char* glsl_version=nullptr)",
       call_args="(glsl_version)",
+      call_args_old="(glsl_version)",
       cimguiname="ImGui_ImplOpenGL3_Init",
       defaults={
         glsl_version="nullptr"},
@@ -555,6 +584,7 @@ local t={
       argsT={},
       argsoriginal="()",
       call_args="()",
+      call_args_old="()",
       cimguiname="ImGui_ImplOpenGL3_NewFrame",
       defaults={},
       funcname="ImGui_ImplOpenGL3_NewFrame",
@@ -573,6 +603,7 @@ local t={
           type="ImDrawData*"}},
       argsoriginal="(ImDrawData* draw_data)",
       call_args="(draw_data)",
+      call_args_old="(draw_data)",
       cimguiname="ImGui_ImplOpenGL3_RenderDrawData",
       defaults={},
       funcname="ImGui_ImplOpenGL3_RenderDrawData",
@@ -588,6 +619,7 @@ local t={
       argsT={},
       argsoriginal="()",
       call_args="()",
+      call_args_old="()",
       cimguiname="ImGui_ImplOpenGL3_Shutdown",
       defaults={},
       funcname="ImGui_ImplOpenGL3_Shutdown",
@@ -606,6 +638,7 @@ local t={
           type="ImTextureData*"}},
       argsoriginal="(ImTextureData* tex)",
       call_args="(tex)",
+      call_args_old="(tex)",
       cimguiname="ImGui_ImplOpenGL3_UpdateTexture",
       defaults={},
       funcname="ImGui_ImplOpenGL3_UpdateTexture",
@@ -624,6 +657,7 @@ local t={
           type="int"}},
       argsoriginal="(int display_index)",
       call_args="(display_index)",
+      call_args_old="(display_index)",
       cimguiname="ImGui_ImplSDL2_GetContentScaleForDisplay",
       defaults={},
       funcname="ImGui_ImplSDL2_GetContentScaleForDisplay",
@@ -642,6 +676,7 @@ local t={
           type="SDL_Window*"}},
       argsoriginal="(SDL_Window* window)",
       call_args="(window)",
+      call_args_old="(window)",
       cimguiname="ImGui_ImplSDL2_GetContentScaleForWindow",
       defaults={},
       funcname="ImGui_ImplSDL2_GetContentScaleForWindow",
@@ -660,6 +695,7 @@ local t={
           type="SDL_Window*"}},
       argsoriginal="(SDL_Window* window)",
       call_args="(window)",
+      call_args_old="(window)",
       cimguiname="ImGui_ImplSDL2_InitForD3D",
       defaults={},
       funcname="ImGui_ImplSDL2_InitForD3D",
@@ -678,6 +714,7 @@ local t={
           type="SDL_Window*"}},
       argsoriginal="(SDL_Window* window)",
       call_args="(window)",
+      call_args_old="(window)",
       cimguiname="ImGui_ImplSDL2_InitForMetal",
       defaults={},
       funcname="ImGui_ImplSDL2_InitForMetal",
@@ -699,6 +736,7 @@ local t={
           type="void*"}},
       argsoriginal="(SDL_Window* window,void* sdl_gl_context)",
       call_args="(window,sdl_gl_context)",
+      call_args_old="(window,sdl_gl_context)",
       cimguiname="ImGui_ImplSDL2_InitForOpenGL",
       defaults={},
       funcname="ImGui_ImplSDL2_InitForOpenGL",
@@ -717,6 +755,7 @@ local t={
           type="SDL_Window*"}},
       argsoriginal="(SDL_Window* window)",
       call_args="(window)",
+      call_args_old="(window)",
       cimguiname="ImGui_ImplSDL2_InitForOther",
       defaults={},
       funcname="ImGui_ImplSDL2_InitForOther",
@@ -738,6 +777,7 @@ local t={
           type="SDL_Renderer*"}},
       argsoriginal="(SDL_Window* window,SDL_Renderer* renderer)",
       call_args="(window,renderer)",
+      call_args_old="(window,renderer)",
       cimguiname="ImGui_ImplSDL2_InitForSDLRenderer",
       defaults={},
       funcname="ImGui_ImplSDL2_InitForSDLRenderer",
@@ -756,6 +796,7 @@ local t={
           type="SDL_Window*"}},
       argsoriginal="(SDL_Window* window)",
       call_args="(window)",
+      call_args_old="(window)",
       cimguiname="ImGui_ImplSDL2_InitForVulkan",
       defaults={},
       funcname="ImGui_ImplSDL2_InitForVulkan",
@@ -771,6 +812,7 @@ local t={
       argsT={},
       argsoriginal="()",
       call_args="()",
+      call_args_old="()",
       cimguiname="ImGui_ImplSDL2_NewFrame",
       defaults={},
       funcname="ImGui_ImplSDL2_NewFrame",
@@ -789,6 +831,7 @@ local t={
           type="const SDL_Event*"}},
       argsoriginal="(const SDL_Event* event)",
       call_args="(event)",
+      call_args_old="(event)",
       cimguiname="ImGui_ImplSDL2_ProcessEvent",
       defaults={},
       funcname="ImGui_ImplSDL2_ProcessEvent",
@@ -813,6 +856,7 @@ local t={
           type="int"}},
       argsoriginal="(ImGui_ImplSDL2_GamepadMode mode,struct _SDL_GameController** manual_gamepads_array=nullptr,int manual_gamepads_count=-1)",
       call_args="(mode,manual_gamepads_array,manual_gamepads_count)",
+      call_args_old="(mode,manual_gamepads_array,manual_gamepads_count)",
       cimguiname="ImGui_ImplSDL2_SetGamepadMode",
       defaults={
         manual_gamepads_array="nullptr",
@@ -830,6 +874,7 @@ local t={
       argsT={},
       argsoriginal="()",
       call_args="()",
+      call_args_old="()",
       cimguiname="ImGui_ImplSDL2_Shutdown",
       defaults={},
       funcname="ImGui_ImplSDL2_Shutdown",
@@ -848,6 +893,7 @@ local t={
           type="SDL_Window*"}},
       argsoriginal="(SDL_Window* window)",
       call_args="(window)",
+      call_args_old="(window)",
       cimguiname="ImGui_ImplSDL3_InitForD3D",
       defaults={},
       funcname="ImGui_ImplSDL3_InitForD3D",
@@ -866,6 +912,7 @@ local t={
           type="SDL_Window*"}},
       argsoriginal="(SDL_Window* window)",
       call_args="(window)",
+      call_args_old="(window)",
       cimguiname="ImGui_ImplSDL3_InitForMetal",
       defaults={},
       funcname="ImGui_ImplSDL3_InitForMetal",
@@ -887,6 +934,7 @@ local t={
           type="void*"}},
       argsoriginal="(SDL_Window* window,void* sdl_gl_context)",
       call_args="(window,sdl_gl_context)",
+      call_args_old="(window,sdl_gl_context)",
       cimguiname="ImGui_ImplSDL3_InitForOpenGL",
       defaults={},
       funcname="ImGui_ImplSDL3_InitForOpenGL",
@@ -905,6 +953,7 @@ local t={
           type="SDL_Window*"}},
       argsoriginal="(SDL_Window* window)",
       call_args="(window)",
+      call_args_old="(window)",
       cimguiname="ImGui_ImplSDL3_InitForOther",
       defaults={},
       funcname="ImGui_ImplSDL3_InitForOther",
@@ -923,6 +972,7 @@ local t={
           type="SDL_Window*"}},
       argsoriginal="(SDL_Window* window)",
       call_args="(window)",
+      call_args_old="(window)",
       cimguiname="ImGui_ImplSDL3_InitForSDLGPU",
       defaults={},
       funcname="ImGui_ImplSDL3_InitForSDLGPU",
@@ -944,6 +994,7 @@ local t={
           type="SDL_Renderer*"}},
       argsoriginal="(SDL_Window* window,SDL_Renderer* renderer)",
       call_args="(window,renderer)",
+      call_args_old="(window,renderer)",
       cimguiname="ImGui_ImplSDL3_InitForSDLRenderer",
       defaults={},
       funcname="ImGui_ImplSDL3_InitForSDLRenderer",
@@ -962,6 +1013,7 @@ local t={
           type="SDL_Window*"}},
       argsoriginal="(SDL_Window* window)",
       call_args="(window)",
+      call_args_old="(window)",
       cimguiname="ImGui_ImplSDL3_InitForVulkan",
       defaults={},
       funcname="ImGui_ImplSDL3_InitForVulkan",
@@ -977,6 +1029,7 @@ local t={
       argsT={},
       argsoriginal="()",
       call_args="()",
+      call_args_old="()",
       cimguiname="ImGui_ImplSDL3_NewFrame",
       defaults={},
       funcname="ImGui_ImplSDL3_NewFrame",
@@ -995,6 +1048,7 @@ local t={
           type="const SDL_Event*"}},
       argsoriginal="(const SDL_Event* event)",
       call_args="(event)",
+      call_args_old="(event)",
       cimguiname="ImGui_ImplSDL3_ProcessEvent",
       defaults={},
       funcname="ImGui_ImplSDL3_ProcessEvent",
@@ -1019,6 +1073,7 @@ local t={
           type="int"}},
       argsoriginal="(ImGui_ImplSDL3_GamepadMode mode,SDL_Gamepad** manual_gamepads_array=nullptr,int manual_gamepads_count=-1)",
       call_args="(mode,manual_gamepads_array,manual_gamepads_count)",
+      call_args_old="(mode,manual_gamepads_array,manual_gamepads_count)",
       cimguiname="ImGui_ImplSDL3_SetGamepadMode",
       defaults={
         manual_gamepads_array="nullptr",
@@ -1036,6 +1091,7 @@ local t={
       argsT={},
       argsoriginal="()",
       call_args="()",
+      call_args_old="()",
       cimguiname="ImGui_ImplSDL3_Shutdown",
       defaults={},
       funcname="ImGui_ImplSDL3_Shutdown",
@@ -1047,7 +1103,7 @@ local t={
     ["()"]=nil},
   ImGui_ImplVulkanH_CreateOrResizeWindow={
     [1]={
-      args="(VkInstance instance,VkPhysicalDevice physical_device,VkDevice device,ImGui_ImplVulkanH_Window* wd,uint32_t queue_family,const VkAllocationCallbacks* allocator,int w,int h,uint32_t min_image_count)",
+      args="(VkInstance instance,VkPhysicalDevice physical_device,VkDevice device,ImGui_ImplVulkanH_Window* wd,uint32_t queue_family,const VkAllocationCallbacks* allocator,int w,int h,uint32_t min_image_count,VkImageUsageFlags image_usage)",
       argsT={
         [1]={
           name="instance",
@@ -1075,18 +1131,22 @@ local t={
           type="int"},
         [9]={
           name="min_image_count",
-          type="uint32_t"}},
-      argsoriginal="(VkInstance instance,VkPhysicalDevice physical_device,VkDevice device,ImGui_ImplVulkanH_Window* wd,uint32_t queue_family,const VkAllocationCallbacks* allocator,int w,int h,uint32_t min_image_count)",
-      call_args="(instance,physical_device,device,wd,queue_family,allocator,w,h,min_image_count)",
+          type="uint32_t"},
+        [10]={
+          name="image_usage",
+          type="VkImageUsageFlags"}},
+      argsoriginal="(VkInstance instance,VkPhysicalDevice physical_device,VkDevice device,ImGui_ImplVulkanH_Window* wd,uint32_t queue_family,const VkAllocationCallbacks* allocator,int w,int h,uint32_t min_image_count,VkImageUsageFlags image_usage)",
+      call_args="(instance,physical_device,device,wd,queue_family,allocator,w,h,min_image_count,image_usage)",
+      call_args_old="(instance,physical_device,device,wd,queue_family,allocator,w,h,min_image_count,image_usage)",
       cimguiname="ImGui_ImplVulkanH_CreateOrResizeWindow",
       defaults={},
       funcname="ImGui_ImplVulkanH_CreateOrResizeWindow",
-      location="imgui_impl_vulkan:167",
+      location="imgui_impl_vulkan:193",
       ov_cimguiname="ImGui_ImplVulkanH_CreateOrResizeWindow",
       ret="void",
-      signature="(VkInstance,VkPhysicalDevice,VkDevice,ImGui_ImplVulkanH_Window*,uint32_t,const VkAllocationCallbacks*,int,int,uint32_t)",
+      signature="(VkInstance,VkPhysicalDevice,VkDevice,ImGui_ImplVulkanH_Window*,uint32_t,const VkAllocationCallbacks*,int,int,uint32_t,VkImageUsageFlags)",
       stname=""},
-    ["(VkInstance,VkPhysicalDevice,VkDevice,ImGui_ImplVulkanH_Window*,uint32_t,const VkAllocationCallbacks*,int,int,uint32_t)"]=nil},
+    ["(VkInstance,VkPhysicalDevice,VkDevice,ImGui_ImplVulkanH_Window*,uint32_t,const VkAllocationCallbacks*,int,int,uint32_t,VkImageUsageFlags)"]=nil},
   ImGui_ImplVulkanH_DestroyWindow={
     [1]={
       args="(VkInstance instance,VkDevice device,ImGui_ImplVulkanH_Window* wd,const VkAllocationCallbacks* allocator)",
@@ -1105,10 +1165,11 @@ local t={
           type="const VkAllocationCallbacks*"}},
       argsoriginal="(VkInstance instance,VkDevice device,ImGui_ImplVulkanH_Window* wd,const VkAllocationCallbacks* allocator)",
       call_args="(instance,device,wd,allocator)",
+      call_args_old="(instance,device,wd,allocator)",
       cimguiname="ImGui_ImplVulkanH_DestroyWindow",
       defaults={},
       funcname="ImGui_ImplVulkanH_DestroyWindow",
-      location="imgui_impl_vulkan:168",
+      location="imgui_impl_vulkan:194",
       ov_cimguiname="ImGui_ImplVulkanH_DestroyWindow",
       ret="void",
       signature="(VkInstance,VkDevice,ImGui_ImplVulkanH_Window*,const VkAllocationCallbacks*)",
@@ -1123,15 +1184,35 @@ local t={
           type="VkPresentModeKHR"}},
       argsoriginal="(VkPresentModeKHR present_mode)",
       call_args="(present_mode)",
+      call_args_old="(present_mode)",
       cimguiname="ImGui_ImplVulkanH_GetMinImageCountFromPresentMode",
       defaults={},
       funcname="ImGui_ImplVulkanH_GetMinImageCountFromPresentMode",
-      location="imgui_impl_vulkan:173",
+      location="imgui_impl_vulkan:199",
       ov_cimguiname="ImGui_ImplVulkanH_GetMinImageCountFromPresentMode",
       ret="int",
       signature="(VkPresentModeKHR)",
       stname=""},
     ["(VkPresentModeKHR)"]=nil},
+  ImGui_ImplVulkanH_GetWindowDataFromViewport={
+    [1]={
+      args="(ImGuiViewport* viewport)",
+      argsT={
+        [1]={
+          name="viewport",
+          type="ImGuiViewport*"}},
+      argsoriginal="(ImGuiViewport* viewport)",
+      call_args="(viewport)",
+      call_args_old="(viewport)",
+      cimguiname="ImGui_ImplVulkanH_GetWindowDataFromViewport",
+      defaults={},
+      funcname="ImGui_ImplVulkanH_GetWindowDataFromViewport",
+      location="imgui_impl_vulkan:200",
+      ov_cimguiname="ImGui_ImplVulkanH_GetWindowDataFromViewport",
+      ret="ImGui_ImplVulkanH_Window*",
+      signature="(ImGuiViewport*)",
+      stname=""},
+    ["(ImGuiViewport*)"]=nil},
   ImGui_ImplVulkanH_SelectPhysicalDevice={
     [1]={
       args="(VkInstance instance)",
@@ -1141,10 +1222,11 @@ local t={
           type="VkInstance"}},
       argsoriginal="(VkInstance instance)",
       call_args="(instance)",
+      call_args_old="(instance)",
       cimguiname="ImGui_ImplVulkanH_SelectPhysicalDevice",
       defaults={},
       funcname="ImGui_ImplVulkanH_SelectPhysicalDevice",
-      location="imgui_impl_vulkan:171",
+      location="imgui_impl_vulkan:197",
       ov_cimguiname="ImGui_ImplVulkanH_SelectPhysicalDevice",
       ret="VkPhysicalDevice",
       signature="(VkInstance)",
@@ -1168,10 +1250,11 @@ local t={
           type="int"}},
       argsoriginal="(VkPhysicalDevice physical_device,VkSurfaceKHR surface,const VkPresentModeKHR* request_modes,int request_modes_count)",
       call_args="(physical_device,surface,request_modes,request_modes_count)",
+      call_args_old="(physical_device,surface,request_modes,request_modes_count)",
       cimguiname="ImGui_ImplVulkanH_SelectPresentMode",
       defaults={},
       funcname="ImGui_ImplVulkanH_SelectPresentMode",
-      location="imgui_impl_vulkan:170",
+      location="imgui_impl_vulkan:196",
       ov_cimguiname="ImGui_ImplVulkanH_SelectPresentMode",
       ret="VkPresentModeKHR",
       signature="(VkPhysicalDevice,VkSurfaceKHR,const VkPresentModeKHR*,int)",
@@ -1186,10 +1269,11 @@ local t={
           type="VkPhysicalDevice"}},
       argsoriginal="(VkPhysicalDevice physical_device)",
       call_args="(physical_device)",
+      call_args_old="(physical_device)",
       cimguiname="ImGui_ImplVulkanH_SelectQueueFamilyIndex",
       defaults={},
       funcname="ImGui_ImplVulkanH_SelectQueueFamilyIndex",
-      location="imgui_impl_vulkan:172",
+      location="imgui_impl_vulkan:198",
       ov_cimguiname="ImGui_ImplVulkanH_SelectQueueFamilyIndex",
       ret="uint32_t",
       signature="(VkPhysicalDevice)",
@@ -1216,10 +1300,11 @@ local t={
           type="VkColorSpaceKHR"}},
       argsoriginal="(VkPhysicalDevice physical_device,VkSurfaceKHR surface,const VkFormat* request_formats,int request_formats_count,VkColorSpaceKHR request_color_space)",
       call_args="(physical_device,surface,request_formats,request_formats_count,request_color_space)",
+      call_args_old="(physical_device,surface,request_formats,request_formats_count,request_color_space)",
       cimguiname="ImGui_ImplVulkanH_SelectSurfaceFormat",
       defaults={},
       funcname="ImGui_ImplVulkanH_SelectSurfaceFormat",
-      location="imgui_impl_vulkan:169",
+      location="imgui_impl_vulkan:195",
       ov_cimguiname="ImGui_ImplVulkanH_SelectSurfaceFormat",
       ret="VkSurfaceFormatKHR",
       signature="(VkPhysicalDevice,VkSurfaceKHR,const VkFormat*,int,VkColorSpaceKHR)",
@@ -1231,11 +1316,12 @@ local t={
       argsT={},
       argsoriginal="()",
       call_args="()",
+      call_args_old="()",
       cimguiname="ImGui_ImplVulkanH_Window_ImGui_ImplVulkanH_Window",
       constructor=true,
       defaults={},
       funcname="ImGui_ImplVulkanH_Window",
-      location="imgui_impl_vulkan:215",
+      location="imgui_impl_vulkan:242",
       ov_cimguiname="ImGui_ImplVulkanH_Window_ImGui_ImplVulkanH_Window",
       signature="()",
       stname="ImGui_ImplVulkanH_Window"},
@@ -1251,7 +1337,7 @@ local t={
       cimguiname="ImGui_ImplVulkanH_Window_destroy",
       defaults={},
       destructor=true,
-      location="imgui_impl_vulkan:215",
+      location="imgui_impl_vulkan:242",
       ov_cimguiname="ImGui_ImplVulkanH_Window_destroy",
       ret="void",
       signature="(ImGui_ImplVulkanH_Window*)",
@@ -1272,15 +1358,35 @@ local t={
           type="VkImageLayout"}},
       argsoriginal="(VkSampler sampler,VkImageView image_view,VkImageLayout image_layout)",
       call_args="(sampler,image_view,image_layout)",
+      call_args_old="(sampler,image_view,image_layout)",
       cimguiname="ImGui_ImplVulkan_AddTexture",
       defaults={},
       funcname="ImGui_ImplVulkan_AddTexture",
-      location="imgui_impl_vulkan:124",
+      location="imgui_impl_vulkan:150",
       ov_cimguiname="ImGui_ImplVulkan_AddTexture",
       ret="VkDescriptorSet",
       signature="(VkSampler,VkImageView,VkImageLayout)",
       stname=""},
     ["(VkSampler,VkImageView,VkImageLayout)"]=nil},
+  ImGui_ImplVulkan_CreateMainPipeline={
+    [1]={
+      args="(const ImGui_ImplVulkan_PipelineInfo* info)",
+      argsT={
+        [1]={
+          name="info",
+          type="const ImGui_ImplVulkan_PipelineInfo*"}},
+      argsoriginal="(const ImGui_ImplVulkan_PipelineInfo* info)",
+      call_args="(info)",
+      call_args_old="(info)",
+      cimguiname="ImGui_ImplVulkan_CreateMainPipeline",
+      defaults={},
+      funcname="ImGui_ImplVulkan_CreateMainPipeline",
+      location="imgui_impl_vulkan:142",
+      ov_cimguiname="ImGui_ImplVulkan_CreateMainPipeline",
+      ret="void",
+      signature="(const ImGui_ImplVulkan_PipelineInfo*)",
+      stname=""},
+    ["(const ImGui_ImplVulkan_PipelineInfo*)"]=nil},
   ImGui_ImplVulkan_Init={
     [1]={
       args="(ImGui_ImplVulkan_InitInfo* info)",
@@ -1290,10 +1396,11 @@ local t={
           type="ImGui_ImplVulkan_InitInfo*"}},
       argsoriginal="(ImGui_ImplVulkan_InitInfo* info)",
       call_args="(info)",
+      call_args_old="(info)",
       cimguiname="ImGui_ImplVulkan_Init",
       defaults={},
       funcname="ImGui_ImplVulkan_Init",
-      location="imgui_impl_vulkan:112",
+      location="imgui_impl_vulkan:133",
       ov_cimguiname="ImGui_ImplVulkan_Init",
       ret="bool",
       signature="(ImGui_ImplVulkan_InitInfo*)",
@@ -1314,11 +1421,12 @@ local t={
           type="void*"}},
       argsoriginal="(uint32_t api_version,PFN_vkVoidFunction(*loader_func)(const char* function_name,void* user_data),void* user_data=nullptr)",
       call_args="(api_version,user_data),user_data)",
+      call_args_old="(api_version,user_data),user_data)",
       cimguiname="ImGui_ImplVulkan_LoadFunctions",
       defaults={
         user_data="nullptr"},
       funcname="ImGui_ImplVulkan_LoadFunctions",
-      location="imgui_impl_vulkan:129",
+      location="imgui_impl_vulkan:155",
       ov_cimguiname="ImGui_ImplVulkan_LoadFunctions",
       ret="bool",
       signature="(uint32_t,PFN_vkVoidFunction(*loader_func)(const char* function_name,void*,void*)",
@@ -1330,10 +1438,11 @@ local t={
       argsT={},
       argsoriginal="()",
       call_args="()",
+      call_args_old="()",
       cimguiname="ImGui_ImplVulkan_NewFrame",
       defaults={},
       funcname="ImGui_ImplVulkan_NewFrame",
-      location="imgui_impl_vulkan:114",
+      location="imgui_impl_vulkan:135",
       ov_cimguiname="ImGui_ImplVulkan_NewFrame",
       ret="void",
       signature="()",
@@ -1348,10 +1457,11 @@ local t={
           type="VkDescriptorSet"}},
       argsoriginal="(VkDescriptorSet descriptor_set)",
       call_args="(descriptor_set)",
+      call_args_old="(descriptor_set)",
       cimguiname="ImGui_ImplVulkan_RemoveTexture",
       defaults={},
       funcname="ImGui_ImplVulkan_RemoveTexture",
-      location="imgui_impl_vulkan:125",
+      location="imgui_impl_vulkan:151",
       ov_cimguiname="ImGui_ImplVulkan_RemoveTexture",
       ret="void",
       signature="(VkDescriptorSet)",
@@ -1372,11 +1482,12 @@ local t={
           type="VkPipeline"}},
       argsoriginal="(ImDrawData* draw_data,VkCommandBuffer command_buffer,VkPipeline pipeline=0ULL)",
       call_args="(draw_data,command_buffer,pipeline)",
+      call_args_old="(draw_data,command_buffer,pipeline)",
       cimguiname="ImGui_ImplVulkan_RenderDrawData",
       defaults={
         pipeline="0ULL"},
       funcname="ImGui_ImplVulkan_RenderDrawData",
-      location="imgui_impl_vulkan:115",
+      location="imgui_impl_vulkan:136",
       ov_cimguiname="ImGui_ImplVulkan_RenderDrawData",
       ret="void",
       signature="(ImDrawData*,VkCommandBuffer,VkPipeline)",
@@ -1391,10 +1502,11 @@ local t={
           type="uint32_t"}},
       argsoriginal="(uint32_t min_image_count)",
       call_args="(min_image_count)",
+      call_args_old="(min_image_count)",
       cimguiname="ImGui_ImplVulkan_SetMinImageCount",
       defaults={},
       funcname="ImGui_ImplVulkan_SetMinImageCount",
-      location="imgui_impl_vulkan:116",
+      location="imgui_impl_vulkan:137",
       ov_cimguiname="ImGui_ImplVulkan_SetMinImageCount",
       ret="void",
       signature="(uint32_t)",
@@ -1406,10 +1518,11 @@ local t={
       argsT={},
       argsoriginal="()",
       call_args="()",
+      call_args_old="()",
       cimguiname="ImGui_ImplVulkan_Shutdown",
       defaults={},
       funcname="ImGui_ImplVulkan_Shutdown",
-      location="imgui_impl_vulkan:113",
+      location="imgui_impl_vulkan:134",
       ov_cimguiname="ImGui_ImplVulkan_Shutdown",
       ret="void",
       signature="()",
@@ -1424,10 +1537,11 @@ local t={
           type="ImTextureData*"}},
       argsoriginal="(ImTextureData* tex)",
       call_args="(tex)",
+      call_args_old="(tex)",
       cimguiname="ImGui_ImplVulkan_UpdateTexture",
       defaults={},
       funcname="ImGui_ImplVulkan_UpdateTexture",
-      location="imgui_impl_vulkan:119",
+      location="imgui_impl_vulkan:145",
       ov_cimguiname="ImGui_ImplVulkan_UpdateTexture",
       ret="void",
       signature="(ImTextureData*)",
@@ -1489,9 +1603,10 @@ t.ImGui_ImplSDL3_NewFrame["()"]=t.ImGui_ImplSDL3_NewFrame[1]
 t.ImGui_ImplSDL3_ProcessEvent["(const SDL_Event*)"]=t.ImGui_ImplSDL3_ProcessEvent[1]
 t.ImGui_ImplSDL3_SetGamepadMode["(ImGui_ImplSDL3_GamepadMode,SDL_Gamepad**,int)"]=t.ImGui_ImplSDL3_SetGamepadMode[1]
 t.ImGui_ImplSDL3_Shutdown["()"]=t.ImGui_ImplSDL3_Shutdown[1]
-t.ImGui_ImplVulkanH_CreateOrResizeWindow["(VkInstance,VkPhysicalDevice,VkDevice,ImGui_ImplVulkanH_Window*,uint32_t,const VkAllocationCallbacks*,int,int,uint32_t)"]=t.ImGui_ImplVulkanH_CreateOrResizeWindow[1]
+t.ImGui_ImplVulkanH_CreateOrResizeWindow["(VkInstance,VkPhysicalDevice,VkDevice,ImGui_ImplVulkanH_Window*,uint32_t,const VkAllocationCallbacks*,int,int,uint32_t,VkImageUsageFlags)"]=t.ImGui_ImplVulkanH_CreateOrResizeWindow[1]
 t.ImGui_ImplVulkanH_DestroyWindow["(VkInstance,VkDevice,ImGui_ImplVulkanH_Window*,const VkAllocationCallbacks*)"]=t.ImGui_ImplVulkanH_DestroyWindow[1]
 t.ImGui_ImplVulkanH_GetMinImageCountFromPresentMode["(VkPresentModeKHR)"]=t.ImGui_ImplVulkanH_GetMinImageCountFromPresentMode[1]
+t.ImGui_ImplVulkanH_GetWindowDataFromViewport["(ImGuiViewport*)"]=t.ImGui_ImplVulkanH_GetWindowDataFromViewport[1]
 t.ImGui_ImplVulkanH_SelectPhysicalDevice["(VkInstance)"]=t.ImGui_ImplVulkanH_SelectPhysicalDevice[1]
 t.ImGui_ImplVulkanH_SelectPresentMode["(VkPhysicalDevice,VkSurfaceKHR,const VkPresentModeKHR*,int)"]=t.ImGui_ImplVulkanH_SelectPresentMode[1]
 t.ImGui_ImplVulkanH_SelectQueueFamilyIndex["(VkPhysicalDevice)"]=t.ImGui_ImplVulkanH_SelectQueueFamilyIndex[1]
@@ -1499,6 +1614,7 @@ t.ImGui_ImplVulkanH_SelectSurfaceFormat["(VkPhysicalDevice,VkSurfaceKHR,const Vk
 t.ImGui_ImplVulkanH_Window_ImGui_ImplVulkanH_Window["()"]=t.ImGui_ImplVulkanH_Window_ImGui_ImplVulkanH_Window[1]
 t.ImGui_ImplVulkanH_Window_destroy["(ImGui_ImplVulkanH_Window*)"]=t.ImGui_ImplVulkanH_Window_destroy[1]
 t.ImGui_ImplVulkan_AddTexture["(VkSampler,VkImageView,VkImageLayout)"]=t.ImGui_ImplVulkan_AddTexture[1]
+t.ImGui_ImplVulkan_CreateMainPipeline["(const ImGui_ImplVulkan_PipelineInfo*)"]=t.ImGui_ImplVulkan_CreateMainPipeline[1]
 t.ImGui_ImplVulkan_Init["(ImGui_ImplVulkan_InitInfo*)"]=t.ImGui_ImplVulkan_Init[1]
 t.ImGui_ImplVulkan_LoadFunctions["(uint32_t,PFN_vkVoidFunction(*loader_func)(const char* function_name,void*,void*)"]=t.ImGui_ImplVulkan_LoadFunctions[1]
 t.ImGui_ImplVulkan_NewFrame["()"]=t.ImGui_ImplVulkan_NewFrame[1]

generator/output/typedefs_dict.json

@@ -15,6 +15,7 @@
   "ImDrawListFlags": "int",
   "ImDrawListSharedData": "struct ImDrawListSharedData",
   "ImDrawListSplitter": "struct ImDrawListSplitter",
+  "ImDrawTextFlags": "int",
   "ImDrawVert": "struct ImDrawVert",
   "ImFileHandle": "FILE*",
   "ImFont": "struct ImFont",
@@ -99,6 +100,7 @@
   "ImGuiLayoutType": "int",
   "ImGuiListClipper": "struct ImGuiListClipper",
   "ImGuiListClipperData": "struct ImGuiListClipperData",
+  "ImGuiListClipperFlags": "int",
   "ImGuiListClipperRange": "struct ImGuiListClipperRange",
   "ImGuiLocEntry": "struct ImGuiLocEntry",
   "ImGuiLogFlags": "int",

generator/output/typedefs_dict.lua

@@ -15,6 +15,7 @@ local t={
   ImDrawListFlags="int",
   ImDrawListSharedData="struct ImDrawListSharedData",
   ImDrawListSplitter="struct ImDrawListSplitter",
+  ImDrawTextFlags="int",
   ImDrawVert="struct ImDrawVert",
   ImFileHandle="FILE*",
   ImFont="struct ImFont",
@@ -99,6 +100,7 @@ local t={
   ImGuiLayoutType="int",
   ImGuiListClipper="struct ImGuiListClipper",
   ImGuiListClipperData="struct ImGuiListClipperData",
+  ImGuiListClipperFlags="int",
   ImGuiListClipperRange="struct ImGuiListClipperRange",
   ImGuiLocEntry="struct ImGuiLocEntry",
   ImGuiLogFlags="int",

generator/print_defines.cpp

@@ -35,3 +35,7 @@
 #ifdef IMGUI_HAS_TEXTURES
 #pragma message(CIMGUI_DEFSTRING(IMGUI_HAS_TEXTURES))
 #endif
+
+#ifdef ImTextureID_Invalid
+#pragma message(CIMGUI_DEFSTRING(ImTextureID_Invalid))
+#endif

test/main.c

@@ -34,6 +34,7 @@ int main(void)
     display_size.x = 1920;
     display_size.y = 1080;
     io->DisplaySize = display_size;
+	printf("DisplaySice %f, %f\n", io->DisplaySize.x, io->DisplaySize.y);
     io->DeltaTime = 1.0f / 60.0f;
     igNewFrame();