Merge branch 'docking_inter'

README.md

@@ -11,7 +11,7 @@ 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.7 of Dear ImGui with internal api]
+* currently this wrapper is based on version [1.92.8 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.

backend_test/example_sdl3_vulkan/main.c

@@ -12,7 +12,7 @@
 #endif
 
 //this must be equal to that in imgui_impl_vulkan.h
-#define IMGUI_IMPL_VULKAN_MINIMUM_IMAGE_SAMPLER_POOL_SIZE   (1)     // Minimum per atlas
+//#define IMGUI_IMPL_VULKAN_MINIMUM_IMAGE_SAMPLER_POOL_SIZE   (1)     // Minimum per atlas
 
 #define CIMGUI_DEFINE_ENUMS_AND_STRUCTS
 #include <cimgui.h>
@@ -214,7 +214,8 @@ static void SetupVulkan(const char** extensions, uint32_t extensions_count)
     {
         VkDescriptorPoolSize pool_sizes[] =
         {
-            { VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, IMGUI_IMPL_VULKAN_MINIMUM_IMAGE_SAMPLER_POOL_SIZE },
+            { VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, IMGUI_IMPL_VULKAN_MINIMUM_SAMPLED_IMAGE_POOL_SIZE },
+            { VK_DESCRIPTOR_TYPE_SAMPLER, IMGUI_IMPL_VULKAN_MINIMUM_SAMPLER_POOL_SIZE },
         };
         VkDescriptorPoolCreateInfo pool_info = {};
         pool_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
@@ -281,9 +282,10 @@ static void CleanupVulkan()
     vkDestroyInstance(g_Instance, g_Allocator);
 }
 
-static void CleanupVulkanWindow()
+static void CleanupVulkanWindow(ImGui_ImplVulkanH_Window* wd)
 {
-    ImGui_ImplVulkanH_DestroyWindow(g_Instance, g_Device, &g_MainWindowData, g_Allocator);
+    ImGui_ImplVulkanH_DestroyWindow(g_Instance, g_Device, wd, g_Allocator);
+    vkDestroySurfaceKHR(g_Instance, wd->Surface, g_Allocator);
 }
 
 static void FrameRender(ImGui_ImplVulkanH_Window* wd, ImDrawData* draw_data)
@@ -620,7 +622,7 @@ int main(int argc, char* argv[])
     ImGui_ImplSDL3_Shutdown();
     igDestroyContext(NULL);
 
-    CleanupVulkanWindow();
+    CleanupVulkanWindow(&g_MainWindowData);
     CleanupVulkan();
 
     SDL_DestroyWindow(window);

backend_test/example_sdl_vulkan/main.c

@@ -16,7 +16,7 @@
 #endif
 
 //this must be equal to that in imgui_impl_vulkan.h
-#define IMGUI_IMPL_VULKAN_MINIMUM_IMAGE_SAMPLER_POOL_SIZE   (1)     // Minimum per atlas
+//#define IMGUI_IMPL_VULKAN_MINIMUM_IMAGE_SAMPLER_POOL_SIZE   (1)     // Minimum per atlas
 
 #define CIMGUI_DEFINE_ENUMS_AND_STRUCTS
 #include "cimgui.h"
@@ -218,7 +218,8 @@ static void SetupVulkan(const char** extensions, uint32_t extensions_count)
     {
         VkDescriptorPoolSize pool_sizes[] =
         {
-            { VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, IMGUI_IMPL_VULKAN_MINIMUM_IMAGE_SAMPLER_POOL_SIZE },
+            { VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, IMGUI_IMPL_VULKAN_MINIMUM_SAMPLED_IMAGE_POOL_SIZE },
+            { VK_DESCRIPTOR_TYPE_SAMPLER, IMGUI_IMPL_VULKAN_MINIMUM_SAMPLER_POOL_SIZE },
         };
         VkDescriptorPoolCreateInfo pool_info = {};
         pool_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
@@ -285,9 +286,10 @@ static void CleanupVulkan()
     vkDestroyInstance(g_Instance, g_Allocator);
 }
 
-static void CleanupVulkanWindow()
+static void CleanupVulkanWindow(ImGui_ImplVulkanH_Window* wd)
 {
-    ImGui_ImplVulkanH_DestroyWindow(g_Instance, g_Device, &g_MainWindowData, g_Allocator);
+    ImGui_ImplVulkanH_DestroyWindow(g_Instance, g_Device, wd, g_Allocator);
+    vkDestroySurfaceKHR(g_Instance, wd->Surface, g_Allocator);
 }
 
 static void FrameRender(ImGui_ImplVulkanH_Window* wd, ImDrawData* draw_data)
@@ -615,7 +617,7 @@ int main(int argc, char* argv[])
     ImGui_ImplSDL2_Shutdown();
     igDestroyContext(NULL);
 
-    CleanupVulkanWindow();
+    CleanupVulkanWindow(&g_MainWindowData);
     CleanupVulkan();
 
     SDL_DestroyWindow(window);

cimgui.cpp

@@ -1,8 +1,7 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version "1.92.7" 19270 from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.92.8" 19280 from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
 //with imgui_freetype.h api
-//docking branch
 
 #include "./imgui/imgui.h"
 #include "./imgui/imgui_internal.h"
@@ -281,10 +280,6 @@ CIMGUI_API ImDrawList* igGetWindowDrawList()
 {
     return ImGui::GetWindowDrawList();
 }
-CIMGUI_API float igGetWindowDpiScale()
-{
-    return ImGui::GetWindowDpiScale();
-}
 CIMGUI_API ImVec2_c igGetWindowPos()
 {
     return ConvertFromCPP_ImVec2(ImGui::GetWindowPos());
@@ -301,10 +296,6 @@ CIMGUI_API float igGetWindowHeight()
 {
     return ImGui::GetWindowHeight();
 }
-CIMGUI_API ImGuiViewport* igGetWindowViewport()
-{
-    return ImGui::GetWindowViewport();
-}
 CIMGUI_API void igSetNextWindowPos(const ImVec2_c pos,ImGuiCond cond,const ImVec2_c pivot)
 {
     return ImGui::SetNextWindowPos(ConvertToCPP_ImVec2(pos),cond,ConvertToCPP_ImVec2(pivot));
@@ -337,10 +328,6 @@ CIMGUI_API void igSetNextWindowBgAlpha(float alpha)
 {
     return ImGui::SetNextWindowBgAlpha(alpha);
 }
-CIMGUI_API void igSetNextWindowViewport(ImGuiID viewport_id)
-{
-    return ImGui::SetNextWindowViewport(viewport_id);
-}
 CIMGUI_API void igSetWindowPos_Vec2(const ImVec2_c pos,ImGuiCond cond)
 {
     return ImGui::SetWindowPos(ConvertToCPP_ImVec2(pos),cond);
@@ -1469,30 +1456,6 @@ CIMGUI_API void igSetTabItemClosed(const char* tab_or_docked_window_label)
 {
     return ImGui::SetTabItemClosed(tab_or_docked_window_label);
 }
-CIMGUI_API ImGuiID igDockSpace(ImGuiID dockspace_id,const ImVec2_c size,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class)
-{
-    return ImGui::DockSpace(dockspace_id,ConvertToCPP_ImVec2(size),flags,window_class);
-}
-CIMGUI_API ImGuiID igDockSpaceOverViewport(ImGuiID dockspace_id,const ImGuiViewport* viewport,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class)
-{
-    return ImGui::DockSpaceOverViewport(dockspace_id,viewport,flags,window_class);
-}
-CIMGUI_API void igSetNextWindowDockID(ImGuiID dock_id,ImGuiCond cond)
-{
-    return ImGui::SetNextWindowDockID(dock_id,cond);
-}
-CIMGUI_API void igSetNextWindowClass(const ImGuiWindowClass* window_class)
-{
-    return ImGui::SetNextWindowClass(window_class);
-}
-CIMGUI_API ImGuiID igGetWindowDockID()
-{
-    return ImGui::GetWindowDockID();
-}
-CIMGUI_API bool igIsWindowDocked()
-{
-    return ImGui::IsWindowDocked();
-}
 CIMGUI_API void igLogToTTY(int auto_open_depth)
 {
     return ImGui::LogToTTY(auto_open_depth);
@@ -1666,13 +1629,13 @@ CIMGUI_API ImGuiViewport* igGetMainViewport()
 {
     return ImGui::GetMainViewport();
 }
-CIMGUI_API ImDrawList* igGetBackgroundDrawList(ImGuiViewport* viewport)
+CIMGUI_API ImDrawList* igGetBackgroundDrawList_Nil()
 {
-    return ImGui::GetBackgroundDrawList(viewport);
+    return ImGui::GetBackgroundDrawList();
 }
-CIMGUI_API ImDrawList* igGetForegroundDrawList_ViewportPtr(ImGuiViewport* viewport)
+CIMGUI_API ImDrawList* igGetForegroundDrawList_Nil()
 {
-    return ImGui::GetForegroundDrawList(viewport);
+    return ImGui::GetForegroundDrawList();
 }
 CIMGUI_API bool igIsRectVisible_Nil(const ImVec2_c size)
 {
@@ -1762,7 +1725,7 @@ CIMGUI_API void igSetNextItemShortcut(ImGuiKeyChord key_chord,ImGuiInputFlags fl
 {
     return ImGui::SetNextItemShortcut(key_chord,flags);
 }
-CIMGUI_API void igSetItemKeyOwner_Nil(ImGuiKey key)
+CIMGUI_API bool igSetItemKeyOwner_Nil(ImGuiKey key)
 {
     return ImGui::SetItemKeyOwner(key);
 }
@@ -1907,26 +1870,6 @@ CIMGUI_API void igMemFree(void* ptr)
 {
     return ImGui::MemFree(ptr);
 }
-CIMGUI_API void igUpdatePlatformWindows()
-{
-    return ImGui::UpdatePlatformWindows();
-}
-CIMGUI_API void igRenderPlatformWindowsDefault(void* platform_render_arg,void* renderer_render_arg)
-{
-    return ImGui::RenderPlatformWindowsDefault(platform_render_arg,renderer_render_arg);
-}
-CIMGUI_API void igDestroyPlatformWindows()
-{
-    return ImGui::DestroyPlatformWindows();
-}
-CIMGUI_API ImGuiViewport* igFindViewportByID(ImGuiID viewport_id)
-{
-    return ImGui::FindViewportByID(viewport_id);
-}
-CIMGUI_API ImGuiViewport* igFindViewportByPlatformHandle(void* platform_handle)
-{
-    return ImGui::FindViewportByPlatformHandle(platform_handle);
-}
 CIMGUI_API ImGuiTableSortSpecs* ImGuiTableSortSpecs_ImGuiTableSortSpecs(void)
 {
     return IM_NEW(ImGuiTableSortSpecs)();
@@ -1979,10 +1922,6 @@ CIMGUI_API void ImGuiIO_AddMouseSourceEvent(ImGuiIO* self,ImGuiMouseSource sourc
 {
     return self->AddMouseSourceEvent(source);
 }
-CIMGUI_API void ImGuiIO_AddMouseViewportEvent(ImGuiIO* self,ImGuiID id)
-{
-    return self->AddMouseViewportEvent(id);
-}
 CIMGUI_API void ImGuiIO_AddFocusEvent(ImGuiIO* self,bool focused)
 {
     return self->AddFocusEvent(focused);
@@ -2059,14 +1998,6 @@ CIMGUI_API bool ImGuiInputTextCallbackData_HasSelection(ImGuiInputTextCallbackDa
 {
     return self->HasSelection();
 }
-CIMGUI_API ImGuiWindowClass* ImGuiWindowClass_ImGuiWindowClass(void)
-{
-    return IM_NEW(ImGuiWindowClass)();
-}
-CIMGUI_API void ImGuiWindowClass_destroy(ImGuiWindowClass* self)
-{
-    IM_DELETE(self);
-}
 CIMGUI_API ImGuiPayload* ImGuiPayload_ImGuiPayload(void)
 {
     return IM_NEW(ImGuiPayload)();
@@ -2463,9 +2394,17 @@ CIMGUI_API void ImDrawList_AddLine(ImDrawList* self,const ImVec2_c p1,const ImVe
 {
     return self->AddLine(ConvertToCPP_ImVec2(p1),ConvertToCPP_ImVec2(p2),col,thickness);
 }
-CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2_c p_min,const ImVec2_c p_max,ImU32 col,float rounding,ImDrawFlags flags,float thickness)
+CIMGUI_API void ImDrawList_AddLineH(ImDrawList* self,float min_x,float max_x,float y,ImU32 col,float thickness)
 {
-    return self->AddRect(ConvertToCPP_ImVec2(p_min),ConvertToCPP_ImVec2(p_max),col,rounding,flags,thickness);
+    return self->AddLineH(min_x,max_x,y,col,thickness);
+}
+CIMGUI_API void ImDrawList_AddLineV(ImDrawList* self,float x,float min_y,float max_y,ImU32 col,float thickness)
+{
+    return self->AddLineV(x,min_y,max_y,col,thickness);
+}
+CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2_c p_min,const ImVec2_c p_max,ImU32 col,float rounding,float thickness,ImDrawFlags flags)
+{
+    return self->AddRect(ConvertToCPP_ImVec2(p_min),ConvertToCPP_ImVec2(p_max),col,rounding,thickness,flags);
 }
 CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2_c p_min,const ImVec2_c p_max,ImU32 col,float rounding,ImDrawFlags flags)
 {
@@ -2531,9 +2470,9 @@ CIMGUI_API void ImDrawList_AddBezierQuadratic(ImDrawList* self,const ImVec2_c p1
 {
     return self->AddBezierQuadratic(ConvertToCPP_ImVec2(p1),ConvertToCPP_ImVec2(p2),ConvertToCPP_ImVec2(p3),col,thickness,num_segments);
 }
-CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2_c* points,int num_points,ImU32 col,ImDrawFlags flags,float thickness)
+CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2_c* points,int num_points,ImU32 col,float thickness,ImDrawFlags flags)
 {
-    return self->AddPolyline(reinterpret_cast<const ImVec2*>(points),num_points,col,flags,thickness);
+    return self->AddPolyline(reinterpret_cast<const ImVec2*>(points),num_points,col,thickness,flags);
 }
 CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2_c* points,int num_points,ImU32 col)
 {
@@ -2575,9 +2514,9 @@ CIMGUI_API void ImDrawList_PathFillConcave(ImDrawList* self,ImU32 col)
 {
     return self->PathFillConcave(col);
 }
-CIMGUI_API void ImDrawList_PathStroke(ImDrawList* self,ImU32 col,ImDrawFlags flags,float thickness)
+CIMGUI_API void ImDrawList_PathStroke(ImDrawList* self,ImU32 col,float thickness,ImDrawFlags flags)
 {
-    return self->PathStroke(col,flags,thickness);
+    return self->PathStroke(col,thickness,flags);
 }
 CIMGUI_API void ImDrawList_PathArcTo(ImDrawList* self,const ImVec2_c center,float radius,float a_min,float a_max,int num_segments)
 {
@@ -2887,6 +2826,10 @@ CIMGUI_API void ImFontAtlas_Clear(ImFontAtlas* self)
 {
     return self->Clear();
 }
+CIMGUI_API void ImFontAtlas_ClearFonts(ImFontAtlas* self)
+{
+    return self->ClearFonts();
+}
 CIMGUI_API void ImFontAtlas_CompactCache(ImFontAtlas* self)
 {
     return self->CompactCache();
@@ -2899,10 +2842,6 @@ CIMGUI_API void ImFontAtlas_ClearInputData(ImFontAtlas* self)
 {
     return self->ClearInputData();
 }
-CIMGUI_API void ImFontAtlas_ClearFonts(ImFontAtlas* self)
-{
-    return self->ClearFonts();
-}
 CIMGUI_API void ImFontAtlas_ClearTexData(ImFontAtlas* self)
 {
     return self->ClearTexData();
@@ -3019,10 +2958,6 @@ CIMGUI_API ImVec2_c ImGuiViewport_GetWorkCenter(ImGuiViewport* self)
 {
     return ConvertFromCPP_ImVec2(self->GetWorkCenter());
 }
-CIMGUI_API const char* ImGuiViewport_GetDebugName(ImGuiViewport* self)
-{
-    return self->GetDebugName();
-}
 CIMGUI_API ImGuiPlatformIO* ImGuiPlatformIO_ImGuiPlatformIO(void)
 {
     return IM_NEW(ImGuiPlatformIO)();
@@ -3039,14 +2974,6 @@ CIMGUI_API void ImGuiPlatformIO_ClearRendererHandlers(ImGuiPlatformIO* self)
 {
     return self->ClearRendererHandlers();
 }
-CIMGUI_API ImGuiPlatformMonitor* ImGuiPlatformMonitor_ImGuiPlatformMonitor(void)
-{
-    return IM_NEW(ImGuiPlatformMonitor)();
-}
-CIMGUI_API void ImGuiPlatformMonitor_destroy(ImGuiPlatformMonitor* self)
-{
-    IM_DELETE(self);
-}
 CIMGUI_API ImGuiPlatformImeData* ImGuiPlatformImeData_ImGuiPlatformImeData(void)
 {
     return IM_NEW(ImGuiPlatformImeData)();
@@ -3610,6 +3537,14 @@ CIMGUI_API void ImRect_Add_Rect(ImRect* self,const ImRect_c r)
 {
     return self->Add(ConvertToCPP_ImRect(r));
 }
+CIMGUI_API void ImRect_AddX(ImRect* self,float x)
+{
+    return self->AddX(x);
+}
+CIMGUI_API void ImRect_AddY(ImRect* self,float y)
+{
+    return self->AddY(y);
+}
 CIMGUI_API void ImRect_Expand_Float(ImRect* self,const float amount)
 {
     return self->Expand(amount);
@@ -4066,70 +4001,6 @@ CIMGUI_API void ImGuiMultiSelectState_destroy(ImGuiMultiSelectState* self)
 {
     IM_DELETE(self);
 }
-CIMGUI_API ImGuiDockNode* ImGuiDockNode_ImGuiDockNode(ImGuiID id)
-{
-    return IM_NEW(ImGuiDockNode)(id);
-}
-CIMGUI_API void ImGuiDockNode_destroy(ImGuiDockNode* self)
-{
-    IM_DELETE(self);
-}
-CIMGUI_API bool ImGuiDockNode_IsRootNode(ImGuiDockNode* self)
-{
-    return self->IsRootNode();
-}
-CIMGUI_API bool ImGuiDockNode_IsDockSpace(ImGuiDockNode* self)
-{
-    return self->IsDockSpace();
-}
-CIMGUI_API bool ImGuiDockNode_IsFloatingNode(ImGuiDockNode* self)
-{
-    return self->IsFloatingNode();
-}
-CIMGUI_API bool ImGuiDockNode_IsCentralNode(ImGuiDockNode* self)
-{
-    return self->IsCentralNode();
-}
-CIMGUI_API bool ImGuiDockNode_IsHiddenTabBar(ImGuiDockNode* self)
-{
-    return self->IsHiddenTabBar();
-}
-CIMGUI_API bool ImGuiDockNode_IsNoTabBar(ImGuiDockNode* self)
-{
-    return self->IsNoTabBar();
-}
-CIMGUI_API bool ImGuiDockNode_IsSplitNode(ImGuiDockNode* self)
-{
-    return self->IsSplitNode();
-}
-CIMGUI_API bool ImGuiDockNode_IsLeafNode(ImGuiDockNode* self)
-{
-    return self->IsLeafNode();
-}
-CIMGUI_API bool ImGuiDockNode_IsEmpty(ImGuiDockNode* self)
-{
-    return self->IsEmpty();
-}
-CIMGUI_API ImRect_c ImGuiDockNode_Rect(ImGuiDockNode* self)
-{
-    return ConvertFromCPP_ImRect(self->Rect());
-}
-CIMGUI_API void ImGuiDockNode_SetLocalFlags(ImGuiDockNode* self,ImGuiDockNodeFlags flags)
-{
-    return self->SetLocalFlags(flags);
-}
-CIMGUI_API void ImGuiDockNode_UpdateMergedFlags(ImGuiDockNode* self)
-{
-    return self->UpdateMergedFlags();
-}
-CIMGUI_API ImGuiDockContext* ImGuiDockContext_ImGuiDockContext(void)
-{
-    return IM_NEW(ImGuiDockContext)();
-}
-CIMGUI_API void ImGuiDockContext_destroy(ImGuiDockContext* self)
-{
-    IM_DELETE(self);
-}
 CIMGUI_API ImGuiViewportP* ImGuiViewportP_ImGuiViewportP(void)
 {
     return IM_NEW(ImGuiViewportP)();
@@ -4138,10 +4009,6 @@ CIMGUI_API void ImGuiViewportP_destroy(ImGuiViewportP* self)
 {
     IM_DELETE(self);
 }
-CIMGUI_API void ImGuiViewportP_ClearRequestFlags(ImGuiViewportP* self)
-{
-    return self->ClearRequestFlags();
-}
 CIMGUI_API ImVec2_c ImGuiViewportP_CalcWorkRectPos(ImGuiViewportP* self,const ImVec2_c inset_min)
 {
     return ConvertFromCPP_ImVec2(self->CalcWorkRectPos(ConvertToCPP_ImVec2(inset_min)));
@@ -4382,9 +4249,9 @@ CIMGUI_API ImVec2_c igCalcWindowNextAutoFitSize(ImGuiWindow* window)
 {
     return ConvertFromCPP_ImVec2(ImGui::CalcWindowNextAutoFitSize(window));
 }
-CIMGUI_API bool igIsWindowChildOf(ImGuiWindow* window,ImGuiWindow* potential_parent,bool popup_hierarchy,bool dock_hierarchy)
+CIMGUI_API bool igIsWindowChildOf(ImGuiWindow* window,ImGuiWindow* potential_parent,bool popup_hierarchy)
 {
-    return ImGui::IsWindowChildOf(window,potential_parent,popup_hierarchy,dock_hierarchy);
+    return ImGui::IsWindowChildOf(window,potential_parent,popup_hierarchy);
 }
 CIMGUI_API bool igIsWindowInBeginStack(ImGuiWindow* window)
 {
@@ -4530,6 +4397,14 @@ CIMGUI_API ImDrawList* igGetForegroundDrawList_WindowPtr(ImGuiWindow* window)
 {
     return ImGui::GetForegroundDrawList(window);
 }
+CIMGUI_API ImDrawList* igGetBackgroundDrawList_ViewportPtr(ImGuiViewport* viewport)
+{
+    return ImGui::GetBackgroundDrawList(viewport);
+}
+CIMGUI_API ImDrawList* igGetForegroundDrawList_ViewportPtr(ImGuiViewport* viewport)
+{
+    return ImGui::GetForegroundDrawList(viewport);
+}
 CIMGUI_API void igAddDrawListToDrawDataEx(ImDrawData* draw_data,ImVector_ImDrawListPtr* out_list,ImDrawList* draw_list)
 {
     return ImGui::AddDrawListToDrawDataEx(draw_data,out_list,draw_list);
@@ -4574,10 +4449,6 @@ CIMGUI_API void igStartMouseMovingWindow(ImGuiWindow* window)
 {
     return ImGui::StartMouseMovingWindow(window);
 }
-CIMGUI_API void igStartMouseMovingWindowOrNode(ImGuiWindow* window,ImGuiDockNode* node,bool undock)
-{
-    return ImGui::StartMouseMovingWindowOrNode(window,node,undock);
-}
 CIMGUI_API void igStopMouseMovingWindow()
 {
     return ImGui::StopMouseMovingWindow();
@@ -4590,34 +4461,18 @@ CIMGUI_API void igUpdateMouseMovingWindowEndFrame()
 {
     return ImGui::UpdateMouseMovingWindowEndFrame();
 }
-CIMGUI_API void igTranslateWindowsInViewport(ImGuiViewportP* viewport,const ImVec2_c old_pos,const ImVec2_c new_pos,const ImVec2_c old_size,const ImVec2_c new_size)
+CIMGUI_API ImGuiViewport* igGetWindowViewport()
 {
-    return ImGui::TranslateWindowsInViewport(viewport,ConvertToCPP_ImVec2(old_pos),ConvertToCPP_ImVec2(new_pos),ConvertToCPP_ImVec2(old_size),ConvertToCPP_ImVec2(new_size));
+    return ImGui::GetWindowViewport();
 }
 CIMGUI_API void igScaleWindowsInViewport(ImGuiViewportP* viewport,float scale)
 {
     return ImGui::ScaleWindowsInViewport(viewport,scale);
 }
-CIMGUI_API void igDestroyPlatformWindow(ImGuiViewportP* viewport)
-{
-    return ImGui::DestroyPlatformWindow(viewport);
-}
 CIMGUI_API void igSetWindowViewport(ImGuiWindow* window,ImGuiViewportP* viewport)
 {
     return ImGui::SetWindowViewport(window,viewport);
 }
-CIMGUI_API void igSetCurrentViewport(ImGuiWindow* window,ImGuiViewportP* viewport)
-{
-    return ImGui::SetCurrentViewport(window,viewport);
-}
-CIMGUI_API const ImGuiPlatformMonitor* igGetViewportPlatformMonitor(ImGuiViewport* viewport)
-{
-    return ImGui::GetViewportPlatformMonitor(viewport);
-}
-CIMGUI_API ImGuiViewportP* igFindHoveredViewportFromPlatformWindowStack(const ImVec2_c mouse_platform_pos)
-{
-    return ImGui::FindHoveredViewportFromPlatformWindowStack(ConvertToCPP_ImVec2(mouse_platform_pos));
-}
 CIMGUI_API void igMarkIniSettingsDirty_Nil()
 {
     return ImGui::MarkIniSettingsDirty();
@@ -4830,6 +4685,10 @@ CIMGUI_API bool igBeginChildEx(const char* name,ImGuiID id,const ImVec2_c size_a
 {
     return ImGui::BeginChildEx(name,id,ConvertToCPP_ImVec2(size_arg),child_flags,window_flags);
 }
+CIMGUI_API ImGuiWindow* igFindFrontMostVisibleChildWindow(ImGuiWindow* window)
+{
+    return ImGui::FindFrontMostVisibleChildWindow(window);
+}
 CIMGUI_API bool igBeginPopupEx(ImGuiID id,ImGuiWindowFlags extra_window_flags)
 {
     return ImGui::BeginPopupEx(id,extra_window_flags);
@@ -5102,7 +4961,7 @@ CIMGUI_API void igSetKeyOwnersForKeyChord(ImGuiKeyChord key,ImGuiID owner_id,ImG
 {
     return ImGui::SetKeyOwnersForKeyChord(key,owner_id,flags);
 }
-CIMGUI_API void igSetItemKeyOwner_InputFlags(ImGuiKey key,ImGuiInputFlags flags)
+CIMGUI_API bool igSetItemKeyOwner_InputFlags(ImGuiKey key,ImGuiInputFlags flags)
 {
     return ImGui::SetItemKeyOwner(key,flags);
 }
@@ -5162,174 +5021,6 @@ CIMGUI_API ImGuiKeyRoutingData* igGetShortcutRoutingData(ImGuiKeyChord key_chord
 {
     return ImGui::GetShortcutRoutingData(key_chord);
 }
-CIMGUI_API void igDockContextInitialize(ImGuiContext* ctx)
-{
-    return ImGui::DockContextInitialize(ctx);
-}
-CIMGUI_API void igDockContextShutdown(ImGuiContext* ctx)
-{
-    return ImGui::DockContextShutdown(ctx);
-}
-CIMGUI_API void igDockContextClearNodes(ImGuiContext* ctx,ImGuiID root_id,bool clear_settings_refs)
-{
-    return ImGui::DockContextClearNodes(ctx,root_id,clear_settings_refs);
-}
-CIMGUI_API void igDockContextRebuildNodes(ImGuiContext* ctx)
-{
-    return ImGui::DockContextRebuildNodes(ctx);
-}
-CIMGUI_API void igDockContextNewFrameUpdateUndocking(ImGuiContext* ctx)
-{
-    return ImGui::DockContextNewFrameUpdateUndocking(ctx);
-}
-CIMGUI_API void igDockContextNewFrameUpdateDocking(ImGuiContext* ctx)
-{
-    return ImGui::DockContextNewFrameUpdateDocking(ctx);
-}
-CIMGUI_API void igDockContextEndFrame(ImGuiContext* ctx)
-{
-    return ImGui::DockContextEndFrame(ctx);
-}
-CIMGUI_API ImGuiID igDockContextGenNodeID(ImGuiContext* ctx)
-{
-    return ImGui::DockContextGenNodeID(ctx);
-}
-CIMGUI_API void igDockContextQueueDock(ImGuiContext* ctx,ImGuiWindow* target,ImGuiDockNode* target_node,ImGuiWindow* payload,ImGuiDir split_dir,float split_ratio,bool split_outer)
-{
-    return ImGui::DockContextQueueDock(ctx,target,target_node,payload,split_dir,split_ratio,split_outer);
-}
-CIMGUI_API void igDockContextQueueUndockWindow(ImGuiContext* ctx,ImGuiWindow* window)
-{
-    return ImGui::DockContextQueueUndockWindow(ctx,window);
-}
-CIMGUI_API void igDockContextQueueUndockNode(ImGuiContext* ctx,ImGuiDockNode* node)
-{
-    return ImGui::DockContextQueueUndockNode(ctx,node);
-}
-CIMGUI_API void igDockContextProcessUndockWindow(ImGuiContext* ctx,ImGuiWindow* window,bool clear_persistent_docking_ref)
-{
-    return ImGui::DockContextProcessUndockWindow(ctx,window,clear_persistent_docking_ref);
-}
-CIMGUI_API void igDockContextProcessUndockNode(ImGuiContext* ctx,ImGuiDockNode* node)
-{
-    return ImGui::DockContextProcessUndockNode(ctx,node);
-}
-CIMGUI_API bool igDockContextCalcDropPosForDocking(ImGuiWindow* target,ImGuiDockNode* target_node,ImGuiWindow* payload_window,ImGuiDockNode* payload_node,ImGuiDir split_dir,bool split_outer,ImVec2_c* out_pos)
-{
-    return ImGui::DockContextCalcDropPosForDocking(target,target_node,payload_window,payload_node,split_dir,split_outer,reinterpret_cast<ImVec2*>(out_pos));
-}
-CIMGUI_API ImGuiDockNode* igDockContextFindNodeByID(ImGuiContext* ctx,ImGuiID id)
-{
-    return ImGui::DockContextFindNodeByID(ctx,id);
-}
-CIMGUI_API void igDockNodeWindowMenuHandler_Default(ImGuiContext* ctx,ImGuiDockNode* node,ImGuiTabBar* tab_bar)
-{
-    return ImGui::DockNodeWindowMenuHandler_Default(ctx,node,tab_bar);
-}
-CIMGUI_API bool igDockNodeBeginAmendTabBar(ImGuiDockNode* node)
-{
-    return ImGui::DockNodeBeginAmendTabBar(node);
-}
-CIMGUI_API void igDockNodeEndAmendTabBar()
-{
-    return ImGui::DockNodeEndAmendTabBar();
-}
-CIMGUI_API ImGuiDockNode* igDockNodeGetRootNode(ImGuiDockNode* node)
-{
-    return ImGui::DockNodeGetRootNode(node);
-}
-CIMGUI_API bool igDockNodeIsInHierarchyOf(ImGuiDockNode* node,ImGuiDockNode* parent)
-{
-    return ImGui::DockNodeIsInHierarchyOf(node,parent);
-}
-CIMGUI_API int igDockNodeGetDepth(const ImGuiDockNode* node)
-{
-    return ImGui::DockNodeGetDepth(node);
-}
-CIMGUI_API ImGuiID igDockNodeGetWindowMenuButtonId(const ImGuiDockNode* node)
-{
-    return ImGui::DockNodeGetWindowMenuButtonId(node);
-}
-CIMGUI_API ImGuiDockNode* igGetWindowDockNode()
-{
-    return ImGui::GetWindowDockNode();
-}
-CIMGUI_API bool igGetWindowAlwaysWantOwnTabBar(ImGuiWindow* window)
-{
-    return ImGui::GetWindowAlwaysWantOwnTabBar(window);
-}
-CIMGUI_API void igBeginDocked(ImGuiWindow* window,bool* p_open)
-{
-    return ImGui::BeginDocked(window,p_open);
-}
-CIMGUI_API void igBeginDockableDragDropSource(ImGuiWindow* window)
-{
-    return ImGui::BeginDockableDragDropSource(window);
-}
-CIMGUI_API void igBeginDockableDragDropTarget(ImGuiWindow* window)
-{
-    return ImGui::BeginDockableDragDropTarget(window);
-}
-CIMGUI_API void igSetWindowDock(ImGuiWindow* window,ImGuiID dock_id,ImGuiCond cond)
-{
-    return ImGui::SetWindowDock(window,dock_id,cond);
-}
-CIMGUI_API void igDockBuilderDockWindow(const char* window_name,ImGuiID node_id)
-{
-    return ImGui::DockBuilderDockWindow(window_name,node_id);
-}
-CIMGUI_API ImGuiDockNode* igDockBuilderGetNode(ImGuiID node_id)
-{
-    return ImGui::DockBuilderGetNode(node_id);
-}
-CIMGUI_API ImGuiDockNode* igDockBuilderGetCentralNode(ImGuiID node_id)
-{
-    return ImGui::DockBuilderGetCentralNode(node_id);
-}
-CIMGUI_API ImGuiID igDockBuilderAddNode(ImGuiID node_id,ImGuiDockNodeFlags flags)
-{
-    return ImGui::DockBuilderAddNode(node_id,flags);
-}
-CIMGUI_API void igDockBuilderRemoveNode(ImGuiID node_id)
-{
-    return ImGui::DockBuilderRemoveNode(node_id);
-}
-CIMGUI_API void igDockBuilderRemoveNodeDockedWindows(ImGuiID node_id,bool clear_settings_refs)
-{
-    return ImGui::DockBuilderRemoveNodeDockedWindows(node_id,clear_settings_refs);
-}
-CIMGUI_API void igDockBuilderRemoveNodeChildNodes(ImGuiID node_id)
-{
-    return ImGui::DockBuilderRemoveNodeChildNodes(node_id);
-}
-CIMGUI_API void igDockBuilderSetNodePos(ImGuiID node_id,ImVec2_c pos)
-{
-    return ImGui::DockBuilderSetNodePos(node_id,ConvertToCPP_ImVec2(pos));
-}
-CIMGUI_API void igDockBuilderSetNodeSize(ImGuiID node_id,ImVec2_c size)
-{
-    return ImGui::DockBuilderSetNodeSize(node_id,ConvertToCPP_ImVec2(size));
-}
-CIMGUI_API ImGuiID igDockBuilderSplitNode(ImGuiID node_id,ImGuiDir split_dir,float size_ratio_for_node_at_dir,ImGuiID* out_id_at_dir,ImGuiID* out_id_at_opposite_dir)
-{
-    return ImGui::DockBuilderSplitNode(node_id,split_dir,size_ratio_for_node_at_dir,out_id_at_dir,out_id_at_opposite_dir);
-}
-CIMGUI_API void igDockBuilderCopyDockSpace(ImGuiID src_dockspace_id,ImGuiID dst_dockspace_id,ImVector_const_charPtr* in_window_remap_pairs)
-{
-    return ImGui::DockBuilderCopyDockSpace(src_dockspace_id,dst_dockspace_id,in_window_remap_pairs);
-}
-CIMGUI_API void igDockBuilderCopyNode(ImGuiID src_node_id,ImGuiID dst_node_id,ImVector_ImGuiID* out_node_remap_pairs)
-{
-    return ImGui::DockBuilderCopyNode(src_node_id,dst_node_id,out_node_remap_pairs);
-}
-CIMGUI_API void igDockBuilderCopyWindowSettings(const char* src_name,const char* dst_name)
-{
-    return ImGui::DockBuilderCopyWindowSettings(src_name,dst_name);
-}
-CIMGUI_API void igDockBuilderFinish(ImGuiID node_id)
-{
-    return ImGui::DockBuilderFinish(node_id);
-}
 CIMGUI_API void igPushFocusScope(ImGuiID id)
 {
     return ImGui::PushFocusScope(id);
@@ -5338,6 +5029,10 @@ CIMGUI_API void igPopFocusScope()
 {
     return ImGui::PopFocusScope();
 }
+CIMGUI_API bool igIsInNavFocusRoute(ImGuiID focus_scope_id)
+{
+    return ImGui::IsInNavFocusRoute(focus_scope_id);
+}
 CIMGUI_API ImGuiID igGetCurrentFocusScope()
 {
     return ImGui::GetCurrentFocusScope();
@@ -5366,9 +5061,9 @@ CIMGUI_API void igRenderDragDropTargetRectForItem(const ImRect_c bb)
 {
     return ImGui::RenderDragDropTargetRectForItem(ConvertToCPP_ImRect(bb));
 }
-CIMGUI_API void igRenderDragDropTargetRectEx(ImDrawList* draw_list,const ImRect_c bb)
+CIMGUI_API void igRenderDragDropTargetRectEx(ImDrawList* draw_list,const ImRect_c bb,float rounding)
 {
-    return ImGui::RenderDragDropTargetRectEx(draw_list,ConvertToCPP_ImRect(bb));
+    return ImGui::RenderDragDropTargetRectEx(draw_list,ConvertToCPP_ImRect(bb),rounding);
 }
 CIMGUI_API ImGuiTypingSelectRequest* igGetTypingSelectRequest(ImGuiTypingSelectFlags flags)
 {
@@ -5538,6 +5233,10 @@ CIMGUI_API void igTableUpdateColumnsWeightFromWidth(ImGuiTable* table)
 {
     return ImGui::TableUpdateColumnsWeightFromWidth(table);
 }
+CIMGUI_API void igTableApplyExternalUnclipRect(ImGuiTable* table,ImRect* rect)
+{
+    return ImGui::TableApplyExternalUnclipRect(table,*rect);
+}
 CIMGUI_API void igTableDrawBorders(ImGuiTable* table)
 {
     return ImGui::TableDrawBorders(table);
@@ -5702,10 +5401,6 @@ CIMGUI_API ImGuiTabItem* igTabBarFindTabByOrder(ImGuiTabBar* tab_bar,int order)
 {
     return ImGui::TabBarFindTabByOrder(tab_bar,order);
 }
-CIMGUI_API ImGuiTabItem* igTabBarFindMostRecentlySelectedTabForActiveWindow(ImGuiTabBar* tab_bar)
-{
-    return ImGui::TabBarFindMostRecentlySelectedTabForActiveWindow(tab_bar);
-}
 CIMGUI_API ImGuiTabItem* igTabBarGetCurrentTab(ImGuiTabBar* tab_bar)
 {
     return ImGui::TabBarGetCurrentTab(tab_bar);
@@ -5718,10 +5413,6 @@ CIMGUI_API const char* igTabBarGetTabName(ImGuiTabBar* tab_bar,ImGuiTabItem* tab
 {
     return ImGui::TabBarGetTabName(tab_bar,tab);
 }
-CIMGUI_API void igTabBarAddTab(ImGuiTabBar* tab_bar,ImGuiTabItemFlags tab_flags,ImGuiWindow* window)
-{
-    return ImGui::TabBarAddTab(tab_bar,tab_flags,window);
-}
 CIMGUI_API void igTabBarRemoveTab(ImGuiTabBar* tab_bar,ImGuiID tab_id)
 {
     return ImGui::TabBarRemoveTab(tab_bar,tab_id);
@@ -5838,10 +5529,6 @@ CIMGUI_API void igRenderArrowPointingAt(ImDrawList* draw_list,ImVec2_c pos,ImVec
 {
     return ImGui::RenderArrowPointingAt(draw_list,ConvertToCPP_ImVec2(pos),ConvertToCPP_ImVec2(half_sz),direction,col);
 }
-CIMGUI_API void igRenderArrowDockMenu(ImDrawList* draw_list,ImVec2_c p_min,float sz,ImU32 col)
-{
-    return ImGui::RenderArrowDockMenu(draw_list,ConvertToCPP_ImVec2(p_min),sz,col);
-}
 CIMGUI_API void igRenderRectFilledInRangeH(ImDrawList* draw_list,const ImRect_c rect,ImU32 col,float fill_x0,float fill_x1,float rounding)
 {
     return ImGui::RenderRectFilledInRangeH(draw_list,ConvertToCPP_ImRect(rect),col,fill_x0,fill_x1,rounding);
@@ -5907,9 +5594,9 @@ CIMGUI_API bool igCloseButton(ImGuiID id,const ImVec2_c pos)
 {
     return ImGui::CloseButton(id,ConvertToCPP_ImVec2(pos));
 }
-CIMGUI_API bool igCollapseButton(ImGuiID id,const ImVec2_c pos,ImGuiDockNode* dock_node)
+CIMGUI_API bool igCollapseButton(ImGuiID id,const ImVec2_c pos)
 {
-    return ImGui::CollapseButton(id,ConvertToCPP_ImVec2(pos),dock_node);
+    return ImGui::CollapseButton(id,ConvertToCPP_ImVec2(pos));
 }
 CIMGUI_API void igScrollbar(ImGuiAxis axis)
 {
@@ -6179,10 +5866,6 @@ CIMGUI_API void igDebugNodeColumns(ImGuiOldColumns* columns)
 {
     return ImGui::DebugNodeColumns(columns);
 }
-CIMGUI_API void igDebugNodeDockNode(ImGuiDockNode* node,const char* label)
-{
-    return ImGui::DebugNodeDockNode(node,label);
-}
 CIMGUI_API void igDebugNodeDrawList(ImGuiWindow* window,ImGuiViewportP* viewport,const ImDrawList* draw_list,const char* label)
 {
     return ImGui::DebugNodeDrawList(window,viewport,draw_list,label);
@@ -6255,10 +5938,6 @@ CIMGUI_API void igDebugNodeViewport(ImGuiViewportP* viewport)
 {
     return ImGui::DebugNodeViewport(viewport);
 }
-CIMGUI_API void igDebugNodePlatformMonitor(ImGuiPlatformMonitor* monitor,const char* label,int idx)
-{
-    return ImGui::DebugNodePlatformMonitor(monitor,label,idx);
-}
 CIMGUI_API void igDebugRenderKeyboardPreview(ImDrawList* draw_list)
 {
     return ImGui::DebugRenderKeyboardPreview(draw_list);
@@ -6499,6 +6178,10 @@ CIMGUI_API void igImFontAtlasTextureBlockQueueUpload(ImFontAtlas* atlas,ImTextur
 {
     return ImFontAtlasTextureBlockQueueUpload(atlas,tex,x,y,w,h);
 }
+CIMGUI_API void igImTextureDataQueueUpload(ImTextureData* tex,int x,int y,int w,int h)
+{
+    return ImTextureDataQueueUpload(tex,x,y,w,h);
+}
 CIMGUI_API int igImTextureDataGetFormatBytesPerPixel(ImTextureFormat format)
 {
     return ImTextureDataGetFormatBytesPerPixel(format);

cimgui_impl.h

@@ -119,7 +119,6 @@ struct ImGui_ImplVulkan_PipelineInfo
     VkSampleCountFlagBits MSAASamples;
     ImVector_VkDynamicState ExtraDynamicStates;
     VkPipelineRenderingCreateInfoKHR PipelineRenderingCreateInfo;
-    VkImageUsageFlags SwapChainImageUsage;
 };
 typedef struct ImGui_ImplVulkan_InitInfo ImGui_ImplVulkan_InitInfo;
 struct ImGui_ImplVulkan_InitInfo
@@ -136,7 +135,6 @@ struct ImGui_ImplVulkan_InitInfo
     uint32_t ImageCount;
     VkPipelineCache PipelineCache;
     ImGui_ImplVulkan_PipelineInfo PipelineInfoMain;
-    ImGui_ImplVulkan_PipelineInfo PipelineInfoForViewports;
     bool UseDynamicRendering;
     const VkAllocationCallbacks* Allocator;
     void (*CheckVkResultFn)(VkResult err);
@@ -184,6 +182,7 @@ struct ImGui_ImplVulkanH_Window
     int Height;
     VkSwapchainKHR Swapchain;
     VkRenderPass RenderPass;
+    VkPipeline Pipeline;
     uint32_t FrameIndex;
     uint32_t ImageCount;
     uint32_t SemaphoreCount;
@@ -197,16 +196,17 @@ typedef ImVector<ImGui_ImplVulkanH_Frame> ImVector_ImGui_ImplVulkanH_Frame;
 typedef ImVector<ImGui_ImplVulkanH_FrameSemaphores> ImVector_ImGui_ImplVulkanH_FrameSemaphores;
 typedef ImVector<VkDynamicState> ImVector_VkDynamicState;
 #endif //CIMGUI_DEFINE_ENUMS_AND_STRUCTS
+#define IMGUI_IMPL_VULKAN_MINIMUM_SAMPLED_IMAGE_POOL_SIZE (8)
+#define IMGUI_IMPL_VULKAN_MINIMUM_SAMPLER_POOL_SIZE (2)
 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 VkDescriptorSet ImGui_ImplVulkan_AddTexture(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 bool ImGui_ImplVulkan_LoadFunctions(uint32_t api_version,PFN_vkVoidFunction(*loader_func)(const char* function_name,void* user_data),void* user_data);

generator/cpp2ffi.lua

@@ -207,6 +207,26 @@ local function check_template(code)
 	return ttype,template,te,code2
 end
 ----------------------------------------
+local CCCnum = 0
+local function getffiint32val(val)
+	local str = [[
+	local ffi = require"ffi"
+	ffi.cdef("static const int32_t CCC]]..CCCnum..[[ = ]]..val..[[;") return ffi.C.CCC]]..CCCnum
+	local f,err = loadstring(str)
+	assert(f,err)
+	CCCnum = CCCnum + 1
+	return f()
+end
+local function getffival(name,val)
+	local str = [[
+	local ffi = require"ffi"
+	ffi.cdef("static const int32_t ]]..name..[[ = ]]..val..[[;") return ffi.C.]]..name
+	print(str)
+	local f,err = loadstring(str)
+	assert(f,err)
+	return f()
+end
+
 local function parse_enum_value(value, allenums,dontpost)
 	local function clean(val)
 		if type(val)=="string" then
@@ -229,12 +249,23 @@ local function parse_enum_value(value, allenums,dontpost)
 		------------precedence order (hope not ())
 		--delete (int)
 		value = value:gsub("%(int%)","")
+		value = value:gsub("%(%w+%)","")
 		--first drop outer ()
 		value = value:gsub("^(%()",""):gsub("(%))$","")
 		assert(not value:match("[%(%)]"),value)
 		
+		local numval = tonumber(value)
+		--check int32_t
+		-- if numval then
+			-- local ok,numval2 = pcall(getffiint32val,value)
+			-- if ok and numval~=numval2 then
+				-- print("===========",value,numval,numval2)
+			-- end
+		-- end
+		if numval then return numval end 
+		
 		local several,seps = strsplit(value,"([<>&|~%+%-]+)") 
-		--M.prtable(value,several,seps)
+		--M.prtable("ccc",value,tonumber(value),several,seps)
 		assert(#seps+1==#several)
 		
 		local i = 1
@@ -293,7 +324,7 @@ local function parse_enum_value(value, allenums,dontpost)
 			--M.prtable("allenums",allenums)
 		end
 		assert(#seps==0)
-		assert(type(several[1])=="number" or type(several[1])=="cdata")
+		assert(type(several[1])=="number" or type(several[1])=="cdata",type(several[1]))
 		--converst 1ULL to "1ULL"
 		if type(several[1])=="cdata" then several[1] = tostring(several[1]) end
 		return several[1]
@@ -343,7 +374,7 @@ local function getRE()
 	local res = {
 	function_re = "^([^;{}]+%b()[\n%s]*;)%s*",
 	function_re = "^([^;{}=]+%b()[\n%s%w]*;)", --const at the end
-	function_re = "^([^;{}=]+%b()[\n%s%w%(%)_]*;)", --attribute(deprecated)
+	function_re = "^([^;{}=]+%b()[\n%s=%w%(%)_]*;)", --attribute(deprecated)
 	--we need to skip = as function because of "var = f()" initialization in struct fields
 	-- but we don want operator== to appear as a var and as we should skip this kind of function solution is:
 	operator_re = "^([^;{}]+operator[^;{}]+%b()[\n%s%w%(%)_]*;)",
@@ -473,7 +504,7 @@ local function parseItems(txt,linenumdict, itparent, dumpit)
 					else
 						error"no linenumdict"
 					end
-					table.insert(itemarr,{re_name=re_name,item=item,locat=loca,prevcomments=comments})
+					table.insert(itemarr,{re_name=re_name,item=item,locat=loca,prevcomments=comments,parent=itparent})
 					items[re_name] = items[re_name] or {}
 					table.insert(items[re_name],item)
 				end
@@ -744,11 +775,13 @@ local function parseFunction(self,stname,itt,namespace,locat)
 		--print("template",lineorig)
 		return 
 	end
+	
     
     local ret = line:match("([^%(%):,]+[%*%s])%s?~?[_%w]+%b()")
 	--local ret = line:match("(.+[%*%s])%s?~?[_%w]+%b()")
     --local funcname, args = line:match("(~?[_%w]+)%s*(%b())")
 	local funcname, args, extraconst = line:match("(~?[_%w]+)%s*(%b())(.*)")
+	if extraconst == "=delete;" then return end
 	extraconst = extraconst:match("const")
 
 	if not args then
@@ -962,7 +995,7 @@ local function parseFunction(self,stname,itt,namespace,locat)
     defT.call_args = caar --call_args
     defT.isvararg = signat:match("%.%.%.%)$")
     defT.location = locat
-    local comentario = (itt.comments or "")..(comment or "")
+    local comentario = (itt.prevcomments or "")..(itt.comments or "")..(comment or "")
 	if comentario=="" then comentario=nil end
     defT.comment = comentario
     defT.argsT = argsArr
@@ -976,6 +1009,12 @@ local function parseFunction(self,stname,itt,namespace,locat)
 		defT.stdret = line:match("^\n*%s*std::")
 		--if ret:match"string" then print("parsefunction",defT.cimguiname, ret, line) end
         defT.ret = clean_spaces(ret:gsub("&","*"))
+		--name_conversion
+		local rr = defT.ret:gsub("*","")
+		rr = rr:gsub("const ","")
+		if self.name_conversion and self.name_conversion[rr] then
+			defT.ret = defT.ret:gsub(rr,self.name_conversion[rr])
+		end
         defT.retref = ret:match("&")
         -- if defT.ret=="ImVec2" or defT.ret=="ImVec4" or defT.ret=="ImColor" then
             -- defT.ret = defT.ret.."_Simple"
@@ -1157,7 +1196,9 @@ local function get_nonPOD(FP)
 		end
 	end
 	FP.structs_and_enums_table.nonPOD = nonPOD
+	if next(nonPOD) then
 	M.prtable("nonPOD",nonPOD)
+	end
 	return nonPOD
 end
 local function recur_calc_depth(FP, structs, k,n)
@@ -1324,19 +1365,9 @@ local function get_nonPODused(FP)
 	FP.structs_and_enums_table.nonPOD_used = FP.nP_used
 	FP.nP_args = typeargs
 	FP.nP_ret = typeargs_ret
-	--genConversions(FP)
+	if next(FP.nP_ret) then
-	--M.prtable(typeargs,typeargs_ret,all_type_nP)
+	M.prtable("np_ret",FP.nP_ret)
-	-- local typeargs2 = {}
+	end
-	-- 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)
@@ -1438,19 +1469,31 @@ local function ADDnonUDT(FP)
 			--ret
 			local rets = (def.ret or ""):gsub("const ","")
 			rets = rets:gsub("*","")
+			--returns nonPOD -> nonPOD_c with conversion
 			if FP.nP_ret[def.ret] then
-				def.conv = (def.ret):gsub("const ","")
+				def.conv = (def.ret)--:gsub("const ","")
 				def.ret = FP.nP_ret[def.ret]
 				def.nonUDT = 1
+			--returns nonPOD* -> returns nonPOD_c with reinterpret_cast
 			elseif FP.nP_ret[rets] then
 				def.ret = def.ret:gsub(rets, FP.nP_ret[rets])
 				def.nonUDT = 2
+			--return std::string -> return const char*
 			elseif def.ret=="string" then
 				def.ret = "const char*"
 				def.nonUDT = "string"
+			--return opaque_struct
 			elseif FP.opaque_structs[rets] then
-				assert(def.ret:match"%*","opaque struct without pointer")
+				if not def.ret:match"%*" then
-				def.ret = def.ret:gsub(rets.."%s*%*",rets.."_opq")
+					--assert(def.ret:match"%*","return opaque struct without pointer")
+					--M.prtable(def)
+					--error"return opaque struct without pointer"
+					def.nonUDT = "opaque"
+					def.ret = def.ret.."*" --def.ret:gsub(rets,rets.."_opq")
+				else
+					--def.ret = def.ret:gsub(rets.."%s*%*",rets.."_opq")
+				end
+			--return std:: -> skip function
 			elseif def.stdret then -- not std::string
 				skip = true
 			end
@@ -1468,9 +1511,11 @@ local function ADDnonUDT(FP)
 					else
 						local typ = v.type:gsub("const ","")
 						local typ2 = typ:gsub("*","")
+						--nonPOD arg -> convert
 						if FP.nP_args[v.type] then
 							caar = caar .. "ConvertToCPP_"..typ.."("..name.."),"
 							asp = asp .. v.type:gsub(typ,typ.."_c").." "..v.name..","
+						--nonPOD* arg -> reinterpret_cast
 						elseif FP.nP_args[typ2] then
 							local typ3 = v.type:gsub(typ2,typ2.."_c")
 							caar = caar .. "reinterpret_cast<"..v.type..">("..name.."),"
@@ -1492,13 +1537,18 @@ local function ADDnonUDT(FP)
 						elseif FP.opaque_structs[typ2] then
 							--assert(v.type:match"%*","opaque struct arg without pointer")
 							if not v.type:match"%*" then
-								M.prtable(def)
+								--M.prtable(def)
-								error"opaque struct arg without pointer"
+								--error"opaque struct arg without pointer"
+								local newt = v.type.."*" --v.type:gsub(typ2,typ2.."_opq")
+								local callname = "*"..name
+								caar = caar .. callname .. ","
+								asp = asp .. newt.." "..name .. ","
+							else
+								local newt = v.type --v.type:gsub(typ2.."%s*%*",typ2.."_opq")
+								local callname = v.reftoptr and "*"..name or name
+								caar = caar .. callname .. ","
+								asp = asp .. newt.." "..name .. ","
 							end
-							local newt = v.type:gsub(typ2.."%s*%*",typ2.."_opq")
-							local callname = v.reftoptr and "*"..name or name
-							caar = caar .. callname .. ","
-							asp = asp .. newt.." "..name .. ","
 						else
 							local siz = v.type:match("(%[%d*%])") or ""
 							local typ = v.type:gsub("(%[%d*%])","")
@@ -1750,6 +1800,7 @@ function M.Parser()
 	par.skipped = {}
 	par.UDTs = {}
 	par.opaque_structs = {}
+	par.forced_opaque = {}
 	
 	par.save_output = save_output
 	par.genConversors = genConversions
@@ -1760,8 +1811,13 @@ function M.Parser()
 		table.insert(cdefs,{line:gsub("^(%s*.-)%s*$", "%1"),loca})
 	end
 	function par.getCname(stname,funcname, namespace)
-		if #stname == 0 then return funcname end --top level
+		--if #stname == 0 then return funcname end --top level
-		local pre = stname.."_"
+		local pre = (namespace and namespace~="") and (namespace:gsub("::","_") .. "_") or ""
+		pre = pre .. (stname~="" and (stname .. "_") or "")
+		if pre:match":" then print(stname, funcname, namespace); error"debug" end
+		-- if stname== "" then
+		-- local pre = (stname == "") and (namespace and (namespace.."_") or "") or stname.."_"
+		-- local pre = stname.."_"
 		return pre..funcname
 	end
 	function par.getCname_overload(stname,funcname,signature, namespace)
@@ -1776,6 +1832,8 @@ function M.Parser()
 		return par.skipped[def.ov_cimguiname] or par.skipped[def.cimguiname]
 	end
 	function par:take_lines(cmd_line,names,compiler)
+		assert(compiler)
+		self.COMPILER = compiler
 		if self.COMMENTS_GENERATION then
 			cmd_line = cmd_line .. (compiler=="cl" and " /C " or " -C ")
 		end
@@ -1806,13 +1864,90 @@ function M.Parser()
 		self.constants = defines
 		return defines
 	end
+	--------------------------------------------------------------------
+	local function get_cdefs(gccline,locat,cdef)
+		--print("get_cdefs",gccline,locat,cdef)
+		cdef = cdef or {}
+		numerr = numerr + 1
+		local errfile = "err_cdefs"..numerr..".txt"
+		local pipe,err = io.popen(gccline.." 2>"..errfile,"r")
+		--local pipe,err = io.popen(gccline,"r")
+		if not pipe then error("could not execute gcc "..err) end
+		local skip
+		for line in M.location(pipe,{locat}) do
+			--print(line)
+			line = line:gsub("extern __attribute__%(%(dllexport%)%)%s*","")
+			line = line:gsub("extern __declspec%(dllexport%)%s*","")
+			skip = false
+			if line~="" then 
+				if line:match("^%s*static const") and not line:match("static const int") then skip=true end
+				if not skip then
+					table.insert(cdef,line) 
+				end
+			end
+		end
+		pipe:close()
+		
+		local f = assert(io.open(errfile,"r"))
+		local errstr = f:read"*a"
+		f:close()
+		print(#errstr,"errstr")
+		print(errstr)
+		--try to guess a compiler error
+		assert(not errstr:match" error")
+		os.remove(errfile)
+		return cdef
+	end
+	local ffi = require"ffi"
+	--utility functions
+	local ffi_cdef = function(code)
+		local ret,err = pcall(ffi.cdef,code)
+		if not ret then
+			local lineN = 1
+			for line in code:gmatch("([^\n\r]*)\r?\n") do
+				print(lineN, line)
+				lineN = lineN + 1
+			end
+			print(err)
+			error"bad cdef"
+		end
+	end
+
+	function par:get_cal_value_ffi()
+		local COMPILER, CPRE = self.COMPILER
+		if COMPILER == "cl" then
+			CPRE = COMPILER..[[ /E /DCIMGUI_DEFINE_ENUMS_AND_STRUCTS -DIMGUI_ENABLE_FREETYPE ./ccode.h]]
+		else
+			CPRE = COMPILER..[[ -E -DCIMGUI_DEFINE_ENUMS_AND_STRUCTS -DIMGUI_ENABLE_FREETYPE ./ccode.h]]
+		end
+		local cdefs = "typedef void FILE;"
+		cdefs = cdefs..self.structs_and_enums[1]..self.structs_and_enums[2]
+		save_data("ccode.h", cdefs)
+		
+		local cdefs = get_cdefs(CPRE,"ccode")
+		--M.prtable(cdefs)
+		cdefs = table.concat(cdefs,"\n")
+		--print("===================================",cdefs)
+		save_data("ccode.h.lua", cdefs)
+		local ffi = require"ffi"
+		ffi_cdef(cdefs)
+		for k,enum in pairs(self.structs_and_enums_table.enums) do
+			for i,field in ipairs(enum) do
+				--print(field.calc_value)
+				if field.calc_value ~= ffi.C[field.name] then
+					print(field.name,field.calc_value , ffi.C[field.name])
+				end
+			end
+		end
+	end
 	function par:do_parse()
 		self:parseItems()
 		self:gen_structs_and_enums_table()
 		self:compute_overloads()
 		self:gen_structs_and_enums()
-		--self:compute_overloads()
 		--self:compute_templated()
+		--check int32_t and others
+		--self:get_cal_value_ffi()
 		ADDdestructors(self)
 	end
 	function par:initTypedefsDict()
@@ -1881,11 +2016,44 @@ function M.Parser()
 		end
 		return stname, derived
 	end
+	local function get_parents_name(it)
+		local parnam = ""
+		while it.parent do
+			parnam = it.parent.name.."::"..parnam
+			it = it.parent
+		end
+		return parnam
+	end
+	local function get_parents_nameC(it)
+		local parnam = ""
+		while it.parent do
+			parnam = it.parent.name.."::"..parnam
+			it = it.parent
+		end
+		if parnam~="" then parnam = parnam:sub(1,-3) end
+		return parnam
+	end
 	--recursive item parsing
 	function par:parseItemsR2(txt, itparent)
 		local itsarr,its = parseItems(txt,self.linenumdict,itparent)
+		--clean protect
+		if itparent and itparent.re_name == "class_re" then
+			local first_private
+			for j,child in ipairs(itsarr) do
+				if child.item:match("^\n*%s*private:") or child.item:match("^\n*%s*protected:") then
+					first_private = j
+					break
+				end
+			end
+			if first_private then
+				for j=first_private,#itsarr do
+					--print("private discards",it.childs[j].re_name,it.childs[j].name)
+					itsarr[j] = nil
+				end
+			end
+		end
 		for i,it in ipairs(itsarr) do
-			--clean class
+			--clean class and get name
 			if it.re_name == "class_re" then
 				it.name = it.item:match("class%s+(%S+)")
 				print("cleaning class",it.name)
@@ -1893,23 +2061,31 @@ function M.Parser()
 				--it.item = it.item:gsub("private:","")
 				it.item = it.item:gsub("public:","")
 				it.item = it.item:gsub("enum%s*class","enum")
+			elseif it.re_name == "struct_re" then
+				it.name = it.item:match("struct%s+([^%s{]+)")
+				if self.name_conversion and self.name_conversion[it.name] then
+					it.name = self.name_conversion[it.name]
+					print("=========conversion",it.name)
+				end
+			elseif it.re_name == "namespace_re" then
+				it.name = it.item:match("namespace%s+(%S+)")
 			end
 
 			if not isLeaf(it.re_name) then
 				local inner = strip_end(it.item:match("%b{}"):sub(2,-2))
-				--print(it.item)
+				--print("not isLeaf",it.re_name,it.name)
 				--print(inner)
 				it.childs = par:parseItemsR2(inner, it)
 				--if it.name == "TextEditor" then M.prtable(it.childs) end
-				for j,child in ipairs(it.childs) do
+				-- for j,child in ipairs(it.childs) do
-					child.parent = it
+					-- child.parent = it
-				end
+				-- end
 				
 				if it.re_name == "struct_re" then
 					local typename = it.item:match("^%s*template%s*<%s*typename%s*(%S+)%s*>")
 					--local stname = it.item:match("struct%s+(%S+)")
-					local stname = it.item:match("struct%s+([^%s{]+)") --unamed
+					--local stname = it.item:match("struct%s+([^%s{]+)") --unamed
-					it.name = stname
+					local stname = it.name
 					
 					--local templa1,templa2 = it.item:match("^%s*template%s*<%s*(%S+)%s*(%S+)%s*>")
 					local templa2 = it.item:match("^%s*template%s*<%s*([^<>]+)%s*>")
@@ -1920,37 +2096,62 @@ function M.Parser()
 						self.typenames[stname] = typename or templa2
 					end
 				elseif it.re_name == "namespace_re" then
-					it.name = it.item:match("namespace%s+(%S+)")
+					--it.name = it.item:match("namespace%s+(%S+)")
 				elseif it.re_name == "class_re" then
-					--it.name = it.item:match("class%s+(%S+)")
+					-- local first_private
-					local first_private
+					-- for j,child in ipairs(it.childs) do
-					for j,child in ipairs(it.childs) do
+						-- if child.item:match("^\n*%s*private:") or child.item:match("^\n*%s*protected:") then
-						if child.item:match("^\n*%s*private:") or child.item:match("^\n*%s*protected:") then
+							-- first_private = j
-							first_private = j
+							-- break
-							break
+						-- end
-						end
+					-- end
-					end
+					-- if first_private then
-					if first_private then
+						-- for j=first_private,#it.childs do
-						for j=first_private,#it.childs do
+							----print("private discards",it.childs[j].re_name,it.childs[j].name)
-							--print("private discards",it.childs[j].re_name,it.childs[j].name)
+							-- it.childs[j] = nil
-							it.childs[j] = nil
+						-- end
-						end
+					-- end
-					end
 				end
 				
 				--create opaque_struct
 				if it.re_name == "struct_re" or it.re_name == "class_re" then
 					local stname,derived = derived_check(it)
+						if derived then
+							local derived2 = derived:gsub("%b<>","") 
+							derived2 = derived2:gsub("%w+::","")
+							print("--derived check",stname, derived, derived2)
+							M.prtable(self.opaque_structs)
+							if self.opaque_structs[derived2] then
+								print("--make opaque opaque derived",it.name,derived,derived2)
+								it.opaque_struct = get_parents_name(it)..it.name
+								self.opaque_structs[it.name] = it.opaque_struct
+							end
+						end
 					if derived and derived:match"std::" then
 						print("--make opaque std::derived",it.name,derived)
-						it.opaque_struct = (itparent and itparent.name .."::" or "")..it.name
+						--it.opaque_struct = (itparent and itparent.name .."::" or "")..it.name
+						it.opaque_struct = get_parents_name(it)..it.name
+						self.opaque_structs[it.name] = it.opaque_struct
+					end
+					if self.forced_opaque[it.name] then
+						print("--make forced opaque opaque derived",it.name)
+						it.opaque_struct = get_parents_name(it)..it.name
+						self.opaque_structs[it.name] = it.opaque_struct
 					end
 					for j,child in ipairs(it.childs) do
-						if child.re_name == "vardef_re" and child.item:match"std::" then
+						-- if child.re_name == "vardef_re" and child.item:match"using" then
+							-- print("=====using",child.item)
+						-- end
+						if (child.re_name == "vardef_re") and child.item:match"std::" then
 							print("--make opaque",it.name,child.item)
-							it.opaque_struct = (itparent and itparent.name .."::" or "")..it.name
+							--M.prtable(itparent)
+							--it.opaque_struct = (itparent and itparent.name .."::" or "")..it.name
+							it.opaque_struct = get_parents_name(it)..it.name
+							print("===parents1",get_parents_name(it),"===parents2",(itparent and itparent.name .."::" or ""))
+							print("===",it.opaque_struct)
 							--cant do that as function is recursive
-							--self.opaque_structs[it.name] = (itparent and itparent.name .."::" or "")..it.name
+							--self.opaque_structs[it.name] = get_parents_name(it)..it.name--(itparent and itparent.name .."::" or "")..it.name
+							self.opaque_structs[it.name] = it.opaque_struct
 							break
 						end
 					end
@@ -2032,11 +2233,11 @@ function M.Parser()
 		table.insert(txtclean,txt:sub(ini))
 		print("end cleaning ------------------------------",nn)
 		txt = table.concat(txtclean)
+		--]]
 		end
 		--save_data("./preparse"..tostring(self):gsub("table: ","")..".c",txt)
-		--]]
 		self.itemsarr = par:parseItemsR2(txt)
-		save_data("./itemsarr.lua",ToStr(self.itemsarr))
+		save_data("./itemsarr.lua",M.serializeTableF(self.itemsarr))--ToStr(self.itemsarr))
 		itemsarr = self.itemsarr
 		---find opaque_structs
 		self:Listing(itemsarr,function(it) 
@@ -2130,6 +2331,12 @@ function M.Parser()
 				error"could not get stname"
 			end
 		end
+		
+		if self.name_conversion and self.name_conversion[stname] then
+			itst.or_name = stname
+			stname = self.name_conversion[stname]
+		end
+		--stname = self.name_conversion and self.name_conversion[stname] or stname
 		--initial
 
 		table.insert(outtab,"\nstruct "..stname.."\n")
@@ -2172,6 +2379,15 @@ function M.Parser()
 							predeclare = predeclare .. templatetypedef
 						end
 					end
+					--clean using
+					if it.re_name == "vardef_re" and it.item:match("using%s+([^=%s]+)%s*=%s*([^;]+);") then
+						print("===using",it.item)
+						local typedef, assign = it2:match("using%s+([^=%s]+)%s*=%s*([^;]+);")
+						print(typedef,assign)
+						assign = assign:gsub("%w+::","")
+						predeclare = predeclare .. "\ntypedef "..assign.." "..typedef..";"
+						it2 = "" --"\ntypedef "..assign.." "..typedef..";"
+					end
 					--clean mutable
 					it2 = it2:gsub("mutable","")
 					--clean namespaces but not std::
@@ -2244,38 +2460,31 @@ function M.Parser()
 		end
 		return table.concat(outtab,""),stname,outtab,commtab, predeclare
 	end
-	local function get_parents_name(it)
+	
-		local parnam = ""
-		while it.parent do
-			parnam = it.parent.name.."::"..parnam
-			it = it.parent
-		end
-		return parnam
-	end
-	local function get_parents_nameC(it)
-		local parnam = ""
-		while it.parent do
-			parnam = it.parent.name.."::"..parnam
-			it = it.parent
-		end
-		if parnam~="" then parnam = parnam:sub(1,-3) end
-		return parnam
-	end
 	function par:header_text_insert(tab,txt,it)
 		--print("--header_text_insert",txt)--:sub(1,40)) 
 		table.insert(tab, txt)
 	end
 	local function function_parse(self,it)
+		--print"------------function_parse"
 		local stname = ""
 		local namespace
 		if it.parent then
+			-- local parr = it.parent
+			-- it.parent = nil
+			-- print(parr.re_name,parr.name)
+			-- M.prtable(it)
+			-- it.parent = parr
 			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
 				namespace = get_parents_nameC(it)
 			elseif it.parent.re_name == "namespace_re" then
 				namespace = get_parents_nameC(it) --it.parent.name
+				--print("--function_parse namespace",namespace)
 			end
 		end
+		--print("--namespace",namespace)
+		--if namespace == "ax::NodeEditor::Config" then error"debug" 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
@@ -2292,7 +2501,8 @@ function M.Parser()
 	end
 	function par:enum_for_header( it,outtab)
 				--local enumname, enumbody = it.item:match"^%s*enum%s+([^%s;{}]+)[%s\n\r]*(%b{})"
-				local enumname = it.item:match"^%s*enum%s+([^%s;{}]+)"
+				local enumname = it.item:match"^%s*enum%s+([^%s;{}:]+)"
+				--if enumname and enumname:match":" then print("---enumname",enumname); error"debug" end
 				if enumname then
 					--if it's an enum with int type changed
 					if self.structs_and_enums_table.enumtypes[enumname] then
@@ -2318,12 +2528,14 @@ function M.Parser()
 						self:header_text_insert(outtab, it2, it)
 					end
 					if it.parent then
-						if it.parent.re_name == "namespace_re" then
+						local namespace = get_parents_nameC(it)
-							local namespace = it.parent.item:match("namespace%s+(%S+)")
+						self.embeded_enums[enumname] = namespace.."::"..enumname
-							self.embeded_enums[enumname] = namespace.."::"..enumname
+						-- if it.parent.re_name == "namespace_re" then
-						else
+							-- local namespace = it.parent.item:match("namespace%s+(%S+)")
-							self.embeded_enums[enumname] = it.parent.name.."::"..enumname
+							-- self.embeded_enums[enumname] = namespace.."::"..enumname
-						end
+						-- else
+							--self.embeded_enums[enumname] = it.parent.name.."::"..enumname
+						-- end
 					end
 				else --unamed enum just repeat declaration
 					local cl_item = clean_comments(it.item)
@@ -2388,14 +2600,25 @@ function M.Parser()
 							print("--skip extern vardef declaration:",it2)
 							it2 = ""
 						end
+						if it2:match("using") then
+							local typedef, assign = it2:match("using%s+([^=%s]+)%s*=%s*([^;]+);")
+							print("====using",string.format("%q %q",typedef, assign))
+							if assign and assign:match"%(%s*%*%s*%)" then --function typedef
+								it2 = "\ntypedef "..assign:gsub("%(%s*%*%s*%)","(*"..typedef..")")..";"
+							end
+						end
 					end
 					--table.insert(outtabpre,it2)
 					--table.insert(outtab,it2)
+					if it2:match"template" then
+						it2=""
+					end
 					self:header_text_insert(outtab, it2, it)
 					-- add typedef after struct name
 					if it.re_name == "vardef_re" and it.item:match"^%s*struct" then
-						--print("---------emmbed")
+						-- print("---------emmbed")
-						--M.prtable(it)
+						-- print(it.item, it.locat)
+						-- error"debug"
 						local stname = it.item:match("struct%s*(%S+)%s*;")
 						--table.insert(typedefs_table,"typedef struct "..stname.." "..stname..";\n")
 						local tst = "\ntypedef struct "..stname.." "..stname..";"
@@ -2416,51 +2639,11 @@ function M.Parser()
 						--self:header_text_insert(outtab, predec .. cleanst, it)
 						self:enum_for_header(it,outtab)
 				end
-				--[[
+
-				--local enumname, enumbody = it.item:match"^%s*enum%s+([^%s;{}]+)[%s\n\r]*(%b{})"
-				local enumname = it.item:match"^%s*enum%s+([^%s;{}]+)"
-				if enumname then
-					--if it's an enum with int type changed
-					if self.structs_and_enums_table.enumtypes[enumname] then
-						local enumtype = self.structs_and_enums_table.enumtypes[enumname]
-						local enumbody = ""
-						local extraenums = ""
-						for i,v in ipairs(self.structs_and_enums_table.enums[enumname]) do
-							if type(v.calc_value)=="string" then
-								extraenums = extraenums .."\nstatic const "..enumtype.." "..v.name.." = "..v.calc_value..";"
-							else
-								enumbody = enumbody .. "\n" ..v.name .."="..v.value..","
-							end
-						end
-						enumbody = "{"..enumbody.."\n}"
-						--table.insert(outtab,"\ntypedef enum ".. enumbody..enumname..";"..extraenums)
-						local it2 = "\ntypedef enum ".. enumbody..enumname..";"..extraenums
-						self:header_text_insert(outtab, it2, it)
-					else
-						local enumbody = it.item:match"(%b{})"
-						enumbody = clean_comments(enumbody)
-						--table.insert(outtab,"\ntypedef enum ".. enumbody..enumname..";")
-						local it2 = "\ntypedef enum ".. enumbody..enumname..";"
-						self:header_text_insert(outtab, it2, it)
-					end
-					if it.parent then
-						if it.parent.re_name == "namespace_re" then
-							local namespace = it.parent.item:match("namespace%s+(%S+)")
-							self.embeded_enums[enumname] = namespace.."::"..enumname
-						else
-							self.embeded_enums[enumname] = it.parent.name.."::"..enumname
-						end
-					end
-				else --unamed enum just repeat declaration
-					local cl_item = clean_comments(it.item)
-					--table.insert(outtab,cl_item)
-					self:header_text_insert(outtab, cl_item, it)
-					print("unnamed enum",cl_item)
-				end
-				--]]
 			elseif it.re_name == "struct_re" or it.re_name == "typedef_st_re" or it.re_name == "class_re" then
 				if it.opaque_struct then
-					self:header_text_insert(outtab, "\ntypedef struct "..it.name.."* "..it.name.."_opq;\n",it)
+					--self:header_text_insert(outtab, "\ntypedef struct "..it.name.."* "..it.name.."_opq;\n",it)
+					self:header_text_insert(outtab, "\ntypedef struct "..it.name.." "..it.name..";\n",it)
 				else
 				--self:header_text_insert(outtab,"\n///inittt "..it.name.."\n", it)
 				local cleanst,structname,strtab,comstab,predec = self:clean_structR1(it,true)
@@ -2491,13 +2674,14 @@ function M.Parser()
 					--print("--------embedd1",it.re_name, it.name, embededst)
 					--TODO nesting namespace and class
 					if embededst then --discards false which can happen with untagged structs
+						local embed2 = it.or_name or it.name
 						local parname = get_parents_name(it)
 						if it.parent.re_name == "struct_re" then
 							--needed by cimnodes with struct tag name equals member name
-							self.embeded_structs[embededst] = "struct "..parname..embededst
+							self.embeded_structs[embededst] = "struct "..parname..embed2
 						else
 							--print("---------embeddd2",parname,embededst)
-							self.embeded_structs[embededst] = parname..embededst
+							self.embeded_structs[embededst] = parname..embed2
 						end
 					end
 				end
@@ -2544,6 +2728,7 @@ function M.Parser()
 		end
 		local functype_re = "^%s*[%w%s%*]+%(%*[%w_]+%)%([^%(%)]*%)"
 		local functype_reex = "^(%s*[%w%s%*]+%(%*)([%w_]+)(%)%([^%(%)]*%))"
+		if line=="" then table.insert(outtab,{type="nil",name="nil"}) ;return end 
 		line = clean_spaces(line)
 		if line:match(functype_re) then
 			local t1,name,t2 = line:match(functype_reex)
@@ -2583,10 +2768,12 @@ function M.Parser()
 			end
 		end
 	end
+	
 	local unnamed_enum_counter = 0
 	local function enums_for_table(it, outtab, enumsordered)
 		--local enumname = it.item:match"^%s*enum%s+([^%s;{}]+)"
-		local enumname = it.item:match"^[^;{}]-enum%s+([^%s;{}]+)"
+		--local enumname = it.item:match"^[^;{}]-enum%s+([^%s;{}]+)"
+		local enumname = it.item:match"^%s*enum%s+([^%s;{}:]+)"
 		if not enumname then
 			unnamed_enum_counter = unnamed_enum_counter + 1
 			enumname = "unnamed"..unnamed_enum_counter
@@ -2728,7 +2915,9 @@ function M.Parser()
 						-- print(it.item)
 						-- M.prtable(outtab.structs[structname])
 					-- end
-				else
+				else --self.typenames[structname]
+					--M.prtable("--self.typenames",structname,self.typenames[structname])
+					--M.prtable("strtab 3, -1",strtab)
 					--templated struct
 					if structname then
 						print("saving templated struct",structname)
@@ -2738,7 +2927,7 @@ function M.Parser()
 							self:parse_struct_line(strtab[j],self.templated_structs[structname],comstab[j])
 						end
 						end
-						--M.prtable(self.templated_structs[structname])
+						--M.prtable("--template_structs",structname,self.templated_structs[structname])
 					else
 						print("skipped unnamed struct",structname)
 					end
@@ -2833,6 +3022,7 @@ function M.Parser()
         table.insert(strt,"----------------overloadings---------------------------")
         --require"anima.utils" 
 		M.table_do_sorted(self.defsT, function(k,v)
+			if k:match":" then error(k) end
             get_types(v)
             if #v > 1 then
                 numoverloaded = numoverloaded + #v
@@ -3048,9 +3238,11 @@ function M.Parser()
 	function par:cimgui_generation( cimgui_header)
 		local name = self.modulename
 		local hstrfile = read_data("./"..name.."_template.h")
-		
+		M.prtable("templates",self.templates)
+		M.prtable("typenames",self.typenames)
 		local outpre,outpost = self.structs_and_enums[1], self.structs_and_enums[2]
 		local tdt = self:generate_templates()
+		M.prtable("generate_templates",tdt)
 		local cstructsstr = outpre..tdt..outpost 
 	
 		hstrfile = hstrfile:gsub([[#include "imgui_structs%.h"]],cstructsstr)
@@ -3281,10 +3473,12 @@ local function location(file,locpathT,defines,COMPILER,keepemptylines)
                 -- Is this a location pragma?
                 local loc_num_t,location_match = line:match(location_re)
                 if location_match then
+					--print(location_match)
                     in_location = false
                     for i,path_re in ipairs(path_reT) do
 						local locpath = location_match:match(path_re)
-                        if locpath then 
+                        if locpath then
+							--print("locpath",locpath)
                             in_location = true;
                             loc_num = loc_num_t
                             loc_num_incr = 0
@@ -3380,6 +3574,9 @@ local function ImGui_f_implementation(def)
 		elseif def.nonUDT == "string" then
 			insert(outtab,"    static std::string str = "..ptret..namespace..def.funcname..def.call_args..";\n")
 			insert(outtab,"    return str.c_str();\n")
+		elseif def.nonUDT == "opaque" then
+			insert(outtab,"    static auto opq = "..ptret..namespace..def.funcname..def.call_args..";\n")
+			insert(outtab,"    return &opq;\n")
         end
 		table.insert(outtab,"}\n")
     else --standard ImGui
@@ -3421,6 +3618,9 @@ local function struct_f_implementation(def)
 		elseif def.nonUDT == "string" then
 			insert(outtab,"    static std::string str = "..ptret.."self->"..def.funcname..def.call_args..";\n")
 			insert(outtab,"    return str.c_str();\n")
+		elseif def.nonUDT == "opaque" then
+			insert(outtab,"    static auto opq = "..ptret.."self->"..def.funcname..def.call_args..";\n")
+			insert(outtab,"    return &opq;\n")
         end
     else --standard struct
         table.insert(outtab,"    return "..ptret.."self->"..def.funcname..def.call_args..";\n")
@@ -3500,10 +3700,13 @@ M.table_do_sorted = table_do_sorted
 
 local function func_header_generate_structs(FP)
 
-    local outtab = {} --"\n/////func_header_generate_structs\n"}
+    local outtab = {}--"\n/////func_header_generate_structs\n"}
 
 	table_do_sorted(FP.embeded_structs,function(k,v) 
-		table.insert(outtab,"typedef "..v.." "..k..";\n") 
+		if not FP.typenames[k] then
+			print("embeded",k,v)
+			table.insert(outtab,"typedef "..v.." "..k..";\n")
+		end
 	end)
 	
 	table_do_sorted(FP.embeded_enums,function(k,v) table.insert(outtab,"typedef "..v.." "..k..";\n") end)
@@ -3517,9 +3720,13 @@ local function func_header_generate_structs(FP)
 			end)
 		end
 	end)
-	
+	--M.prtable(FP.typenames)
 	table_do_sorted(FP.opaque_structs,function(k,v)
-		table.insert(outtab,"typedef const "..v.."* "..k.."_opq;\n") 
+		if not FP.typenames[k] then
+			table.insert(outtab,"typedef "..v.." "..k..";\n") 
+			--table.insert(outtab,"typedef const "..v.."* "..k.."_opq;\n") 
+			--table.insert(outtab,"typedef "..v.."* "..k.."_opq;\n") 
+		end
 	end)
 	--table.insert(outtab, "\n//////////end func header\n")
 	return outtab

generator/generator.lua

@@ -120,10 +120,13 @@ local save_data = cpp2ffi.save_data
 local copyfile = cpp2ffi.copyfile
 local serializeTableF = cpp2ffi.serializeTableF
 
-local function func_header_impl_generate(FP)
+local function func_header_impl_generate(FP, defines)
 
     local outtab = {}
-    
+	--may be key sorting is not enough and declaration order needed 
+    cpp2ffi.table_do_sorted(defines, function(k,v)
+		table.insert(outtab,"#define "..k.." "..v.."\n")
+	end)
     -- for _,t in ipairs(FP.funcdefs) do
         -- if t.cimguiname then
             -- local cimf = FP.defsT[t.cimguiname]
@@ -286,6 +289,7 @@ local function cimgui_generation(parser)
 	
 
 	local  tdt = parser:generate_templates()
+	cpp2ffi.prtable("generate_templates",tdt)
 	local cstructsstr = outpre..tdt..outpost 
     
 	if gdefines.IMGUI_HAS_DOCK then
@@ -456,7 +460,11 @@ if ff then
 else
 	backends_folder = IMGUI_PATH .. "/backends/"
 end
- 
+local function getCname(stname,funcname, namespace)
+		if #stname == 0 then return funcname end --top level
+		local pre = stname.."_"
+		return pre..funcname
+	end
 local parser2
 
 if #implementations > 0 then
@@ -488,13 +496,15 @@ if #implementations > 0 then
 			end
 		end
 		parser2.cimgui_inherited =  dofile([[./output/structs_and_enums.lua]])
+		parser2.getCname = getCname
 		local defines = parser2:take_lines(CPRE..extra_defines..extra_includes..source, {locati}, COMPILER)
-		
+
 		local parser3 = cpp2ffi.Parser()
+		parser3.getCname = getCname
 		parser3.cimgui_inherited =  dofile([[./output/structs_and_enums.lua]])
-		parser3:take_lines(CPRE..extra_defines..extra_includes..source, {locati}, COMPILER)
+		local defines = parser3:take_lines(CPRE..extra_defines..extra_includes..source, {locati}, COMPILER)
 		parser3:do_parse()
-		local cfuncsstr = func_header_impl_generate(parser3) 
+		local cfuncsstr = func_header_impl_generate(parser3, defines) 
 		local cstructstr1,cstructstr2 = parser3.structs_and_enums[1], parser3.structs_and_enums[2]
 		local cstru = cstructstr1 .. cstructstr2
 		if cstru ~="" then

generator/output/constants.json

@@ -1,11 +1,8 @@
 {
-  "DOCKING_HOST_DRAW_CHANNEL_BG": "0",
-  "DOCKING_HOST_DRAW_CHANNEL_FG": "1",
   "IMGUI_CHECKVERSION()": "ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert), sizeof(ImDrawIdx))",
   "IMGUI_DEBUG_LOG(...)": "ImGui::DebugLog(__VA_ARGS__)",
   "IMGUI_DEBUG_LOG_ACTIVEID(...)": "do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventActiveId) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0)",
   "IMGUI_DEBUG_LOG_CLIPPER(...)": "do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventClipper) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0)",
-  "IMGUI_DEBUG_LOG_DOCKING(...)": "do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventDocking) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0)",
   "IMGUI_DEBUG_LOG_ERROR(...)": "do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventError) IMGUI_DEBUG_LOG(__VA_ARGS__); else g.DebugLogSkippedErrors++; } while (0)",
   "IMGUI_DEBUG_LOG_FOCUS(...)": "do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventFocus) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0)",
   "IMGUI_DEBUG_LOG_FONT(...)": "do { ImGuiContext* g2 = GImGui; if (g2 && g2->DebugLogFlags & ImGuiDebugLogFlags_EventFont) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0)",
@@ -14,18 +11,16 @@
   "IMGUI_DEBUG_LOG_NAV(...)": "do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventNav) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0)",
   "IMGUI_DEBUG_LOG_POPUP(...)": "do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventPopup) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0)",
   "IMGUI_DEBUG_LOG_SELECTION(...)": "do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventSelection) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0)",
-  "IMGUI_DEBUG_LOG_VIEWPORT(...)": "do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventViewport) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0)",
   "IMGUI_DEBUG_PRINTF(_FMT,...)": "printf(_FMT, __VA_ARGS__)",
   "IMGUI_FONT_SIZE_MAX": "(512.0f)",
   "IMGUI_FONT_SIZE_THRESHOLD_FOR_LOADADVANCEXONLYMODE": "(128.0f)",
   "IMGUI_PAYLOAD_TYPE_COLOR_3F": "\"_COL3F\"",
   "IMGUI_PAYLOAD_TYPE_COLOR_4F": "\"_COL4F\"",
-  "IMGUI_PAYLOAD_TYPE_WINDOW": "\"_IMWINDOW\"",
   "IMGUI_TABLE_MAX_COLUMNS": "512",
   "IMGUI_TEST_ENGINE_ITEM_ADD(_ID,_BB,_ITEM_DATA)": "((void)0)",
   "IMGUI_TEST_ENGINE_ITEM_INFO(_ID,_LABEL,_FLAGS)": "((void)g)",
-  "IMGUI_VERSION": "\"1.92.7\"",
+  "IMGUI_VERSION": "\"1.92.8\"",
-  "IMGUI_VERSION_NUM": "19270",
+  "IMGUI_VERSION_NUM": "19280",
   "IMGUI_WINDOW_HARD_MIN_SIZE": "4.0f",
   "IMSTB_TEXTEDIT_CHARTYPE": "char",
   "IMSTB_TEXTEDIT_GETWIDTH_NEWLINE": "(-1.0f)",
@@ -88,7 +83,6 @@
   "ImAtof(STR)": "atof(STR)",
   "ImCeil(X)": "ceilf(X)",
   "ImCos(X)": "cosf(X)",
-  "ImDrawCallback_ResetRenderState": "(ImDrawCallback)(-8)",
   "ImFabs(X)": "fabsf(X)",
   "ImFmod(X,Y)": "fmodf((X), (Y))",
   "ImFontAtlasRectId_GenerationMask_": "(0x3FF00000)",

generator/output/constants.lua

@@ -1,11 +1,8 @@
 local t={
-  DOCKING_HOST_DRAW_CHANNEL_BG="0",
-  DOCKING_HOST_DRAW_CHANNEL_FG="1",
   ["IMGUI_CHECKVERSION()"]="ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert), sizeof(ImDrawIdx))",
   ["IMGUI_DEBUG_LOG(...)"]="ImGui::DebugLog(__VA_ARGS__)",
   ["IMGUI_DEBUG_LOG_ACTIVEID(...)"]="do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventActiveId) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0)",
   ["IMGUI_DEBUG_LOG_CLIPPER(...)"]="do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventClipper) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0)",
-  ["IMGUI_DEBUG_LOG_DOCKING(...)"]="do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventDocking) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0)",
   ["IMGUI_DEBUG_LOG_ERROR(...)"]="do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventError) IMGUI_DEBUG_LOG(__VA_ARGS__); else g.DebugLogSkippedErrors++; } while (0)",
   ["IMGUI_DEBUG_LOG_FOCUS(...)"]="do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventFocus) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0)",
   ["IMGUI_DEBUG_LOG_FONT(...)"]="do { ImGuiContext* g2 = GImGui; if (g2 && g2->DebugLogFlags & ImGuiDebugLogFlags_EventFont) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0)",
@@ -14,18 +11,16 @@ local t={
   ["IMGUI_DEBUG_LOG_NAV(...)"]="do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventNav) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0)",
   ["IMGUI_DEBUG_LOG_POPUP(...)"]="do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventPopup) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0)",
   ["IMGUI_DEBUG_LOG_SELECTION(...)"]="do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventSelection) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0)",
-  ["IMGUI_DEBUG_LOG_VIEWPORT(...)"]="do { if (g.DebugLogFlags & ImGuiDebugLogFlags_EventViewport) IMGUI_DEBUG_LOG(__VA_ARGS__); } while (0)",
   ["IMGUI_DEBUG_PRINTF(_FMT,...)"]="printf(_FMT, __VA_ARGS__)",
   IMGUI_FONT_SIZE_MAX="(512.0f)",
   IMGUI_FONT_SIZE_THRESHOLD_FOR_LOADADVANCEXONLYMODE="(128.0f)",
   IMGUI_PAYLOAD_TYPE_COLOR_3F="\"_COL3F\"",
   IMGUI_PAYLOAD_TYPE_COLOR_4F="\"_COL4F\"",
-  IMGUI_PAYLOAD_TYPE_WINDOW="\"_IMWINDOW\"",
   IMGUI_TABLE_MAX_COLUMNS="512",
   ["IMGUI_TEST_ENGINE_ITEM_ADD(_ID,_BB,_ITEM_DATA)"]="((void)0)",
   ["IMGUI_TEST_ENGINE_ITEM_INFO(_ID,_LABEL,_FLAGS)"]="((void)g)",
-  IMGUI_VERSION="\"1.92.7\"",
+  IMGUI_VERSION="\"1.92.8\"",
-  IMGUI_VERSION_NUM="19270",
+  IMGUI_VERSION_NUM="19280",
   IMGUI_WINDOW_HARD_MIN_SIZE="4.0f",
   IMSTB_TEXTEDIT_CHARTYPE="char",
   IMSTB_TEXTEDIT_GETWIDTH_NEWLINE="(-1.0f)",
@@ -88,7 +83,6 @@ local t={
   ["ImAtof(STR)"]="atof(STR)",
   ["ImCeil(X)"]="ceilf(X)",
   ["ImCos(X)"]="cosf(X)",
-  ImDrawCallback_ResetRenderState="(ImDrawCallback)(-8)",
   ["ImFabs(X)"]="fabsf(X)",
   ["ImFmod(X,Y)"]="fmodf((X), (Y))",
   ImFontAtlasRectId_GenerationMask_="(0x3FF00000)",

generator/output/impl_definitions.json

@@ -18,7 +18,7 @@
       "cimguiname": "ImGui_ImplGlfw_CharCallback",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_CharCallback",
-      "location": "imgui_impl_glfw:64",
+      "location": "imgui_impl_glfw:62",
       "ov_cimguiname": "ImGui_ImplGlfw_CharCallback",
       "ret": "void",
       "signature": "(GLFWwindow*,unsigned int)",
@@ -44,7 +44,7 @@
       "cimguiname": "ImGui_ImplGlfw_CursorEnterCallback",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_CursorEnterCallback",
-      "location": "imgui_impl_glfw:59",
+      "location": "imgui_impl_glfw:57",
       "ov_cimguiname": "ImGui_ImplGlfw_CursorEnterCallback",
       "ret": "void",
       "signature": "(GLFWwindow*,int)",
@@ -74,7 +74,7 @@
       "cimguiname": "ImGui_ImplGlfw_CursorPosCallback",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_CursorPosCallback",
-      "location": "imgui_impl_glfw:60",
+      "location": "imgui_impl_glfw:58",
       "ov_cimguiname": "ImGui_ImplGlfw_CursorPosCallback",
       "ret": "void",
       "signature": "(GLFWwindow*,double,double)",
@@ -96,7 +96,7 @@
       "cimguiname": "ImGui_ImplGlfw_GetContentScaleForMonitor",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_GetContentScaleForMonitor",
-      "location": "imgui_impl_glfw:70",
+      "location": "imgui_impl_glfw:68",
       "ov_cimguiname": "ImGui_ImplGlfw_GetContentScaleForMonitor",
       "ret": "float",
       "signature": "(GLFWmonitor*)",
@@ -118,7 +118,7 @@
       "cimguiname": "ImGui_ImplGlfw_GetContentScaleForWindow",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_GetContentScaleForWindow",
-      "location": "imgui_impl_glfw:69",
+      "location": "imgui_impl_glfw:67",
       "ov_cimguiname": "ImGui_ImplGlfw_GetContentScaleForWindow",
       "ret": "float",
       "signature": "(GLFWwindow*)",
@@ -144,7 +144,7 @@
       "cimguiname": "ImGui_ImplGlfw_InitForOpenGL",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_InitForOpenGL",
-      "location": "imgui_impl_glfw:35",
+      "location": "imgui_impl_glfw:33",
       "ov_cimguiname": "ImGui_ImplGlfw_InitForOpenGL",
       "ret": "bool",
       "signature": "(GLFWwindow*,bool)",
@@ -170,7 +170,7 @@
       "cimguiname": "ImGui_ImplGlfw_InitForOther",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_InitForOther",
-      "location": "imgui_impl_glfw:37",
+      "location": "imgui_impl_glfw:35",
       "ov_cimguiname": "ImGui_ImplGlfw_InitForOther",
       "ret": "bool",
       "signature": "(GLFWwindow*,bool)",
@@ -196,7 +196,7 @@
       "cimguiname": "ImGui_ImplGlfw_InitForVulkan",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_InitForVulkan",
-      "location": "imgui_impl_glfw:36",
+      "location": "imgui_impl_glfw:34",
       "ov_cimguiname": "ImGui_ImplGlfw_InitForVulkan",
       "ret": "bool",
       "signature": "(GLFWwindow*,bool)",
@@ -218,7 +218,7 @@
       "cimguiname": "ImGui_ImplGlfw_InstallCallbacks",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_InstallCallbacks",
-      "location": "imgui_impl_glfw:50",
+      "location": "imgui_impl_glfw:48",
       "ov_cimguiname": "ImGui_ImplGlfw_InstallCallbacks",
       "ret": "void",
       "signature": "(GLFWwindow*)",
@@ -256,7 +256,7 @@
       "cimguiname": "ImGui_ImplGlfw_KeyCallback",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_KeyCallback",
-      "location": "imgui_impl_glfw:63",
+      "location": "imgui_impl_glfw:61",
       "ov_cimguiname": "ImGui_ImplGlfw_KeyCallback",
       "ret": "void",
       "signature": "(GLFWwindow*,int,int,int,int)",
@@ -282,7 +282,7 @@
       "cimguiname": "ImGui_ImplGlfw_MonitorCallback",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_MonitorCallback",
-      "location": "imgui_impl_glfw:65",
+      "location": "imgui_impl_glfw:63",
       "ov_cimguiname": "ImGui_ImplGlfw_MonitorCallback",
       "ret": "void",
       "signature": "(GLFWmonitor*,int)",
@@ -316,7 +316,7 @@
       "cimguiname": "ImGui_ImplGlfw_MouseButtonCallback",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_MouseButtonCallback",
-      "location": "imgui_impl_glfw:61",
+      "location": "imgui_impl_glfw:59",
       "ov_cimguiname": "ImGui_ImplGlfw_MouseButtonCallback",
       "ret": "void",
       "signature": "(GLFWwindow*,int,int,int)",
@@ -333,7 +333,7 @@
       "cimguiname": "ImGui_ImplGlfw_NewFrame",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_NewFrame",
-      "location": "imgui_impl_glfw:39",
+      "location": "imgui_impl_glfw:37",
       "ov_cimguiname": "ImGui_ImplGlfw_NewFrame",
       "ret": "void",
       "signature": "()",
@@ -355,7 +355,7 @@
       "cimguiname": "ImGui_ImplGlfw_RestoreCallbacks",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_RestoreCallbacks",
-      "location": "imgui_impl_glfw:51",
+      "location": "imgui_impl_glfw:49",
       "ov_cimguiname": "ImGui_ImplGlfw_RestoreCallbacks",
       "ret": "void",
       "signature": "(GLFWwindow*)",
@@ -385,7 +385,7 @@
       "cimguiname": "ImGui_ImplGlfw_ScrollCallback",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_ScrollCallback",
-      "location": "imgui_impl_glfw:62",
+      "location": "imgui_impl_glfw:60",
       "ov_cimguiname": "ImGui_ImplGlfw_ScrollCallback",
       "ret": "void",
       "signature": "(GLFWwindow*,double,double)",
@@ -407,7 +407,7 @@
       "cimguiname": "ImGui_ImplGlfw_SetCallbacksChainForAllWindows",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_SetCallbacksChainForAllWindows",
-      "location": "imgui_impl_glfw:55",
+      "location": "imgui_impl_glfw:53",
       "ov_cimguiname": "ImGui_ImplGlfw_SetCallbacksChainForAllWindows",
       "ret": "void",
       "signature": "(bool)",
@@ -424,7 +424,7 @@
       "cimguiname": "ImGui_ImplGlfw_Shutdown",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_Shutdown",
-      "location": "imgui_impl_glfw:38",
+      "location": "imgui_impl_glfw:36",
       "ov_cimguiname": "ImGui_ImplGlfw_Shutdown",
       "ret": "void",
       "signature": "()",
@@ -446,7 +446,7 @@
       "cimguiname": "ImGui_ImplGlfw_Sleep",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_Sleep",
-      "location": "imgui_impl_glfw:68",
+      "location": "imgui_impl_glfw:66",
       "ov_cimguiname": "ImGui_ImplGlfw_Sleep",
       "ret": "void",
       "signature": "(int)",
@@ -472,7 +472,7 @@
       "cimguiname": "ImGui_ImplGlfw_WindowFocusCallback",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_WindowFocusCallback",
-      "location": "imgui_impl_glfw:58",
+      "location": "imgui_impl_glfw:56",
       "ov_cimguiname": "ImGui_ImplGlfw_WindowFocusCallback",
       "ret": "void",
       "signature": "(GLFWwindow*,int)",
@@ -618,7 +618,7 @@
       "cimguiname": "ImGui_ImplOpenGL3_CreateDeviceObjects",
       "defaults": {},
       "funcname": "ImGui_ImplOpenGL3_CreateDeviceObjects",
-      "location": "imgui_impl_opengl3:41",
+      "location": "imgui_impl_opengl3:40",
       "ov_cimguiname": "ImGui_ImplOpenGL3_CreateDeviceObjects",
       "ret": "bool",
       "signature": "()",
@@ -635,7 +635,7 @@
       "cimguiname": "ImGui_ImplOpenGL3_DestroyDeviceObjects",
       "defaults": {},
       "funcname": "ImGui_ImplOpenGL3_DestroyDeviceObjects",
-      "location": "imgui_impl_opengl3:42",
+      "location": "imgui_impl_opengl3:41",
       "ov_cimguiname": "ImGui_ImplOpenGL3_DestroyDeviceObjects",
       "ret": "void",
       "signature": "()",
@@ -659,7 +659,7 @@
         "glsl_version": "nullptr"
       },
       "funcname": "ImGui_ImplOpenGL3_Init",
-      "location": "imgui_impl_opengl3:35",
+      "location": "imgui_impl_opengl3:34",
       "ov_cimguiname": "ImGui_ImplOpenGL3_Init",
       "ret": "bool",
       "signature": "(const char*)",
@@ -676,7 +676,7 @@
       "cimguiname": "ImGui_ImplOpenGL3_NewFrame",
       "defaults": {},
       "funcname": "ImGui_ImplOpenGL3_NewFrame",
-      "location": "imgui_impl_opengl3:37",
+      "location": "imgui_impl_opengl3:36",
       "ov_cimguiname": "ImGui_ImplOpenGL3_NewFrame",
       "ret": "void",
       "signature": "()",
@@ -698,7 +698,7 @@
       "cimguiname": "ImGui_ImplOpenGL3_RenderDrawData",
       "defaults": {},
       "funcname": "ImGui_ImplOpenGL3_RenderDrawData",
-      "location": "imgui_impl_opengl3:38",
+      "location": "imgui_impl_opengl3:37",
       "ov_cimguiname": "ImGui_ImplOpenGL3_RenderDrawData",
       "ret": "void",
       "signature": "(ImDrawData*)",
@@ -715,7 +715,7 @@
       "cimguiname": "ImGui_ImplOpenGL3_Shutdown",
       "defaults": {},
       "funcname": "ImGui_ImplOpenGL3_Shutdown",
-      "location": "imgui_impl_opengl3:36",
+      "location": "imgui_impl_opengl3:35",
       "ov_cimguiname": "ImGui_ImplOpenGL3_Shutdown",
       "ret": "void",
       "signature": "()",
@@ -737,7 +737,7 @@
       "cimguiname": "ImGui_ImplOpenGL3_UpdateTexture",
       "defaults": {},
       "funcname": "ImGui_ImplOpenGL3_UpdateTexture",
-      "location": "imgui_impl_opengl3:45",
+      "location": "imgui_impl_opengl3:44",
       "ov_cimguiname": "ImGui_ImplOpenGL3_UpdateTexture",
       "ret": "void",
       "signature": "(ImTextureData*)",
@@ -759,7 +759,7 @@
       "cimguiname": "ImGui_ImplSDL2_GetContentScaleForDisplay",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_GetContentScaleForDisplay",
-      "location": "imgui_impl_sdl2:47",
+      "location": "imgui_impl_sdl2:43",
       "ov_cimguiname": "ImGui_ImplSDL2_GetContentScaleForDisplay",
       "ret": "float",
       "signature": "(int)",
@@ -781,7 +781,7 @@
       "cimguiname": "ImGui_ImplSDL2_GetContentScaleForWindow",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_GetContentScaleForWindow",
-      "location": "imgui_impl_sdl2:46",
+      "location": "imgui_impl_sdl2:42",
       "ov_cimguiname": "ImGui_ImplSDL2_GetContentScaleForWindow",
       "ret": "float",
       "signature": "(SDL_Window*)",
@@ -803,7 +803,7 @@
       "cimguiname": "ImGui_ImplSDL2_InitForD3D",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_InitForD3D",
-      "location": "imgui_impl_sdl2:37",
+      "location": "imgui_impl_sdl2:33",
       "ov_cimguiname": "ImGui_ImplSDL2_InitForD3D",
       "ret": "bool",
       "signature": "(SDL_Window*)",
@@ -825,7 +825,7 @@
       "cimguiname": "ImGui_ImplSDL2_InitForMetal",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_InitForMetal",
-      "location": "imgui_impl_sdl2:38",
+      "location": "imgui_impl_sdl2:34",
       "ov_cimguiname": "ImGui_ImplSDL2_InitForMetal",
       "ret": "bool",
       "signature": "(SDL_Window*)",
@@ -851,7 +851,7 @@
       "cimguiname": "ImGui_ImplSDL2_InitForOpenGL",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_InitForOpenGL",
-      "location": "imgui_impl_sdl2:35",
+      "location": "imgui_impl_sdl2:31",
       "ov_cimguiname": "ImGui_ImplSDL2_InitForOpenGL",
       "ret": "bool",
       "signature": "(SDL_Window*,void*)",
@@ -873,7 +873,7 @@
       "cimguiname": "ImGui_ImplSDL2_InitForOther",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_InitForOther",
-      "location": "imgui_impl_sdl2:40",
+      "location": "imgui_impl_sdl2:36",
       "ov_cimguiname": "ImGui_ImplSDL2_InitForOther",
       "ret": "bool",
       "signature": "(SDL_Window*)",
@@ -899,7 +899,7 @@
       "cimguiname": "ImGui_ImplSDL2_InitForSDLRenderer",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_InitForSDLRenderer",
-      "location": "imgui_impl_sdl2:39",
+      "location": "imgui_impl_sdl2:35",
       "ov_cimguiname": "ImGui_ImplSDL2_InitForSDLRenderer",
       "ret": "bool",
       "signature": "(SDL_Window*,SDL_Renderer*)",
@@ -921,7 +921,7 @@
       "cimguiname": "ImGui_ImplSDL2_InitForVulkan",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_InitForVulkan",
-      "location": "imgui_impl_sdl2:36",
+      "location": "imgui_impl_sdl2:32",
       "ov_cimguiname": "ImGui_ImplSDL2_InitForVulkan",
       "ret": "bool",
       "signature": "(SDL_Window*)",
@@ -938,7 +938,7 @@
       "cimguiname": "ImGui_ImplSDL2_NewFrame",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_NewFrame",
-      "location": "imgui_impl_sdl2:42",
+      "location": "imgui_impl_sdl2:38",
       "ov_cimguiname": "ImGui_ImplSDL2_NewFrame",
       "ret": "void",
       "signature": "()",
@@ -960,7 +960,7 @@
       "cimguiname": "ImGui_ImplSDL2_ProcessEvent",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_ProcessEvent",
-      "location": "imgui_impl_sdl2:43",
+      "location": "imgui_impl_sdl2:39",
       "ov_cimguiname": "ImGui_ImplSDL2_ProcessEvent",
       "ret": "bool",
       "signature": "(const SDL_Event*)",
@@ -993,7 +993,7 @@
         "manual_gamepads_count": "-1"
       },
       "funcname": "ImGui_ImplSDL2_SetGamepadMode",
-      "location": "imgui_impl_sdl2:52",
+      "location": "imgui_impl_sdl2:48",
       "ov_cimguiname": "ImGui_ImplSDL2_SetGamepadMode",
       "ret": "void",
       "signature": "(ImGui_ImplSDL2_GamepadMode,struct _SDL_GameController**,int)",
@@ -1015,7 +1015,7 @@
       "cimguiname": "ImGui_ImplSDL2_SetMouseCaptureMode",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_SetMouseCaptureMode",
-      "location": "imgui_impl_sdl2:59",
+      "location": "imgui_impl_sdl2:55",
       "ov_cimguiname": "ImGui_ImplSDL2_SetMouseCaptureMode",
       "ret": "void",
       "signature": "(ImGui_ImplSDL2_MouseCaptureMode)",
@@ -1032,7 +1032,7 @@
       "cimguiname": "ImGui_ImplSDL2_Shutdown",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_Shutdown",
-      "location": "imgui_impl_sdl2:41",
+      "location": "imgui_impl_sdl2:37",
       "ov_cimguiname": "ImGui_ImplSDL2_Shutdown",
       "ret": "void",
       "signature": "()",
@@ -1054,7 +1054,7 @@
       "cimguiname": "ImGui_ImplSDL3_InitForD3D",
       "defaults": {},
       "funcname": "ImGui_ImplSDL3_InitForD3D",
-      "location": "imgui_impl_sdl3:36",
+      "location": "imgui_impl_sdl3:33",
       "ov_cimguiname": "ImGui_ImplSDL3_InitForD3D",
       "ret": "bool",
       "signature": "(SDL_Window*)",
@@ -1076,7 +1076,7 @@
       "cimguiname": "ImGui_ImplSDL3_InitForMetal",
       "defaults": {},
       "funcname": "ImGui_ImplSDL3_InitForMetal",
-      "location": "imgui_impl_sdl3:37",
+      "location": "imgui_impl_sdl3:34",
       "ov_cimguiname": "ImGui_ImplSDL3_InitForMetal",
       "ret": "bool",
       "signature": "(SDL_Window*)",
@@ -1102,7 +1102,7 @@
       "cimguiname": "ImGui_ImplSDL3_InitForOpenGL",
       "defaults": {},
       "funcname": "ImGui_ImplSDL3_InitForOpenGL",
-      "location": "imgui_impl_sdl3:34",
+      "location": "imgui_impl_sdl3:31",
       "ov_cimguiname": "ImGui_ImplSDL3_InitForOpenGL",
       "ret": "bool",
       "signature": "(SDL_Window*,void*)",
@@ -1124,7 +1124,7 @@
       "cimguiname": "ImGui_ImplSDL3_InitForOther",
       "defaults": {},
       "funcname": "ImGui_ImplSDL3_InitForOther",
-      "location": "imgui_impl_sdl3:40",
+      "location": "imgui_impl_sdl3:37",
       "ov_cimguiname": "ImGui_ImplSDL3_InitForOther",
       "ret": "bool",
       "signature": "(SDL_Window*)",
@@ -1146,7 +1146,7 @@
       "cimguiname": "ImGui_ImplSDL3_InitForSDLGPU",
       "defaults": {},
       "funcname": "ImGui_ImplSDL3_InitForSDLGPU",
-      "location": "imgui_impl_sdl3:39",
+      "location": "imgui_impl_sdl3:36",
       "ov_cimguiname": "ImGui_ImplSDL3_InitForSDLGPU",
       "ret": "bool",
       "signature": "(SDL_Window*)",
@@ -1172,7 +1172,7 @@
       "cimguiname": "ImGui_ImplSDL3_InitForSDLRenderer",
       "defaults": {},
       "funcname": "ImGui_ImplSDL3_InitForSDLRenderer",
-      "location": "imgui_impl_sdl3:38",
+      "location": "imgui_impl_sdl3:35",
       "ov_cimguiname": "ImGui_ImplSDL3_InitForSDLRenderer",
       "ret": "bool",
       "signature": "(SDL_Window*,SDL_Renderer*)",
@@ -1194,7 +1194,7 @@
       "cimguiname": "ImGui_ImplSDL3_InitForVulkan",
       "defaults": {},
       "funcname": "ImGui_ImplSDL3_InitForVulkan",
-      "location": "imgui_impl_sdl3:35",
+      "location": "imgui_impl_sdl3:32",
       "ov_cimguiname": "ImGui_ImplSDL3_InitForVulkan",
       "ret": "bool",
       "signature": "(SDL_Window*)",
@@ -1211,7 +1211,7 @@
       "cimguiname": "ImGui_ImplSDL3_NewFrame",
       "defaults": {},
       "funcname": "ImGui_ImplSDL3_NewFrame",
-      "location": "imgui_impl_sdl3:42",
+      "location": "imgui_impl_sdl3:39",
       "ov_cimguiname": "ImGui_ImplSDL3_NewFrame",
       "ret": "void",
       "signature": "()",
@@ -1233,7 +1233,7 @@
       "cimguiname": "ImGui_ImplSDL3_ProcessEvent",
       "defaults": {},
       "funcname": "ImGui_ImplSDL3_ProcessEvent",
-      "location": "imgui_impl_sdl3:43",
+      "location": "imgui_impl_sdl3:40",
       "ov_cimguiname": "ImGui_ImplSDL3_ProcessEvent",
       "ret": "bool",
       "signature": "(const SDL_Event*)",
@@ -1266,7 +1266,7 @@
         "manual_gamepads_count": "-1"
       },
       "funcname": "ImGui_ImplSDL3_SetGamepadMode",
-      "location": "imgui_impl_sdl3:48",
+      "location": "imgui_impl_sdl3:45",
       "ov_cimguiname": "ImGui_ImplSDL3_SetGamepadMode",
       "ret": "void",
       "signature": "(ImGui_ImplSDL3_GamepadMode,SDL_Gamepad**,int)",
@@ -1288,7 +1288,7 @@
       "cimguiname": "ImGui_ImplSDL3_SetMouseCaptureMode",
       "defaults": {},
       "funcname": "ImGui_ImplSDL3_SetMouseCaptureMode",
-      "location": "imgui_impl_sdl3:55",
+      "location": "imgui_impl_sdl3:52",
       "ov_cimguiname": "ImGui_ImplSDL3_SetMouseCaptureMode",
       "ret": "void",
       "signature": "(ImGui_ImplSDL3_MouseCaptureMode)",
@@ -1305,7 +1305,7 @@
       "cimguiname": "ImGui_ImplSDL3_Shutdown",
       "defaults": {},
       "funcname": "ImGui_ImplSDL3_Shutdown",
-      "location": "imgui_impl_sdl3:41",
+      "location": "imgui_impl_sdl3:38",
       "ov_cimguiname": "ImGui_ImplSDL3_Shutdown",
       "ret": "void",
       "signature": "()",
@@ -1363,7 +1363,7 @@
       "cimguiname": "ImGui_ImplVulkanH_CreateOrResizeWindow",
       "defaults": {},
       "funcname": "ImGui_ImplVulkanH_CreateOrResizeWindow",
-      "location": "imgui_impl_vulkan:208",
+      "location": "imgui_impl_vulkan:203",
       "ov_cimguiname": "ImGui_ImplVulkanH_CreateOrResizeWindow",
       "ret": "void",
       "signature": "(VkInstance,VkPhysicalDevice,VkDevice,ImGui_ImplVulkanH_Window*,uint32_t,const VkAllocationCallbacks*,int,int,uint32_t,VkImageUsageFlags)",
@@ -1397,7 +1397,7 @@
       "cimguiname": "ImGui_ImplVulkanH_DestroyWindow",
       "defaults": {},
       "funcname": "ImGui_ImplVulkanH_DestroyWindow",
-      "location": "imgui_impl_vulkan:209",
+      "location": "imgui_impl_vulkan:204",
       "ov_cimguiname": "ImGui_ImplVulkanH_DestroyWindow",
       "ret": "void",
       "signature": "(VkInstance,VkDevice,ImGui_ImplVulkanH_Window*,const VkAllocationCallbacks*)",
@@ -1419,35 +1419,13 @@
       "cimguiname": "ImGui_ImplVulkanH_GetMinImageCountFromPresentMode",
       "defaults": {},
       "funcname": "ImGui_ImplVulkanH_GetMinImageCountFromPresentMode",
-      "location": "imgui_impl_vulkan:214",
+      "location": "imgui_impl_vulkan:209",
       "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:215",
-      "ov_cimguiname": "ImGui_ImplVulkanH_GetWindowDataFromViewport",
-      "ret": "ImGui_ImplVulkanH_Window*",
-      "signature": "(ImGuiViewport*)",
-      "stname": ""
-    }
-  ],
   "ImGui_ImplVulkanH_SelectPhysicalDevice": [
     {
       "args": "(VkInstance instance)",
@@ -1463,7 +1441,7 @@
       "cimguiname": "ImGui_ImplVulkanH_SelectPhysicalDevice",
       "defaults": {},
       "funcname": "ImGui_ImplVulkanH_SelectPhysicalDevice",
-      "location": "imgui_impl_vulkan:212",
+      "location": "imgui_impl_vulkan:207",
       "ov_cimguiname": "ImGui_ImplVulkanH_SelectPhysicalDevice",
       "ret": "VkPhysicalDevice",
       "signature": "(VkInstance)",
@@ -1497,7 +1475,7 @@
       "cimguiname": "ImGui_ImplVulkanH_SelectPresentMode",
       "defaults": {},
       "funcname": "ImGui_ImplVulkanH_SelectPresentMode",
-      "location": "imgui_impl_vulkan:211",
+      "location": "imgui_impl_vulkan:206",
       "ov_cimguiname": "ImGui_ImplVulkanH_SelectPresentMode",
       "ret": "VkPresentModeKHR",
       "signature": "(VkPhysicalDevice,VkSurfaceKHR,const VkPresentModeKHR*,int)",
@@ -1519,7 +1497,7 @@
       "cimguiname": "ImGui_ImplVulkanH_SelectQueueFamilyIndex",
       "defaults": {},
       "funcname": "ImGui_ImplVulkanH_SelectQueueFamilyIndex",
-      "location": "imgui_impl_vulkan:213",
+      "location": "imgui_impl_vulkan:208",
       "ov_cimguiname": "ImGui_ImplVulkanH_SelectQueueFamilyIndex",
       "ret": "uint32_t",
       "signature": "(VkPhysicalDevice)",
@@ -1557,7 +1535,7 @@
       "cimguiname": "ImGui_ImplVulkanH_SelectSurfaceFormat",
       "defaults": {},
       "funcname": "ImGui_ImplVulkanH_SelectSurfaceFormat",
-      "location": "imgui_impl_vulkan:210",
+      "location": "imgui_impl_vulkan:205",
       "ov_cimguiname": "ImGui_ImplVulkanH_SelectSurfaceFormat",
       "ret": "VkSurfaceFormatKHR",
       "signature": "(VkPhysicalDevice,VkSurfaceKHR,const VkFormat*,int,VkColorSpaceKHR)",
@@ -1575,7 +1553,7 @@
       "constructor": true,
       "defaults": {},
       "funcname": "ImGui_ImplVulkanH_Window",
-      "location": "imgui_impl_vulkan:260",
+      "location": "imgui_impl_vulkan:255",
       "namespace": "ImGui_ImplVulkanH_Window",
       "ov_cimguiname": "ImGui_ImplVulkanH_Window_ImGui_ImplVulkanH_Window",
       "signature": "()",
@@ -1595,7 +1573,7 @@
       "cimguiname": "ImGui_ImplVulkanH_Window_destroy",
       "defaults": {},
       "destructor": true,
-      "location": "imgui_impl_vulkan:260",
+      "location": "imgui_impl_vulkan:255",
       "ov_cimguiname": "ImGui_ImplVulkanH_Window_destroy",
       "ret": "void",
       "signature": "(ImGui_ImplVulkanH_Window*)",
@@ -1604,12 +1582,8 @@
   ],
   "ImGui_ImplVulkan_AddTexture": [
     {
-      "args": "(VkSampler sampler,VkImageView image_view,VkImageLayout image_layout)",
+      "args": "(VkImageView image_view,VkImageLayout image_layout)",
       "argsT": [
-        {
-          "name": "sampler",
-          "type": "VkSampler"
-        },
         {
           "name": "image_view",
           "type": "VkImageView"
@@ -1619,16 +1593,16 @@
           "type": "VkImageLayout"
         }
       ],
-      "argsoriginal": "(VkSampler sampler,VkImageView image_view,VkImageLayout image_layout)",
+      "argsoriginal": "(VkImageView image_view,VkImageLayout image_layout)",
-      "call_args": "(sampler,image_view,image_layout)",
+      "call_args": "(image_view,image_layout)",
-      "call_args_old": "(sampler,image_view,image_layout)",
+      "call_args_old": "(image_view,image_layout)",
       "cimguiname": "ImGui_ImplVulkan_AddTexture",
       "defaults": {},
       "funcname": "ImGui_ImplVulkan_AddTexture",
-      "location": "imgui_impl_vulkan:166",
+      "location": "imgui_impl_vulkan:157",
       "ov_cimguiname": "ImGui_ImplVulkan_AddTexture",
       "ret": "VkDescriptorSet",
-      "signature": "(VkSampler,VkImageView,VkImageLayout)",
+      "signature": "(VkImageView,VkImageLayout)",
       "stname": ""
     }
   ],
@@ -1647,7 +1621,7 @@
       "cimguiname": "ImGui_ImplVulkan_CreateMainPipeline",
       "defaults": {},
       "funcname": "ImGui_ImplVulkan_CreateMainPipeline",
-      "location": "imgui_impl_vulkan:158",
+      "location": "imgui_impl_vulkan:151",
       "ov_cimguiname": "ImGui_ImplVulkan_CreateMainPipeline",
       "ret": "void",
       "signature": "(const ImGui_ImplVulkan_PipelineInfo*)",
@@ -1669,7 +1643,7 @@
       "cimguiname": "ImGui_ImplVulkan_Init",
       "defaults": {},
       "funcname": "ImGui_ImplVulkan_Init",
-      "location": "imgui_impl_vulkan:149",
+      "location": "imgui_impl_vulkan:142",
       "ov_cimguiname": "ImGui_ImplVulkan_Init",
       "ret": "bool",
       "signature": "(ImGui_ImplVulkan_InitInfo*)",
@@ -1701,7 +1675,7 @@
         "user_data": "nullptr"
       },
       "funcname": "ImGui_ImplVulkan_LoadFunctions",
-      "location": "imgui_impl_vulkan:171",
+      "location": "imgui_impl_vulkan:166",
       "ov_cimguiname": "ImGui_ImplVulkan_LoadFunctions",
       "ret": "bool",
       "signature": "(uint32_t,PFN_vkVoidFunction(*loader_func)(const char* function_name,void*,void*)",
@@ -1718,7 +1692,7 @@
       "cimguiname": "ImGui_ImplVulkan_NewFrame",
       "defaults": {},
       "funcname": "ImGui_ImplVulkan_NewFrame",
-      "location": "imgui_impl_vulkan:151",
+      "location": "imgui_impl_vulkan:144",
       "ov_cimguiname": "ImGui_ImplVulkan_NewFrame",
       "ret": "void",
       "signature": "()",
@@ -1740,7 +1714,7 @@
       "cimguiname": "ImGui_ImplVulkan_RemoveTexture",
       "defaults": {},
       "funcname": "ImGui_ImplVulkan_RemoveTexture",
-      "location": "imgui_impl_vulkan:167",
+      "location": "imgui_impl_vulkan:158",
       "ov_cimguiname": "ImGui_ImplVulkan_RemoveTexture",
       "ret": "void",
       "signature": "(VkDescriptorSet)",
@@ -1772,7 +1746,7 @@
         "pipeline": "0ULL"
       },
       "funcname": "ImGui_ImplVulkan_RenderDrawData",
-      "location": "imgui_impl_vulkan:152",
+      "location": "imgui_impl_vulkan:145",
       "ov_cimguiname": "ImGui_ImplVulkan_RenderDrawData",
       "ret": "void",
       "signature": "(ImDrawData*,VkCommandBuffer,VkPipeline)",
@@ -1794,7 +1768,7 @@
       "cimguiname": "ImGui_ImplVulkan_SetMinImageCount",
       "defaults": {},
       "funcname": "ImGui_ImplVulkan_SetMinImageCount",
-      "location": "imgui_impl_vulkan:153",
+      "location": "imgui_impl_vulkan:146",
       "ov_cimguiname": "ImGui_ImplVulkan_SetMinImageCount",
       "ret": "void",
       "signature": "(uint32_t)",
@@ -1811,7 +1785,7 @@
       "cimguiname": "ImGui_ImplVulkan_Shutdown",
       "defaults": {},
       "funcname": "ImGui_ImplVulkan_Shutdown",
-      "location": "imgui_impl_vulkan:150",
+      "location": "imgui_impl_vulkan:143",
       "ov_cimguiname": "ImGui_ImplVulkan_Shutdown",
       "ret": "void",
       "signature": "()",
@@ -1833,7 +1807,7 @@
       "cimguiname": "ImGui_ImplVulkan_UpdateTexture",
       "defaults": {},
       "funcname": "ImGui_ImplVulkan_UpdateTexture",
-      "location": "imgui_impl_vulkan:161",
+      "location": "imgui_impl_vulkan:154",
       "ov_cimguiname": "ImGui_ImplVulkan_UpdateTexture",
       "ret": "void",
       "signature": "(ImTextureData*)",

generator/output/impl_definitions.lua

@@ -15,7 +15,7 @@ local t={
       cimguiname="ImGui_ImplGlfw_CharCallback",
       defaults={},
       funcname="ImGui_ImplGlfw_CharCallback",
-      location="imgui_impl_glfw:64",
+      location="imgui_impl_glfw:62",
       ov_cimguiname="ImGui_ImplGlfw_CharCallback",
       ret="void",
       signature="(GLFWwindow*,unsigned int)",
@@ -37,7 +37,7 @@ local t={
       cimguiname="ImGui_ImplGlfw_CursorEnterCallback",
       defaults={},
       funcname="ImGui_ImplGlfw_CursorEnterCallback",
-      location="imgui_impl_glfw:59",
+      location="imgui_impl_glfw:57",
       ov_cimguiname="ImGui_ImplGlfw_CursorEnterCallback",
       ret="void",
       signature="(GLFWwindow*,int)",
@@ -62,7 +62,7 @@ local t={
       cimguiname="ImGui_ImplGlfw_CursorPosCallback",
       defaults={},
       funcname="ImGui_ImplGlfw_CursorPosCallback",
-      location="imgui_impl_glfw:60",
+      location="imgui_impl_glfw:58",
       ov_cimguiname="ImGui_ImplGlfw_CursorPosCallback",
       ret="void",
       signature="(GLFWwindow*,double,double)",
@@ -81,7 +81,7 @@ local t={
       cimguiname="ImGui_ImplGlfw_GetContentScaleForMonitor",
       defaults={},
       funcname="ImGui_ImplGlfw_GetContentScaleForMonitor",
-      location="imgui_impl_glfw:70",
+      location="imgui_impl_glfw:68",
       ov_cimguiname="ImGui_ImplGlfw_GetContentScaleForMonitor",
       ret="float",
       signature="(GLFWmonitor*)",
@@ -100,7 +100,7 @@ local t={
       cimguiname="ImGui_ImplGlfw_GetContentScaleForWindow",
       defaults={},
       funcname="ImGui_ImplGlfw_GetContentScaleForWindow",
-      location="imgui_impl_glfw:69",
+      location="imgui_impl_glfw:67",
       ov_cimguiname="ImGui_ImplGlfw_GetContentScaleForWindow",
       ret="float",
       signature="(GLFWwindow*)",
@@ -122,7 +122,7 @@ local t={
       cimguiname="ImGui_ImplGlfw_InitForOpenGL",
       defaults={},
       funcname="ImGui_ImplGlfw_InitForOpenGL",
-      location="imgui_impl_glfw:35",
+      location="imgui_impl_glfw:33",
       ov_cimguiname="ImGui_ImplGlfw_InitForOpenGL",
       ret="bool",
       signature="(GLFWwindow*,bool)",
@@ -144,7 +144,7 @@ local t={
       cimguiname="ImGui_ImplGlfw_InitForOther",
       defaults={},
       funcname="ImGui_ImplGlfw_InitForOther",
-      location="imgui_impl_glfw:37",
+      location="imgui_impl_glfw:35",
       ov_cimguiname="ImGui_ImplGlfw_InitForOther",
       ret="bool",
       signature="(GLFWwindow*,bool)",
@@ -166,7 +166,7 @@ local t={
       cimguiname="ImGui_ImplGlfw_InitForVulkan",
       defaults={},
       funcname="ImGui_ImplGlfw_InitForVulkan",
-      location="imgui_impl_glfw:36",
+      location="imgui_impl_glfw:34",
       ov_cimguiname="ImGui_ImplGlfw_InitForVulkan",
       ret="bool",
       signature="(GLFWwindow*,bool)",
@@ -185,7 +185,7 @@ local t={
       cimguiname="ImGui_ImplGlfw_InstallCallbacks",
       defaults={},
       funcname="ImGui_ImplGlfw_InstallCallbacks",
-      location="imgui_impl_glfw:50",
+      location="imgui_impl_glfw:48",
       ov_cimguiname="ImGui_ImplGlfw_InstallCallbacks",
       ret="void",
       signature="(GLFWwindow*)",
@@ -216,7 +216,7 @@ local t={
       cimguiname="ImGui_ImplGlfw_KeyCallback",
       defaults={},
       funcname="ImGui_ImplGlfw_KeyCallback",
-      location="imgui_impl_glfw:63",
+      location="imgui_impl_glfw:61",
       ov_cimguiname="ImGui_ImplGlfw_KeyCallback",
       ret="void",
       signature="(GLFWwindow*,int,int,int,int)",
@@ -238,7 +238,7 @@ local t={
       cimguiname="ImGui_ImplGlfw_MonitorCallback",
       defaults={},
       funcname="ImGui_ImplGlfw_MonitorCallback",
-      location="imgui_impl_glfw:65",
+      location="imgui_impl_glfw:63",
       ov_cimguiname="ImGui_ImplGlfw_MonitorCallback",
       ret="void",
       signature="(GLFWmonitor*,int)",
@@ -266,7 +266,7 @@ local t={
       cimguiname="ImGui_ImplGlfw_MouseButtonCallback",
       defaults={},
       funcname="ImGui_ImplGlfw_MouseButtonCallback",
-      location="imgui_impl_glfw:61",
+      location="imgui_impl_glfw:59",
       ov_cimguiname="ImGui_ImplGlfw_MouseButtonCallback",
       ret="void",
       signature="(GLFWwindow*,int,int,int)",
@@ -282,7 +282,7 @@ local t={
       cimguiname="ImGui_ImplGlfw_NewFrame",
       defaults={},
       funcname="ImGui_ImplGlfw_NewFrame",
-      location="imgui_impl_glfw:39",
+      location="imgui_impl_glfw:37",
       ov_cimguiname="ImGui_ImplGlfw_NewFrame",
       ret="void",
       signature="()",
@@ -301,7 +301,7 @@ local t={
       cimguiname="ImGui_ImplGlfw_RestoreCallbacks",
       defaults={},
       funcname="ImGui_ImplGlfw_RestoreCallbacks",
-      location="imgui_impl_glfw:51",
+      location="imgui_impl_glfw:49",
       ov_cimguiname="ImGui_ImplGlfw_RestoreCallbacks",
       ret="void",
       signature="(GLFWwindow*)",
@@ -326,7 +326,7 @@ local t={
       cimguiname="ImGui_ImplGlfw_ScrollCallback",
       defaults={},
       funcname="ImGui_ImplGlfw_ScrollCallback",
-      location="imgui_impl_glfw:62",
+      location="imgui_impl_glfw:60",
       ov_cimguiname="ImGui_ImplGlfw_ScrollCallback",
       ret="void",
       signature="(GLFWwindow*,double,double)",
@@ -345,7 +345,7 @@ local t={
       cimguiname="ImGui_ImplGlfw_SetCallbacksChainForAllWindows",
       defaults={},
       funcname="ImGui_ImplGlfw_SetCallbacksChainForAllWindows",
-      location="imgui_impl_glfw:55",
+      location="imgui_impl_glfw:53",
       ov_cimguiname="ImGui_ImplGlfw_SetCallbacksChainForAllWindows",
       ret="void",
       signature="(bool)",
@@ -361,7 +361,7 @@ local t={
       cimguiname="ImGui_ImplGlfw_Shutdown",
       defaults={},
       funcname="ImGui_ImplGlfw_Shutdown",
-      location="imgui_impl_glfw:38",
+      location="imgui_impl_glfw:36",
       ov_cimguiname="ImGui_ImplGlfw_Shutdown",
       ret="void",
       signature="()",
@@ -380,7 +380,7 @@ local t={
       cimguiname="ImGui_ImplGlfw_Sleep",
       defaults={},
       funcname="ImGui_ImplGlfw_Sleep",
-      location="imgui_impl_glfw:68",
+      location="imgui_impl_glfw:66",
       ov_cimguiname="ImGui_ImplGlfw_Sleep",
       ret="void",
       signature="(int)",
@@ -402,7 +402,7 @@ local t={
       cimguiname="ImGui_ImplGlfw_WindowFocusCallback",
       defaults={},
       funcname="ImGui_ImplGlfw_WindowFocusCallback",
-      location="imgui_impl_glfw:58",
+      location="imgui_impl_glfw:56",
       ov_cimguiname="ImGui_ImplGlfw_WindowFocusCallback",
       ret="void",
       signature="(GLFWwindow*,int)",
@@ -536,7 +536,7 @@ local t={
       cimguiname="ImGui_ImplOpenGL3_CreateDeviceObjects",
       defaults={},
       funcname="ImGui_ImplOpenGL3_CreateDeviceObjects",
-      location="imgui_impl_opengl3:41",
+      location="imgui_impl_opengl3:40",
       ov_cimguiname="ImGui_ImplOpenGL3_CreateDeviceObjects",
       ret="bool",
       signature="()",
@@ -552,7 +552,7 @@ local t={
       cimguiname="ImGui_ImplOpenGL3_DestroyDeviceObjects",
       defaults={},
       funcname="ImGui_ImplOpenGL3_DestroyDeviceObjects",
-      location="imgui_impl_opengl3:42",
+      location="imgui_impl_opengl3:41",
       ov_cimguiname="ImGui_ImplOpenGL3_DestroyDeviceObjects",
       ret="void",
       signature="()",
@@ -572,7 +572,7 @@ local t={
       defaults={
         glsl_version="nullptr"},
       funcname="ImGui_ImplOpenGL3_Init",
-      location="imgui_impl_opengl3:35",
+      location="imgui_impl_opengl3:34",
       ov_cimguiname="ImGui_ImplOpenGL3_Init",
       ret="bool",
       signature="(const char*)",
@@ -588,7 +588,7 @@ local t={
       cimguiname="ImGui_ImplOpenGL3_NewFrame",
       defaults={},
       funcname="ImGui_ImplOpenGL3_NewFrame",
-      location="imgui_impl_opengl3:37",
+      location="imgui_impl_opengl3:36",
       ov_cimguiname="ImGui_ImplOpenGL3_NewFrame",
       ret="void",
       signature="()",
@@ -607,7 +607,7 @@ local t={
       cimguiname="ImGui_ImplOpenGL3_RenderDrawData",
       defaults={},
       funcname="ImGui_ImplOpenGL3_RenderDrawData",
-      location="imgui_impl_opengl3:38",
+      location="imgui_impl_opengl3:37",
       ov_cimguiname="ImGui_ImplOpenGL3_RenderDrawData",
       ret="void",
       signature="(ImDrawData*)",
@@ -623,7 +623,7 @@ local t={
       cimguiname="ImGui_ImplOpenGL3_Shutdown",
       defaults={},
       funcname="ImGui_ImplOpenGL3_Shutdown",
-      location="imgui_impl_opengl3:36",
+      location="imgui_impl_opengl3:35",
       ov_cimguiname="ImGui_ImplOpenGL3_Shutdown",
       ret="void",
       signature="()",
@@ -642,7 +642,7 @@ local t={
       cimguiname="ImGui_ImplOpenGL3_UpdateTexture",
       defaults={},
       funcname="ImGui_ImplOpenGL3_UpdateTexture",
-      location="imgui_impl_opengl3:45",
+      location="imgui_impl_opengl3:44",
       ov_cimguiname="ImGui_ImplOpenGL3_UpdateTexture",
       ret="void",
       signature="(ImTextureData*)",
@@ -661,7 +661,7 @@ local t={
       cimguiname="ImGui_ImplSDL2_GetContentScaleForDisplay",
       defaults={},
       funcname="ImGui_ImplSDL2_GetContentScaleForDisplay",
-      location="imgui_impl_sdl2:47",
+      location="imgui_impl_sdl2:43",
       ov_cimguiname="ImGui_ImplSDL2_GetContentScaleForDisplay",
       ret="float",
       signature="(int)",
@@ -680,7 +680,7 @@ local t={
       cimguiname="ImGui_ImplSDL2_GetContentScaleForWindow",
       defaults={},
       funcname="ImGui_ImplSDL2_GetContentScaleForWindow",
-      location="imgui_impl_sdl2:46",
+      location="imgui_impl_sdl2:42",
       ov_cimguiname="ImGui_ImplSDL2_GetContentScaleForWindow",
       ret="float",
       signature="(SDL_Window*)",
@@ -699,7 +699,7 @@ local t={
       cimguiname="ImGui_ImplSDL2_InitForD3D",
       defaults={},
       funcname="ImGui_ImplSDL2_InitForD3D",
-      location="imgui_impl_sdl2:37",
+      location="imgui_impl_sdl2:33",
       ov_cimguiname="ImGui_ImplSDL2_InitForD3D",
       ret="bool",
       signature="(SDL_Window*)",
@@ -718,7 +718,7 @@ local t={
       cimguiname="ImGui_ImplSDL2_InitForMetal",
       defaults={},
       funcname="ImGui_ImplSDL2_InitForMetal",
-      location="imgui_impl_sdl2:38",
+      location="imgui_impl_sdl2:34",
       ov_cimguiname="ImGui_ImplSDL2_InitForMetal",
       ret="bool",
       signature="(SDL_Window*)",
@@ -740,7 +740,7 @@ local t={
       cimguiname="ImGui_ImplSDL2_InitForOpenGL",
       defaults={},
       funcname="ImGui_ImplSDL2_InitForOpenGL",
-      location="imgui_impl_sdl2:35",
+      location="imgui_impl_sdl2:31",
       ov_cimguiname="ImGui_ImplSDL2_InitForOpenGL",
       ret="bool",
       signature="(SDL_Window*,void*)",
@@ -759,7 +759,7 @@ local t={
       cimguiname="ImGui_ImplSDL2_InitForOther",
       defaults={},
       funcname="ImGui_ImplSDL2_InitForOther",
-      location="imgui_impl_sdl2:40",
+      location="imgui_impl_sdl2:36",
       ov_cimguiname="ImGui_ImplSDL2_InitForOther",
       ret="bool",
       signature="(SDL_Window*)",
@@ -781,7 +781,7 @@ local t={
       cimguiname="ImGui_ImplSDL2_InitForSDLRenderer",
       defaults={},
       funcname="ImGui_ImplSDL2_InitForSDLRenderer",
-      location="imgui_impl_sdl2:39",
+      location="imgui_impl_sdl2:35",
       ov_cimguiname="ImGui_ImplSDL2_InitForSDLRenderer",
       ret="bool",
       signature="(SDL_Window*,SDL_Renderer*)",
@@ -800,7 +800,7 @@ local t={
       cimguiname="ImGui_ImplSDL2_InitForVulkan",
       defaults={},
       funcname="ImGui_ImplSDL2_InitForVulkan",
-      location="imgui_impl_sdl2:36",
+      location="imgui_impl_sdl2:32",
       ov_cimguiname="ImGui_ImplSDL2_InitForVulkan",
       ret="bool",
       signature="(SDL_Window*)",
@@ -816,7 +816,7 @@ local t={
       cimguiname="ImGui_ImplSDL2_NewFrame",
       defaults={},
       funcname="ImGui_ImplSDL2_NewFrame",
-      location="imgui_impl_sdl2:42",
+      location="imgui_impl_sdl2:38",
       ov_cimguiname="ImGui_ImplSDL2_NewFrame",
       ret="void",
       signature="()",
@@ -835,7 +835,7 @@ local t={
       cimguiname="ImGui_ImplSDL2_ProcessEvent",
       defaults={},
       funcname="ImGui_ImplSDL2_ProcessEvent",
-      location="imgui_impl_sdl2:43",
+      location="imgui_impl_sdl2:39",
       ov_cimguiname="ImGui_ImplSDL2_ProcessEvent",
       ret="bool",
       signature="(const SDL_Event*)",
@@ -862,7 +862,7 @@ local t={
         manual_gamepads_array="nullptr",
         manual_gamepads_count="-1"},
       funcname="ImGui_ImplSDL2_SetGamepadMode",
-      location="imgui_impl_sdl2:52",
+      location="imgui_impl_sdl2:48",
       ov_cimguiname="ImGui_ImplSDL2_SetGamepadMode",
       ret="void",
       signature="(ImGui_ImplSDL2_GamepadMode,struct _SDL_GameController**,int)",
@@ -881,7 +881,7 @@ local t={
       cimguiname="ImGui_ImplSDL2_SetMouseCaptureMode",
       defaults={},
       funcname="ImGui_ImplSDL2_SetMouseCaptureMode",
-      location="imgui_impl_sdl2:59",
+      location="imgui_impl_sdl2:55",
       ov_cimguiname="ImGui_ImplSDL2_SetMouseCaptureMode",
       ret="void",
       signature="(ImGui_ImplSDL2_MouseCaptureMode)",
@@ -897,7 +897,7 @@ local t={
       cimguiname="ImGui_ImplSDL2_Shutdown",
       defaults={},
       funcname="ImGui_ImplSDL2_Shutdown",
-      location="imgui_impl_sdl2:41",
+      location="imgui_impl_sdl2:37",
       ov_cimguiname="ImGui_ImplSDL2_Shutdown",
       ret="void",
       signature="()",
@@ -916,7 +916,7 @@ local t={
       cimguiname="ImGui_ImplSDL3_InitForD3D",
       defaults={},
       funcname="ImGui_ImplSDL3_InitForD3D",
-      location="imgui_impl_sdl3:36",
+      location="imgui_impl_sdl3:33",
       ov_cimguiname="ImGui_ImplSDL3_InitForD3D",
       ret="bool",
       signature="(SDL_Window*)",
@@ -935,7 +935,7 @@ local t={
       cimguiname="ImGui_ImplSDL3_InitForMetal",
       defaults={},
       funcname="ImGui_ImplSDL3_InitForMetal",
-      location="imgui_impl_sdl3:37",
+      location="imgui_impl_sdl3:34",
       ov_cimguiname="ImGui_ImplSDL3_InitForMetal",
       ret="bool",
       signature="(SDL_Window*)",
@@ -957,7 +957,7 @@ local t={
       cimguiname="ImGui_ImplSDL3_InitForOpenGL",
       defaults={},
       funcname="ImGui_ImplSDL3_InitForOpenGL",
-      location="imgui_impl_sdl3:34",
+      location="imgui_impl_sdl3:31",
       ov_cimguiname="ImGui_ImplSDL3_InitForOpenGL",
       ret="bool",
       signature="(SDL_Window*,void*)",
@@ -976,7 +976,7 @@ local t={
       cimguiname="ImGui_ImplSDL3_InitForOther",
       defaults={},
       funcname="ImGui_ImplSDL3_InitForOther",
-      location="imgui_impl_sdl3:40",
+      location="imgui_impl_sdl3:37",
       ov_cimguiname="ImGui_ImplSDL3_InitForOther",
       ret="bool",
       signature="(SDL_Window*)",
@@ -995,7 +995,7 @@ local t={
       cimguiname="ImGui_ImplSDL3_InitForSDLGPU",
       defaults={},
       funcname="ImGui_ImplSDL3_InitForSDLGPU",
-      location="imgui_impl_sdl3:39",
+      location="imgui_impl_sdl3:36",
       ov_cimguiname="ImGui_ImplSDL3_InitForSDLGPU",
       ret="bool",
       signature="(SDL_Window*)",
@@ -1017,7 +1017,7 @@ local t={
       cimguiname="ImGui_ImplSDL3_InitForSDLRenderer",
       defaults={},
       funcname="ImGui_ImplSDL3_InitForSDLRenderer",
-      location="imgui_impl_sdl3:38",
+      location="imgui_impl_sdl3:35",
       ov_cimguiname="ImGui_ImplSDL3_InitForSDLRenderer",
       ret="bool",
       signature="(SDL_Window*,SDL_Renderer*)",
@@ -1036,7 +1036,7 @@ local t={
       cimguiname="ImGui_ImplSDL3_InitForVulkan",
       defaults={},
       funcname="ImGui_ImplSDL3_InitForVulkan",
-      location="imgui_impl_sdl3:35",
+      location="imgui_impl_sdl3:32",
       ov_cimguiname="ImGui_ImplSDL3_InitForVulkan",
       ret="bool",
       signature="(SDL_Window*)",
@@ -1052,7 +1052,7 @@ local t={
       cimguiname="ImGui_ImplSDL3_NewFrame",
       defaults={},
       funcname="ImGui_ImplSDL3_NewFrame",
-      location="imgui_impl_sdl3:42",
+      location="imgui_impl_sdl3:39",
       ov_cimguiname="ImGui_ImplSDL3_NewFrame",
       ret="void",
       signature="()",
@@ -1071,7 +1071,7 @@ local t={
       cimguiname="ImGui_ImplSDL3_ProcessEvent",
       defaults={},
       funcname="ImGui_ImplSDL3_ProcessEvent",
-      location="imgui_impl_sdl3:43",
+      location="imgui_impl_sdl3:40",
       ov_cimguiname="ImGui_ImplSDL3_ProcessEvent",
       ret="bool",
       signature="(const SDL_Event*)",
@@ -1098,7 +1098,7 @@ local t={
         manual_gamepads_array="nullptr",
         manual_gamepads_count="-1"},
       funcname="ImGui_ImplSDL3_SetGamepadMode",
-      location="imgui_impl_sdl3:48",
+      location="imgui_impl_sdl3:45",
       ov_cimguiname="ImGui_ImplSDL3_SetGamepadMode",
       ret="void",
       signature="(ImGui_ImplSDL3_GamepadMode,SDL_Gamepad**,int)",
@@ -1117,7 +1117,7 @@ local t={
       cimguiname="ImGui_ImplSDL3_SetMouseCaptureMode",
       defaults={},
       funcname="ImGui_ImplSDL3_SetMouseCaptureMode",
-      location="imgui_impl_sdl3:55",
+      location="imgui_impl_sdl3:52",
       ov_cimguiname="ImGui_ImplSDL3_SetMouseCaptureMode",
       ret="void",
       signature="(ImGui_ImplSDL3_MouseCaptureMode)",
@@ -1133,7 +1133,7 @@ local t={
       cimguiname="ImGui_ImplSDL3_Shutdown",
       defaults={},
       funcname="ImGui_ImplSDL3_Shutdown",
-      location="imgui_impl_sdl3:41",
+      location="imgui_impl_sdl3:38",
       ov_cimguiname="ImGui_ImplSDL3_Shutdown",
       ret="void",
       signature="()",
@@ -1179,7 +1179,7 @@ local t={
       cimguiname="ImGui_ImplVulkanH_CreateOrResizeWindow",
       defaults={},
       funcname="ImGui_ImplVulkanH_CreateOrResizeWindow",
-      location="imgui_impl_vulkan:208",
+      location="imgui_impl_vulkan:203",
       ov_cimguiname="ImGui_ImplVulkanH_CreateOrResizeWindow",
       ret="void",
       signature="(VkInstance,VkPhysicalDevice,VkDevice,ImGui_ImplVulkanH_Window*,uint32_t,const VkAllocationCallbacks*,int,int,uint32_t,VkImageUsageFlags)",
@@ -1207,7 +1207,7 @@ local t={
       cimguiname="ImGui_ImplVulkanH_DestroyWindow",
       defaults={},
       funcname="ImGui_ImplVulkanH_DestroyWindow",
-      location="imgui_impl_vulkan:209",
+      location="imgui_impl_vulkan:204",
       ov_cimguiname="ImGui_ImplVulkanH_DestroyWindow",
       ret="void",
       signature="(VkInstance,VkDevice,ImGui_ImplVulkanH_Window*,const VkAllocationCallbacks*)",
@@ -1226,31 +1226,12 @@ local t={
       cimguiname="ImGui_ImplVulkanH_GetMinImageCountFromPresentMode",
       defaults={},
       funcname="ImGui_ImplVulkanH_GetMinImageCountFromPresentMode",
-      location="imgui_impl_vulkan:214",
+      location="imgui_impl_vulkan:209",
       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:215",
-      ov_cimguiname="ImGui_ImplVulkanH_GetWindowDataFromViewport",
-      ret="ImGui_ImplVulkanH_Window*",
-      signature="(ImGuiViewport*)",
-      stname=""},
-    ["(ImGuiViewport*)"]=nil},
   ImGui_ImplVulkanH_SelectPhysicalDevice={
     [1]={
       args="(VkInstance instance)",
@@ -1264,7 +1245,7 @@ local t={
       cimguiname="ImGui_ImplVulkanH_SelectPhysicalDevice",
       defaults={},
       funcname="ImGui_ImplVulkanH_SelectPhysicalDevice",
-      location="imgui_impl_vulkan:212",
+      location="imgui_impl_vulkan:207",
       ov_cimguiname="ImGui_ImplVulkanH_SelectPhysicalDevice",
       ret="VkPhysicalDevice",
       signature="(VkInstance)",
@@ -1292,7 +1273,7 @@ local t={
       cimguiname="ImGui_ImplVulkanH_SelectPresentMode",
       defaults={},
       funcname="ImGui_ImplVulkanH_SelectPresentMode",
-      location="imgui_impl_vulkan:211",
+      location="imgui_impl_vulkan:206",
       ov_cimguiname="ImGui_ImplVulkanH_SelectPresentMode",
       ret="VkPresentModeKHR",
       signature="(VkPhysicalDevice,VkSurfaceKHR,const VkPresentModeKHR*,int)",
@@ -1311,7 +1292,7 @@ local t={
       cimguiname="ImGui_ImplVulkanH_SelectQueueFamilyIndex",
       defaults={},
       funcname="ImGui_ImplVulkanH_SelectQueueFamilyIndex",
-      location="imgui_impl_vulkan:213",
+      location="imgui_impl_vulkan:208",
       ov_cimguiname="ImGui_ImplVulkanH_SelectQueueFamilyIndex",
       ret="uint32_t",
       signature="(VkPhysicalDevice)",
@@ -1342,7 +1323,7 @@ local t={
       cimguiname="ImGui_ImplVulkanH_SelectSurfaceFormat",
       defaults={},
       funcname="ImGui_ImplVulkanH_SelectSurfaceFormat",
-      location="imgui_impl_vulkan:210",
+      location="imgui_impl_vulkan:205",
       ov_cimguiname="ImGui_ImplVulkanH_SelectSurfaceFormat",
       ret="VkSurfaceFormatKHR",
       signature="(VkPhysicalDevice,VkSurfaceKHR,const VkFormat*,int,VkColorSpaceKHR)",
@@ -1359,7 +1340,7 @@ local t={
       constructor=true,
       defaults={},
       funcname="ImGui_ImplVulkanH_Window",
-      location="imgui_impl_vulkan:260",
+      location="imgui_impl_vulkan:255",
       namespace="ImGui_ImplVulkanH_Window",
       ov_cimguiname="ImGui_ImplVulkanH_Window_ImGui_ImplVulkanH_Window",
       signature="()",
@@ -1376,7 +1357,7 @@ local t={
       cimguiname="ImGui_ImplVulkanH_Window_destroy",
       defaults={},
       destructor=true,
-      location="imgui_impl_vulkan:260",
+      location="imgui_impl_vulkan:255",
       ov_cimguiname="ImGui_ImplVulkanH_Window_destroy",
       ret="void",
       signature="(ImGui_ImplVulkanH_Window*)",
@@ -1384,29 +1365,26 @@ local t={
     ["(ImGui_ImplVulkanH_Window*)"]=nil},
   ImGui_ImplVulkan_AddTexture={
     [1]={
-      args="(VkSampler sampler,VkImageView image_view,VkImageLayout image_layout)",
+      args="(VkImageView image_view,VkImageLayout image_layout)",
       argsT={
         [1]={
-          name="sampler",
-          type="VkSampler"},
-        [2]={
           name="image_view",
           type="VkImageView"},
-        [3]={
+        [2]={
           name="image_layout",
           type="VkImageLayout"}},
-      argsoriginal="(VkSampler sampler,VkImageView image_view,VkImageLayout image_layout)",
+      argsoriginal="(VkImageView image_view,VkImageLayout image_layout)",
-      call_args="(sampler,image_view,image_layout)",
+      call_args="(image_view,image_layout)",
-      call_args_old="(sampler,image_view,image_layout)",
+      call_args_old="(image_view,image_layout)",
       cimguiname="ImGui_ImplVulkan_AddTexture",
       defaults={},
       funcname="ImGui_ImplVulkan_AddTexture",
-      location="imgui_impl_vulkan:166",
+      location="imgui_impl_vulkan:157",
       ov_cimguiname="ImGui_ImplVulkan_AddTexture",
       ret="VkDescriptorSet",
-      signature="(VkSampler,VkImageView,VkImageLayout)",
+      signature="(VkImageView,VkImageLayout)",
       stname=""},
-    ["(VkSampler,VkImageView,VkImageLayout)"]=nil},
+    ["(VkImageView,VkImageLayout)"]=nil},
   ImGui_ImplVulkan_CreateMainPipeline={
     [1]={
       args="(const ImGui_ImplVulkan_PipelineInfo* info)",
@@ -1420,7 +1398,7 @@ local t={
       cimguiname="ImGui_ImplVulkan_CreateMainPipeline",
       defaults={},
       funcname="ImGui_ImplVulkan_CreateMainPipeline",
-      location="imgui_impl_vulkan:158",
+      location="imgui_impl_vulkan:151",
       ov_cimguiname="ImGui_ImplVulkan_CreateMainPipeline",
       ret="void",
       signature="(const ImGui_ImplVulkan_PipelineInfo*)",
@@ -1439,7 +1417,7 @@ local t={
       cimguiname="ImGui_ImplVulkan_Init",
       defaults={},
       funcname="ImGui_ImplVulkan_Init",
-      location="imgui_impl_vulkan:149",
+      location="imgui_impl_vulkan:142",
       ov_cimguiname="ImGui_ImplVulkan_Init",
       ret="bool",
       signature="(ImGui_ImplVulkan_InitInfo*)",
@@ -1465,7 +1443,7 @@ local t={
       defaults={
         user_data="nullptr"},
       funcname="ImGui_ImplVulkan_LoadFunctions",
-      location="imgui_impl_vulkan:171",
+      location="imgui_impl_vulkan:166",
       ov_cimguiname="ImGui_ImplVulkan_LoadFunctions",
       ret="bool",
       signature="(uint32_t,PFN_vkVoidFunction(*loader_func)(const char* function_name,void*,void*)",
@@ -1481,7 +1459,7 @@ local t={
       cimguiname="ImGui_ImplVulkan_NewFrame",
       defaults={},
       funcname="ImGui_ImplVulkan_NewFrame",
-      location="imgui_impl_vulkan:151",
+      location="imgui_impl_vulkan:144",
       ov_cimguiname="ImGui_ImplVulkan_NewFrame",
       ret="void",
       signature="()",
@@ -1500,7 +1478,7 @@ local t={
       cimguiname="ImGui_ImplVulkan_RemoveTexture",
       defaults={},
       funcname="ImGui_ImplVulkan_RemoveTexture",
-      location="imgui_impl_vulkan:167",
+      location="imgui_impl_vulkan:158",
       ov_cimguiname="ImGui_ImplVulkan_RemoveTexture",
       ret="void",
       signature="(VkDescriptorSet)",
@@ -1526,7 +1504,7 @@ local t={
       defaults={
         pipeline="0ULL"},
       funcname="ImGui_ImplVulkan_RenderDrawData",
-      location="imgui_impl_vulkan:152",
+      location="imgui_impl_vulkan:145",
       ov_cimguiname="ImGui_ImplVulkan_RenderDrawData",
       ret="void",
       signature="(ImDrawData*,VkCommandBuffer,VkPipeline)",
@@ -1545,7 +1523,7 @@ local t={
       cimguiname="ImGui_ImplVulkan_SetMinImageCount",
       defaults={},
       funcname="ImGui_ImplVulkan_SetMinImageCount",
-      location="imgui_impl_vulkan:153",
+      location="imgui_impl_vulkan:146",
       ov_cimguiname="ImGui_ImplVulkan_SetMinImageCount",
       ret="void",
       signature="(uint32_t)",
@@ -1561,7 +1539,7 @@ local t={
       cimguiname="ImGui_ImplVulkan_Shutdown",
       defaults={},
       funcname="ImGui_ImplVulkan_Shutdown",
-      location="imgui_impl_vulkan:150",
+      location="imgui_impl_vulkan:143",
       ov_cimguiname="ImGui_ImplVulkan_Shutdown",
       ret="void",
       signature="()",
@@ -1580,7 +1558,7 @@ local t={
       cimguiname="ImGui_ImplVulkan_UpdateTexture",
       defaults={},
       funcname="ImGui_ImplVulkan_UpdateTexture",
-      location="imgui_impl_vulkan:161",
+      location="imgui_impl_vulkan:154",
       ov_cimguiname="ImGui_ImplVulkan_UpdateTexture",
       ret="void",
       signature="(ImTextureData*)",
@@ -1647,14 +1625,13 @@ 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,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]
 t.ImGui_ImplVulkanH_SelectSurfaceFormat["(VkPhysicalDevice,VkSurfaceKHR,const VkFormat*,int,VkColorSpaceKHR)"]=t.ImGui_ImplVulkanH_SelectSurfaceFormat[1]
 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_AddTexture["(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]

generator/output/overloads.txt

@@ -114,13 +114,17 @@ igCombo	3
 1	bool	igCombo_Str_arr (const char*,int*,const char* const[],int,int)
 2	bool	igCombo_Str (const char*,int*,const char*,int)
 3	bool	igCombo_FnStrPtr (const char*,int*,const char*(*)(void*,int),void*,int,int)
+igGetBackgroundDrawList	2
+1	ImDrawList*	igGetBackgroundDrawList_Nil ()
+2	ImDrawList*	igGetBackgroundDrawList_ViewportPtr (ImGuiViewport*)
 igGetColorU32	3
 1	ImU32	igGetColorU32_Col (ImGuiCol,float)
 2	ImU32	igGetColorU32_Vec4 (const ImVec4)
 3	ImU32	igGetColorU32_U32 (ImU32,float)
-igGetForegroundDrawList	2
+igGetForegroundDrawList	3
-1	ImDrawList*	igGetForegroundDrawList_ViewportPtr (ImGuiViewport*)
+1	ImDrawList*	igGetForegroundDrawList_Nil ()
 2	ImDrawList*	igGetForegroundDrawList_WindowPtr (ImGuiWindow*)
+3	ImDrawList*	igGetForegroundDrawList_ViewportPtr (ImGuiViewport*)
 igGetID	4
 1	ImGuiID	igGetID_Str (const char*)
 2	ImGuiID	igGetID_StrStr (const char*,const char*)
@@ -239,8 +243,8 @@ igSelectable	2
 1	bool	igSelectable_Bool (const char*,bool,ImGuiSelectableFlags,const ImVec2)
 2	bool	igSelectable_BoolPtr (const char*,bool*,ImGuiSelectableFlags,const ImVec2)
 igSetItemKeyOwner	2
-1	void	igSetItemKeyOwner_Nil (ImGuiKey)
+1	bool	igSetItemKeyOwner_Nil (ImGuiKey)
-2	void	igSetItemKeyOwner_InputFlags (ImGuiKey,ImGuiInputFlags)
+2	bool	igSetItemKeyOwner_InputFlags (ImGuiKey,ImGuiInputFlags)
 igSetScrollFromPosX	2
 1	void	igSetScrollFromPosX_Float (float,float)
 2	void	igSetScrollFromPosX_WindowPtr (ImGuiWindow*,float,float)
@@ -305,4 +309,4 @@ igValue	4
 2	void	igValue_Int (const char*,int)
 3	void	igValue_Uint (const char*,unsigned int)
 4	void	igValue_Float (const char*,float,const char*)
-213 overloaded
+216 overloaded

generator/output/typedefs_dict.json

@@ -48,7 +48,6 @@
   "ImGuiContext": "struct ImGuiContext",
   "ImGuiContextHook": "struct ImGuiContextHook",
   "ImGuiContextHookCallback": "void (*)(ImGuiContext* ctx, ImGuiContextHook* hook);",
-  "ImGuiDataAuthority": "int",
   "ImGuiDataType": "int",
   "ImGuiDataTypeInfo": "struct ImGuiDataTypeInfo",
   "ImGuiDataTypeStorage": "struct ImGuiDataTypeStorage",
@@ -58,11 +57,6 @@
   "ImGuiDebugItemPathQuery": "struct ImGuiDebugItemPathQuery",
   "ImGuiDebugLogFlags": "int",
   "ImGuiDemoMarkerCallback": "void (*)(const char* file, int line, const char* section);",
-  "ImGuiDockContext": "struct ImGuiDockContext",
-  "ImGuiDockNode": "struct ImGuiDockNode",
-  "ImGuiDockNodeFlags": "int",
-  "ImGuiDockNodeSettings": "struct ImGuiDockNodeSettings",
-  "ImGuiDockRequest": "struct ImGuiDockRequest",
   "ImGuiDragDropFlags": "int",
   "ImGuiErrorCallback": "void (*)(ImGuiContext* ctx, void* user_data, const char* msg);",
   "ImGuiErrorRecoveryState": "struct ImGuiErrorRecoveryState",
@@ -80,7 +74,6 @@
   "ImGuiInputEventKey": "struct ImGuiInputEventKey",
   "ImGuiInputEventMouseButton": "struct ImGuiInputEventMouseButton",
   "ImGuiInputEventMousePos": "struct ImGuiInputEventMousePos",
-  "ImGuiInputEventMouseViewport": "struct ImGuiInputEventMouseViewport",
   "ImGuiInputEventMouseWheel": "struct ImGuiInputEventMouseWheel",
   "ImGuiInputEventText": "struct ImGuiInputEventText",
   "ImGuiInputFlags": "int",
@@ -130,7 +123,6 @@
   "ImGuiPayload": "struct ImGuiPayload",
   "ImGuiPlatformIO": "struct ImGuiPlatformIO",
   "ImGuiPlatformImeData": "struct ImGuiPlatformImeData",
-  "ImGuiPlatformMonitor": "struct ImGuiPlatformMonitor",
   "ImGuiPopupData": "struct ImGuiPopupData",
   "ImGuiPopupFlags": "int",
   "ImGuiPtrOrIndex": "struct ImGuiPtrOrIndex",
@@ -190,8 +182,6 @@
   "ImGuiViewportP": "struct ImGuiViewportP",
   "ImGuiWindow": "struct ImGuiWindow",
   "ImGuiWindowBgClickFlags": "int",
-  "ImGuiWindowClass": "struct ImGuiWindowClass",
-  "ImGuiWindowDockStyle": "struct ImGuiWindowDockStyle",
   "ImGuiWindowFlags": "int",
   "ImGuiWindowRefreshFlags": "int",
   "ImGuiWindowSettings": "struct ImGuiWindowSettings",

generator/output/typedefs_dict.lua

@@ -48,7 +48,6 @@ local t={
   ImGuiContext="struct ImGuiContext",
   ImGuiContextHook="struct ImGuiContextHook",
   ImGuiContextHookCallback="void (*)(ImGuiContext* ctx, ImGuiContextHook* hook);",
-  ImGuiDataAuthority="int",
   ImGuiDataType="int",
   ImGuiDataTypeInfo="struct ImGuiDataTypeInfo",
   ImGuiDataTypeStorage="struct ImGuiDataTypeStorage",
@@ -58,11 +57,6 @@ local t={
   ImGuiDebugItemPathQuery="struct ImGuiDebugItemPathQuery",
   ImGuiDebugLogFlags="int",
   ImGuiDemoMarkerCallback="void (*)(const char* file, int line, const char* section);",
-  ImGuiDockContext="struct ImGuiDockContext",
-  ImGuiDockNode="struct ImGuiDockNode",
-  ImGuiDockNodeFlags="int",
-  ImGuiDockNodeSettings="struct ImGuiDockNodeSettings",
-  ImGuiDockRequest="struct ImGuiDockRequest",
   ImGuiDragDropFlags="int",
   ImGuiErrorCallback="void (*)(ImGuiContext* ctx, void* user_data, const char* msg);",
   ImGuiErrorRecoveryState="struct ImGuiErrorRecoveryState",
@@ -80,7 +74,6 @@ local t={
   ImGuiInputEventKey="struct ImGuiInputEventKey",
   ImGuiInputEventMouseButton="struct ImGuiInputEventMouseButton",
   ImGuiInputEventMousePos="struct ImGuiInputEventMousePos",
-  ImGuiInputEventMouseViewport="struct ImGuiInputEventMouseViewport",
   ImGuiInputEventMouseWheel="struct ImGuiInputEventMouseWheel",
   ImGuiInputEventText="struct ImGuiInputEventText",
   ImGuiInputFlags="int",
@@ -130,7 +123,6 @@ local t={
   ImGuiPayload="struct ImGuiPayload",
   ImGuiPlatformIO="struct ImGuiPlatformIO",
   ImGuiPlatformImeData="struct ImGuiPlatformImeData",
-  ImGuiPlatformMonitor="struct ImGuiPlatformMonitor",
   ImGuiPopupData="struct ImGuiPopupData",
   ImGuiPopupFlags="int",
   ImGuiPtrOrIndex="struct ImGuiPtrOrIndex",
@@ -190,8 +182,6 @@ local t={
   ImGuiViewportP="struct ImGuiViewportP",
   ImGuiWindow="struct ImGuiWindow",
   ImGuiWindowBgClickFlags="int",
-  ImGuiWindowClass="struct ImGuiWindowClass",
-  ImGuiWindowDockStyle="struct ImGuiWindowDockStyle",
   ImGuiWindowFlags="int",
   ImGuiWindowRefreshFlags="int",
   ImGuiWindowSettings="struct ImGuiWindowSettings",