pull imgui 1.92.8 docking and generate

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,5 +1,5 @@
 //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
@@ -1762,7 +1762,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);
 }
@@ -2463,9 +2463,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 +2539,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 +2583,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 +2895,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 +2911,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();
@@ -3610,6 +3618,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);
@@ -4830,6 +4846,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 +5122,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);
 }
@@ -5338,6 +5358,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 +5390,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 +5562,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);
@@ -6499,6 +6527,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.h

@@ -1,5 +1,5 @@
 //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
@@ -752,6 +752,7 @@ typedef enum {
     ImGuiCol_ScrollbarGrabHovered,
     ImGuiCol_ScrollbarGrabActive,
     ImGuiCol_CheckMark,
+    ImGuiCol_CheckboxSelectedBg,
     ImGuiCol_SliderGrab,
     ImGuiCol_SliderGrabActive,
     ImGuiCol_Button,
@@ -833,6 +834,7 @@ typedef enum {
     ImGuiStyleVar_TableAngledHeadersTextAlign,
     ImGuiStyleVar_TreeLinesSize,
     ImGuiStyleVar_TreeLinesRounding,
+    ImGuiStyleVar_DragDropTargetRounding,
     ImGuiStyleVar_ButtonTextAlign,
     ImGuiStyleVar_SelectableTextAlign,
     ImGuiStyleVar_SeparatorSize,
@@ -1262,6 +1264,7 @@ struct ImGuiWindowClass
     ImGuiDockNodeFlags DockNodeFlagsOverrideSet;
     bool DockingAlwaysTabBar;
     bool DockingAllowUnclassed;
+    void* PlatformIconData;
 };
 struct ImGuiPayload
 {
@@ -1438,12 +1441,12 @@ struct ImDrawListSplitter
 };
 typedef enum {
     ImDrawFlags_None = 0,
-    ImDrawFlags_Closed = 1 << 0,
     ImDrawFlags_RoundCornersTopLeft = 1 << 4,
     ImDrawFlags_RoundCornersTopRight = 1 << 5,
     ImDrawFlags_RoundCornersBottomLeft = 1 << 6,
     ImDrawFlags_RoundCornersBottomRight = 1 << 7,
     ImDrawFlags_RoundCornersNone = 1 << 8,
+    ImDrawFlags_Closed = 1 << 9,
     ImDrawFlags_RoundCornersTop = ImDrawFlags_RoundCornersTopLeft | ImDrawFlags_RoundCornersTopRight,
     ImDrawFlags_RoundCornersBottom = ImDrawFlags_RoundCornersBottomLeft | ImDrawFlags_RoundCornersBottomRight,
     ImDrawFlags_RoundCornersLeft = ImDrawFlags_RoundCornersBottomLeft | ImDrawFlags_RoundCornersTopLeft,
@@ -1451,6 +1454,7 @@ typedef enum {
     ImDrawFlags_RoundCornersAll = ImDrawFlags_RoundCornersTopLeft | ImDrawFlags_RoundCornersTopRight | ImDrawFlags_RoundCornersBottomLeft | ImDrawFlags_RoundCornersBottomRight,
     ImDrawFlags_RoundCornersDefault_ = ImDrawFlags_RoundCornersAll,
     ImDrawFlags_RoundCornersMask_ = ImDrawFlags_RoundCornersAll | ImDrawFlags_RoundCornersNone,
+    ImDrawFlags_InvalidMask_ = (ImDrawFlags)0x8000000F,
 }ImDrawFlags_;
 typedef enum {
     ImDrawListFlags_None = 0,
@@ -1669,6 +1673,7 @@ typedef enum {
     ImFontFlags_NoLoadError = 1 << 1,
     ImFontFlags_NoLoadGlyphs = 1 << 2,
     ImFontFlags_LockBakedSizes = 1 << 3,
+    ImFontFlags_ImplicitRefSize = 1 << 4,
 }ImFontFlags_;
 typedef struct ImVector_ImFontConfigPtr {int Size;int Capacity;ImFontConfig** Data;} ImVector_ImFontConfigPtr;
 
@@ -1719,6 +1724,7 @@ struct ImGuiViewport
     ImDrawData* DrawData;
     void* RendererUserData;
     void* PlatformUserData;
+    void* PlatformIconData;
     void* PlatformHandle;
     void* PlatformHandleRaw;
     bool PlatformWindowCreated;
@@ -1743,6 +1749,9 @@ struct ImGuiPlatformIO
     int Renderer_TextureMaxWidth;
     int Renderer_TextureMaxHeight;
     void* Renderer_RenderState;
+    ImDrawCallback DrawCallback_ResetRenderState;
+    ImDrawCallback DrawCallback_SetSamplerLinear;
+    ImDrawCallback DrawCallback_SetSamplerNearest;
     void (*Platform_CreateWindow)(ImGuiViewport* vp);
     void (*Platform_DestroyWindow)(ImGuiViewport* vp);
     void (*Platform_ShowWindow)(ImGuiViewport* vp);
@@ -1995,6 +2004,7 @@ typedef enum {
     ImGuiItemStatusFlags_Visible = 1 << 8,
     ImGuiItemStatusFlags_HasClipRect = 1 << 9,
     ImGuiItemStatusFlags_HasShortcut = 1 << 10,
+    ImGuiItemStatusFlags_EditedInternal = 1 << 11,
 }ImGuiItemStatusFlags_;
 typedef enum {
     ImGuiHoveredFlags_DelayMask_ = ImGuiHoveredFlags_DelayNone | ImGuiHoveredFlags_DelayShort | ImGuiHoveredFlags_DelayNormal | ImGuiHoveredFlags_NoSharedDelay,
@@ -2600,6 +2610,7 @@ struct ImGuiBoxSelectState
     ImGuiWindow* Window;
     bool UnclipMode;
     ImRect_c UnclipRect;
+    ImRect_c UnclipRects[2];
     ImRect_c BoxSelectRectPrev;
     ImRect_c BoxSelectRectCurr;
 };
@@ -2611,7 +2622,6 @@ struct ImGuiMultiSelectTempData
     ImGuiMultiSelectFlags Flags;
     ImVec2_c ScopeRectMin;
     ImVec2_c BackupCursorMaxPos;
-    ImGuiSelectionUserData LastSubmittedItem;
     ImGuiID BoxSelectId;
     ImGuiKeyChord KeyMods;
     ImS8 LoopRequestSetAll;
@@ -2682,8 +2692,8 @@ struct ImGuiDockNode
     ImVec2_c Size;
     ImVec2_c SizeRef;
     ImGuiAxis SplitAxis;
-    ImGuiWindowClass WindowClass;
     ImU32 LastBgColor;
+    ImGuiWindowClass WindowClass;
     ImGuiWindow* HostWindow;
     ImGuiWindow* VisibleWindow;
     ImGuiDockNode* CentralNode;
@@ -2992,6 +3002,7 @@ struct ImGuiContext
     float CurrentDpiScale;
     ImDrawListSharedData DrawListSharedData;
     ImGuiID WithinEndChildID;
+    ImGuiID WithinEndPopupID;
     void* TestEngine;
     ImVector_ImGuiInputEvent InputEventsQueue;
     ImVector_ImGuiInputEvent InputEventsTrail;
@@ -3859,8 +3870,6 @@ typedef enum {
 #endif
 #define IMGUI_HAS_DOCK       1
 
-#define ImDrawCallback_ResetRenderState       (ImDrawCallback)(-8)
-
 #define ImTextureID_Invalid       ((ImTextureID)0)
 
 #else
@@ -4411,7 +4420,7 @@ CIMGUI_API const char* igGetKeyName(ImGuiKey key);
 CIMGUI_API void igSetNextFrameWantCaptureKeyboard(bool want_capture_keyboard);
 CIMGUI_API bool igShortcut_Nil(ImGuiKeyChord key_chord,ImGuiInputFlags flags);
 CIMGUI_API void igSetNextItemShortcut(ImGuiKeyChord key_chord,ImGuiInputFlags flags);
-CIMGUI_API void igSetItemKeyOwner_Nil(ImGuiKey key);
+CIMGUI_API bool igSetItemKeyOwner_Nil(ImGuiKey key);
 CIMGUI_API bool igIsMouseDown_Nil(ImGuiMouseButton button);
 CIMGUI_API bool igIsMouseClicked_Bool(ImGuiMouseButton button,bool repeat);
 CIMGUI_API bool igIsMouseReleased_Nil(ImGuiMouseButton button);
@@ -4587,7 +4596,9 @@ CIMGUI_API void ImDrawList_PopTexture(ImDrawList* self);
 CIMGUI_API ImVec2_c ImDrawList_GetClipRectMin(ImDrawList* self);
 CIMGUI_API ImVec2_c ImDrawList_GetClipRectMax(ImDrawList* self);
 CIMGUI_API void ImDrawList_AddLine(ImDrawList* self,const ImVec2_c p1,const ImVec2_c p2,ImU32 col,float 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);
+CIMGUI_API void ImDrawList_AddLineV(ImDrawList* self,float x,float min_y,float max_y,ImU32 col,float 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);
 CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2_c p_min,const ImVec2_c p_max,ImU32 col,float rounding,ImDrawFlags flags);
 CIMGUI_API void ImDrawList_AddRectFilledMultiColor(ImDrawList* self,const ImVec2_c p_min,const ImVec2_c p_max,ImU32 col_upr_left,ImU32 col_upr_right,ImU32 col_bot_right,ImU32 col_bot_left);
 CIMGUI_API void ImDrawList_AddQuad(ImDrawList* self,const ImVec2_c p1,const ImVec2_c p2,const ImVec2_c p3,const ImVec2_c p4,ImU32 col,float thickness);
@@ -4604,7 +4615,7 @@ CIMGUI_API void ImDrawList_AddText_Vec2(ImDrawList* self,const ImVec2_c pos,ImU3
 CIMGUI_API void ImDrawList_AddText_FontPtr(ImDrawList* self,ImFont* font,float font_size,const ImVec2_c pos,ImU32 col,const char* text_begin,const char* text_end,float wrap_width,const ImVec4* cpu_fine_clip_rect);
 CIMGUI_API void ImDrawList_AddBezierCubic(ImDrawList* self,const ImVec2_c p1,const ImVec2_c p2,const ImVec2_c p3,const ImVec2_c p4,ImU32 col,float thickness,int num_segments);
 CIMGUI_API void ImDrawList_AddBezierQuadratic(ImDrawList* self,const ImVec2_c p1,const ImVec2_c p2,const ImVec2_c p3,ImU32 col,float thickness,int 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);
 CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2_c* points,int num_points,ImU32 col);
 CIMGUI_API void ImDrawList_AddConcavePolyFilled(ImDrawList* self,const ImVec2_c* points,int num_points,ImU32 col);
 CIMGUI_API void ImDrawList_AddImage(ImDrawList* self,ImTextureRef_c tex_ref,const ImVec2_c p_min,const ImVec2_c p_max,const ImVec2_c uv_min,const ImVec2_c uv_max,ImU32 col);
@@ -4615,7 +4626,7 @@ CIMGUI_API void ImDrawList_PathLineTo(ImDrawList* self,const ImVec2_c pos);
 CIMGUI_API void ImDrawList_PathLineToMergeDuplicate(ImDrawList* self,const ImVec2_c pos);
 CIMGUI_API void ImDrawList_PathFillConvex(ImDrawList* self,ImU32 col);
 CIMGUI_API void ImDrawList_PathFillConcave(ImDrawList* self,ImU32 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);
 CIMGUI_API void ImDrawList_PathArcTo(ImDrawList* self,const ImVec2_c center,float radius,float a_min,float a_max,int num_segments);
 CIMGUI_API void ImDrawList_PathArcToFast(ImDrawList* self,const ImVec2_c center,float radius,int a_min_of_12,int a_max_of_12);
 CIMGUI_API void ImDrawList_PathEllipticalArcTo(ImDrawList* self,const ImVec2_c center,const ImVec2_c radius,float rot,float a_min,float a_max,int num_segments);
@@ -4693,10 +4704,10 @@ CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryCompressedTTF(ImFontAtlas* self,
 CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryCompressedBase85TTF(ImFontAtlas* self,const char* compressed_font_data_base85,float size_pixels,const ImFontConfig* font_cfg,const ImWchar* glyph_ranges);
 CIMGUI_API void ImFontAtlas_RemoveFont(ImFontAtlas* self,ImFont* font);
 CIMGUI_API void ImFontAtlas_Clear(ImFontAtlas* self);
+CIMGUI_API void ImFontAtlas_ClearFonts(ImFontAtlas* self);
 CIMGUI_API void ImFontAtlas_CompactCache(ImFontAtlas* self);
 CIMGUI_API void ImFontAtlas_SetFontLoader(ImFontAtlas* self,const ImFontLoader* font_loader);
 CIMGUI_API void ImFontAtlas_ClearInputData(ImFontAtlas* self);
-CIMGUI_API void ImFontAtlas_ClearFonts(ImFontAtlas* self);
 CIMGUI_API void ImFontAtlas_ClearTexData(ImFontAtlas* self);
 CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesDefault(ImFontAtlas* self);
 CIMGUI_API ImFontAtlasRectId ImFontAtlas_AddCustomRect(ImFontAtlas* self,int width,int height,ImFontAtlasRect* out_r);
@@ -4875,6 +4886,8 @@ CIMGUI_API bool ImRect_ContainsWithPad(ImRect* self,const ImVec2_c p,const ImVec
 CIMGUI_API bool ImRect_Overlaps(ImRect* self,const ImRect_c r);
 CIMGUI_API void ImRect_Add_Vec2(ImRect* self,const ImVec2_c p);
 CIMGUI_API void ImRect_Add_Rect(ImRect* self,const ImRect_c r);
+CIMGUI_API void ImRect_AddX(ImRect* self,float x);
+CIMGUI_API void ImRect_AddY(ImRect* self,float y);
 CIMGUI_API void ImRect_Expand_Float(ImRect* self,const float amount);
 CIMGUI_API void ImRect_Expand_Vec2(ImRect* self,const ImVec2_c amount);
 CIMGUI_API void ImRect_Translate(ImRect* self,const ImVec2_c d);
@@ -5180,6 +5193,7 @@ CIMGUI_API void igLogToBuffer(int auto_open_depth);
 CIMGUI_API void igLogRenderedText(const ImVec2_c* ref_pos,const char* text,const char* text_end);
 CIMGUI_API void igLogSetNextTextDecoration(const char* prefix,const char* suffix);
 CIMGUI_API bool igBeginChildEx(const char* name,ImGuiID id,const ImVec2_c size_arg,ImGuiChildFlags child_flags,ImGuiWindowFlags window_flags);
+CIMGUI_API ImGuiWindow* igFindFrontMostVisibleChildWindow(ImGuiWindow* window);
 CIMGUI_API bool igBeginPopupEx(ImGuiID id,ImGuiWindowFlags extra_window_flags);
 CIMGUI_API bool igBeginPopupMenuEx(ImGuiID id,const char* label,ImGuiWindowFlags extra_window_flags);
 CIMGUI_API void igOpenPopupEx(ImGuiID id,ImGuiPopupFlags popup_flags);
@@ -5248,7 +5262,7 @@ CIMGUI_API bool igIsActiveIdUsingNavDir(ImGuiDir dir);
 CIMGUI_API ImGuiID igGetKeyOwner(ImGuiKey key);
 CIMGUI_API void igSetKeyOwner(ImGuiKey key,ImGuiID owner_id,ImGuiInputFlags flags);
 CIMGUI_API void igSetKeyOwnersForKeyChord(ImGuiKeyChord key,ImGuiID owner_id,ImGuiInputFlags flags);
-CIMGUI_API void igSetItemKeyOwner_InputFlags(ImGuiKey key,ImGuiInputFlags flags);
+CIMGUI_API bool igSetItemKeyOwner_InputFlags(ImGuiKey key,ImGuiInputFlags flags);
 CIMGUI_API bool igTestKeyOwner(ImGuiKey key,ImGuiID owner_id);
 CIMGUI_API ImGuiKeyOwnerData* igGetKeyOwnerData(ImGuiContext* ctx,ImGuiKey key);
 CIMGUI_API bool igIsKeyDown_ID(ImGuiKey key,ImGuiID owner_id);
@@ -5307,6 +5321,7 @@ CIMGUI_API void igDockBuilderCopyWindowSettings(const char* src_name,const char*
 CIMGUI_API void igDockBuilderFinish(ImGuiID node_id);
 CIMGUI_API void igPushFocusScope(ImGuiID id);
 CIMGUI_API void igPopFocusScope(void);
+CIMGUI_API bool igIsInNavFocusRoute(ImGuiID focus_scope_id);
 CIMGUI_API ImGuiID igGetCurrentFocusScope(void);
 CIMGUI_API bool igIsDragDropActive(void);
 CIMGUI_API bool igBeginDragDropTargetCustom(const ImRect_c bb,ImGuiID id);
@@ -5314,7 +5329,7 @@ CIMGUI_API bool igBeginDragDropTargetViewport(ImGuiViewport* viewport,const ImRe
 CIMGUI_API void igClearDragDrop(void);
 CIMGUI_API bool igIsDragDropPayloadBeingAccepted(void);
 CIMGUI_API void igRenderDragDropTargetRectForItem(const ImRect_c 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);
 CIMGUI_API ImGuiTypingSelectRequest* igGetTypingSelectRequest(ImGuiTypingSelectFlags flags);
 CIMGUI_API int igTypingSelectFindMatch(ImGuiTypingSelectRequest* req,int items_count,const char*(*get_item_name_func)(void*,int),void* user_data,int nav_item_idx);
 CIMGUI_API int igTypingSelectFindNextSingleCharMatch(ImGuiTypingSelectRequest* req,int items_count,const char*(*get_item_name_func)(void*,int),void* user_data,int nav_item_idx);
@@ -5357,6 +5372,7 @@ CIMGUI_API void igTableSetupDrawChannels(ImGuiTable* table);
 CIMGUI_API void igTableUpdateLayout(ImGuiTable* table);
 CIMGUI_API void igTableUpdateBorders(ImGuiTable* table);
 CIMGUI_API void igTableUpdateColumnsWeightFromWidth(ImGuiTable* table);
+CIMGUI_API void igTableApplyExternalUnclipRect(ImGuiTable* table,ImRect* rect);
 CIMGUI_API void igTableDrawBorders(ImGuiTable* table);
 CIMGUI_API void igTableDrawDefaultContextMenu(ImGuiTable* table,ImGuiTableFlags flags_for_section_to_display);
 CIMGUI_API bool igTableBeginContextMenuPopup(ImGuiTable* table);
@@ -5598,6 +5614,7 @@ CIMGUI_API void igImFontAtlasTextureBlockPostProcessMultiply(ImFontAtlasPostProc
 CIMGUI_API void igImFontAtlasTextureBlockFill(ImTextureData* dst_tex,int dst_x,int dst_y,int w,int h,ImU32 col);
 CIMGUI_API void igImFontAtlasTextureBlockCopy(ImTextureData* src_tex,int src_x,int src_y,ImTextureData* dst_tex,int dst_x,int dst_y,int w,int h);
 CIMGUI_API void igImFontAtlasTextureBlockQueueUpload(ImFontAtlas* atlas,ImTextureData* tex,int x,int y,int w,int h);
+CIMGUI_API void igImTextureDataQueueUpload(ImTextureData* tex,int x,int y,int w,int h);
 CIMGUI_API int igImTextureDataGetFormatBytesPerPixel(ImTextureFormat format);
 CIMGUI_API const char* igImTextureDataGetStatusName(ImTextureStatus status);
 CIMGUI_API const char* igImTextureDataGetFormatName(ImTextureFormat format);

cimgui_impl.h

@@ -197,6 +197,8 @@ 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);
@@ -206,7 +208,7 @@ CIMGUI_API VkPresentModeKHR ImGui_ImplVulkanH_SelectPresentMode(VkPhysicalDevice
 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

@@ -229,12 +229,16 @@ 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)
+		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 +297,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 +347,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 +477,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 +748,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
@@ -976,6 +982,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"
@@ -1324,19 +1336,7 @@ 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)
+	M.prtable("np_ret",FP.nP_ret)
-	--M.prtable(typeargs,typeargs_ret,all_type_nP)
-	-- local typeargs2 = {}
-	-- for k,v in pairs(typeargs) do table.insert(typeargs2,k) end
-	-- table.sort(typeargs2)
-	-- print"------------typeargs2----------------"
-	-- M.prtable(typeargs2)
-	
-	-- local typeargs2_ret = {}
-	-- for k,v in pairs(typeargs_ret) do table.insert(typeargs2_ret,k) end
-	-- table.sort(typeargs2_ret)
-	-- print"------------typeargs2_ret----------------"
-	-- M.prtable(typeargs2_ret)
 
 end
 local function header_subs_nonPOD(FP,txt)
@@ -1438,19 +1438,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 +1480,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 +1506,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 +1769,7 @@ function M.Parser()
 	par.skipped = {}
 	par.UDTs = {}
 	par.opaque_structs = {}
+	par.forced_opaque = {}
 	
 	par.save_output = save_output
 	par.genConversors = genConversions
@@ -1760,8 +1780,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)
@@ -1881,11 +1906,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 +1951,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 +1986,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
@@ -2036,7 +2127,7 @@ function M.Parser()
 		--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 +2221,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 +2269,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 +2350,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 +2391,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 +2418,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 +2490,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 +2529,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 +2564,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 +2618,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 +2658,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 +2805,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 +2817,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 +2912,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 +3128,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)
@@ -3380,6 +3462,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 +3506,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 +3588,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 +3608,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,12 @@ 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 = {}
-    
+    for k,v in pairs(defines) do
+		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 +288,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 +459,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 +495,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

@@ -24,8 +24,8 @@
   "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 +88,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

@@ -24,8 +24,8 @@ local t={
   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 +88,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

@@ -489,7 +489,7 @@
       "cimguiname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
       "defaults": {},
       "funcname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
-      "location": "imgui_impl_opengl2:38",
+      "location": "imgui_impl_opengl2:39",
       "ov_cimguiname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
       "ret": "bool",
       "signature": "()",
@@ -506,7 +506,7 @@
       "cimguiname": "ImGui_ImplOpenGL2_DestroyDeviceObjects",
       "defaults": {},
       "funcname": "ImGui_ImplOpenGL2_DestroyDeviceObjects",
-      "location": "imgui_impl_opengl2:39",
+      "location": "imgui_impl_opengl2:40",
       "ov_cimguiname": "ImGui_ImplOpenGL2_DestroyDeviceObjects",
       "ret": "void",
       "signature": "()",
@@ -523,7 +523,7 @@
       "cimguiname": "ImGui_ImplOpenGL2_Init",
       "defaults": {},
       "funcname": "ImGui_ImplOpenGL2_Init",
-      "location": "imgui_impl_opengl2:32",
+      "location": "imgui_impl_opengl2:33",
       "ov_cimguiname": "ImGui_ImplOpenGL2_Init",
       "ret": "bool",
       "signature": "()",
@@ -540,7 +540,7 @@
       "cimguiname": "ImGui_ImplOpenGL2_NewFrame",
       "defaults": {},
       "funcname": "ImGui_ImplOpenGL2_NewFrame",
-      "location": "imgui_impl_opengl2:34",
+      "location": "imgui_impl_opengl2:35",
       "ov_cimguiname": "ImGui_ImplOpenGL2_NewFrame",
       "ret": "void",
       "signature": "()",
@@ -562,7 +562,7 @@
       "cimguiname": "ImGui_ImplOpenGL2_RenderDrawData",
       "defaults": {},
       "funcname": "ImGui_ImplOpenGL2_RenderDrawData",
-      "location": "imgui_impl_opengl2:35",
+      "location": "imgui_impl_opengl2:36",
       "ov_cimguiname": "ImGui_ImplOpenGL2_RenderDrawData",
       "ret": "void",
       "signature": "(ImDrawData*)",
@@ -579,7 +579,7 @@
       "cimguiname": "ImGui_ImplOpenGL2_Shutdown",
       "defaults": {},
       "funcname": "ImGui_ImplOpenGL2_Shutdown",
-      "location": "imgui_impl_opengl2:33",
+      "location": "imgui_impl_opengl2:34",
       "ov_cimguiname": "ImGui_ImplOpenGL2_Shutdown",
       "ret": "void",
       "signature": "()",
@@ -601,7 +601,7 @@
       "cimguiname": "ImGui_ImplOpenGL2_UpdateTexture",
       "defaults": {},
       "funcname": "ImGui_ImplOpenGL2_UpdateTexture",
-      "location": "imgui_impl_opengl2:42",
+      "location": "imgui_impl_opengl2:43",
       "ov_cimguiname": "ImGui_ImplOpenGL2_UpdateTexture",
       "ret": "void",
       "signature": "(ImTextureData*)",
@@ -1363,7 +1363,7 @@
       "cimguiname": "ImGui_ImplVulkanH_CreateOrResizeWindow",
       "defaults": {},
       "funcname": "ImGui_ImplVulkanH_CreateOrResizeWindow",
-      "location": "imgui_impl_vulkan:208",
+      "location": "imgui_impl_vulkan:211",
       "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:212",
       "ov_cimguiname": "ImGui_ImplVulkanH_DestroyWindow",
       "ret": "void",
       "signature": "(VkInstance,VkDevice,ImGui_ImplVulkanH_Window*,const VkAllocationCallbacks*)",
@@ -1419,7 +1419,7 @@
       "cimguiname": "ImGui_ImplVulkanH_GetMinImageCountFromPresentMode",
       "defaults": {},
       "funcname": "ImGui_ImplVulkanH_GetMinImageCountFromPresentMode",
-      "location": "imgui_impl_vulkan:214",
+      "location": "imgui_impl_vulkan:217",
       "ov_cimguiname": "ImGui_ImplVulkanH_GetMinImageCountFromPresentMode",
       "ret": "int",
       "signature": "(VkPresentModeKHR)",
@@ -1441,7 +1441,7 @@
       "cimguiname": "ImGui_ImplVulkanH_GetWindowDataFromViewport",
       "defaults": {},
       "funcname": "ImGui_ImplVulkanH_GetWindowDataFromViewport",
-      "location": "imgui_impl_vulkan:215",
+      "location": "imgui_impl_vulkan:218",
       "ov_cimguiname": "ImGui_ImplVulkanH_GetWindowDataFromViewport",
       "ret": "ImGui_ImplVulkanH_Window*",
       "signature": "(ImGuiViewport*)",
@@ -1463,7 +1463,7 @@
       "cimguiname": "ImGui_ImplVulkanH_SelectPhysicalDevice",
       "defaults": {},
       "funcname": "ImGui_ImplVulkanH_SelectPhysicalDevice",
-      "location": "imgui_impl_vulkan:212",
+      "location": "imgui_impl_vulkan:215",
       "ov_cimguiname": "ImGui_ImplVulkanH_SelectPhysicalDevice",
       "ret": "VkPhysicalDevice",
       "signature": "(VkInstance)",
@@ -1497,7 +1497,7 @@
       "cimguiname": "ImGui_ImplVulkanH_SelectPresentMode",
       "defaults": {},
       "funcname": "ImGui_ImplVulkanH_SelectPresentMode",
-      "location": "imgui_impl_vulkan:211",
+      "location": "imgui_impl_vulkan:214",
       "ov_cimguiname": "ImGui_ImplVulkanH_SelectPresentMode",
       "ret": "VkPresentModeKHR",
       "signature": "(VkPhysicalDevice,VkSurfaceKHR,const VkPresentModeKHR*,int)",
@@ -1519,7 +1519,7 @@
       "cimguiname": "ImGui_ImplVulkanH_SelectQueueFamilyIndex",
       "defaults": {},
       "funcname": "ImGui_ImplVulkanH_SelectQueueFamilyIndex",
-      "location": "imgui_impl_vulkan:213",
+      "location": "imgui_impl_vulkan:216",
       "ov_cimguiname": "ImGui_ImplVulkanH_SelectQueueFamilyIndex",
       "ret": "uint32_t",
       "signature": "(VkPhysicalDevice)",
@@ -1557,7 +1557,7 @@
       "cimguiname": "ImGui_ImplVulkanH_SelectSurfaceFormat",
       "defaults": {},
       "funcname": "ImGui_ImplVulkanH_SelectSurfaceFormat",
-      "location": "imgui_impl_vulkan:210",
+      "location": "imgui_impl_vulkan:213",
       "ov_cimguiname": "ImGui_ImplVulkanH_SelectSurfaceFormat",
       "ret": "VkSurfaceFormatKHR",
       "signature": "(VkPhysicalDevice,VkSurfaceKHR,const VkFormat*,int,VkColorSpaceKHR)",
@@ -1575,7 +1575,7 @@
       "constructor": true,
       "defaults": {},
       "funcname": "ImGui_ImplVulkanH_Window",
-      "location": "imgui_impl_vulkan:260",
+      "location": "imgui_impl_vulkan:263",
       "namespace": "ImGui_ImplVulkanH_Window",
       "ov_cimguiname": "ImGui_ImplVulkanH_Window_ImGui_ImplVulkanH_Window",
       "signature": "()",
@@ -1595,7 +1595,7 @@
       "cimguiname": "ImGui_ImplVulkanH_Window_destroy",
       "defaults": {},
       "destructor": true,
-      "location": "imgui_impl_vulkan:260",
+      "location": "imgui_impl_vulkan:263",
       "ov_cimguiname": "ImGui_ImplVulkanH_Window_destroy",
       "ret": "void",
       "signature": "(ImGui_ImplVulkanH_Window*)",
@@ -1604,12 +1604,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 +1615,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:165",
       "ov_cimguiname": "ImGui_ImplVulkan_AddTexture",
       "ret": "VkDescriptorSet",
-      "signature": "(VkSampler,VkImageView,VkImageLayout)",
+      "signature": "(VkImageView,VkImageLayout)",
       "stname": ""
     }
   ],
@@ -1647,7 +1643,7 @@
       "cimguiname": "ImGui_ImplVulkan_CreateMainPipeline",
       "defaults": {},
       "funcname": "ImGui_ImplVulkan_CreateMainPipeline",
-      "location": "imgui_impl_vulkan:158",
+      "location": "imgui_impl_vulkan:159",
       "ov_cimguiname": "ImGui_ImplVulkan_CreateMainPipeline",
       "ret": "void",
       "signature": "(const ImGui_ImplVulkan_PipelineInfo*)",
@@ -1669,7 +1665,7 @@
       "cimguiname": "ImGui_ImplVulkan_Init",
       "defaults": {},
       "funcname": "ImGui_ImplVulkan_Init",
-      "location": "imgui_impl_vulkan:149",
+      "location": "imgui_impl_vulkan:150",
       "ov_cimguiname": "ImGui_ImplVulkan_Init",
       "ret": "bool",
       "signature": "(ImGui_ImplVulkan_InitInfo*)",
@@ -1701,7 +1697,7 @@
         "user_data": "nullptr"
       },
       "funcname": "ImGui_ImplVulkan_LoadFunctions",
-      "location": "imgui_impl_vulkan:171",
+      "location": "imgui_impl_vulkan:174",
       "ov_cimguiname": "ImGui_ImplVulkan_LoadFunctions",
       "ret": "bool",
       "signature": "(uint32_t,PFN_vkVoidFunction(*loader_func)(const char* function_name,void*,void*)",
@@ -1718,7 +1714,7 @@
       "cimguiname": "ImGui_ImplVulkan_NewFrame",
       "defaults": {},
       "funcname": "ImGui_ImplVulkan_NewFrame",
-      "location": "imgui_impl_vulkan:151",
+      "location": "imgui_impl_vulkan:152",
       "ov_cimguiname": "ImGui_ImplVulkan_NewFrame",
       "ret": "void",
       "signature": "()",
@@ -1740,7 +1736,7 @@
       "cimguiname": "ImGui_ImplVulkan_RemoveTexture",
       "defaults": {},
       "funcname": "ImGui_ImplVulkan_RemoveTexture",
-      "location": "imgui_impl_vulkan:167",
+      "location": "imgui_impl_vulkan:166",
       "ov_cimguiname": "ImGui_ImplVulkan_RemoveTexture",
       "ret": "void",
       "signature": "(VkDescriptorSet)",
@@ -1772,7 +1768,7 @@
         "pipeline": "0ULL"
       },
       "funcname": "ImGui_ImplVulkan_RenderDrawData",
-      "location": "imgui_impl_vulkan:152",
+      "location": "imgui_impl_vulkan:153",
       "ov_cimguiname": "ImGui_ImplVulkan_RenderDrawData",
       "ret": "void",
       "signature": "(ImDrawData*,VkCommandBuffer,VkPipeline)",
@@ -1794,7 +1790,7 @@
       "cimguiname": "ImGui_ImplVulkan_SetMinImageCount",
       "defaults": {},
       "funcname": "ImGui_ImplVulkan_SetMinImageCount",
-      "location": "imgui_impl_vulkan:153",
+      "location": "imgui_impl_vulkan:154",
       "ov_cimguiname": "ImGui_ImplVulkan_SetMinImageCount",
       "ret": "void",
       "signature": "(uint32_t)",
@@ -1811,7 +1807,7 @@
       "cimguiname": "ImGui_ImplVulkan_Shutdown",
       "defaults": {},
       "funcname": "ImGui_ImplVulkan_Shutdown",
-      "location": "imgui_impl_vulkan:150",
+      "location": "imgui_impl_vulkan:151",
       "ov_cimguiname": "ImGui_ImplVulkan_Shutdown",
       "ret": "void",
       "signature": "()",
@@ -1833,7 +1829,7 @@
       "cimguiname": "ImGui_ImplVulkan_UpdateTexture",
       "defaults": {},
       "funcname": "ImGui_ImplVulkan_UpdateTexture",
-      "location": "imgui_impl_vulkan:161",
+      "location": "imgui_impl_vulkan:162",
       "ov_cimguiname": "ImGui_ImplVulkan_UpdateTexture",
       "ret": "void",
       "signature": "(ImTextureData*)",

generator/output/impl_definitions.lua

@@ -418,7 +418,7 @@ local t={
       cimguiname="ImGui_ImplOpenGL2_CreateDeviceObjects",
       defaults={},
       funcname="ImGui_ImplOpenGL2_CreateDeviceObjects",
-      location="imgui_impl_opengl2:38",
+      location="imgui_impl_opengl2:39",
       ov_cimguiname="ImGui_ImplOpenGL2_CreateDeviceObjects",
       ret="bool",
       signature="()",
@@ -434,7 +434,7 @@ local t={
       cimguiname="ImGui_ImplOpenGL2_DestroyDeviceObjects",
       defaults={},
       funcname="ImGui_ImplOpenGL2_DestroyDeviceObjects",
-      location="imgui_impl_opengl2:39",
+      location="imgui_impl_opengl2:40",
       ov_cimguiname="ImGui_ImplOpenGL2_DestroyDeviceObjects",
       ret="void",
       signature="()",
@@ -450,7 +450,7 @@ local t={
       cimguiname="ImGui_ImplOpenGL2_Init",
       defaults={},
       funcname="ImGui_ImplOpenGL2_Init",
-      location="imgui_impl_opengl2:32",
+      location="imgui_impl_opengl2:33",
       ov_cimguiname="ImGui_ImplOpenGL2_Init",
       ret="bool",
       signature="()",
@@ -466,7 +466,7 @@ local t={
       cimguiname="ImGui_ImplOpenGL2_NewFrame",
       defaults={},
       funcname="ImGui_ImplOpenGL2_NewFrame",
-      location="imgui_impl_opengl2:34",
+      location="imgui_impl_opengl2:35",
       ov_cimguiname="ImGui_ImplOpenGL2_NewFrame",
       ret="void",
       signature="()",
@@ -485,7 +485,7 @@ local t={
       cimguiname="ImGui_ImplOpenGL2_RenderDrawData",
       defaults={},
       funcname="ImGui_ImplOpenGL2_RenderDrawData",
-      location="imgui_impl_opengl2:35",
+      location="imgui_impl_opengl2:36",
       ov_cimguiname="ImGui_ImplOpenGL2_RenderDrawData",
       ret="void",
       signature="(ImDrawData*)",
@@ -501,7 +501,7 @@ local t={
       cimguiname="ImGui_ImplOpenGL2_Shutdown",
       defaults={},
       funcname="ImGui_ImplOpenGL2_Shutdown",
-      location="imgui_impl_opengl2:33",
+      location="imgui_impl_opengl2:34",
       ov_cimguiname="ImGui_ImplOpenGL2_Shutdown",
       ret="void",
       signature="()",
@@ -520,7 +520,7 @@ local t={
       cimguiname="ImGui_ImplOpenGL2_UpdateTexture",
       defaults={},
       funcname="ImGui_ImplOpenGL2_UpdateTexture",
-      location="imgui_impl_opengl2:42",
+      location="imgui_impl_opengl2:43",
       ov_cimguiname="ImGui_ImplOpenGL2_UpdateTexture",
       ret="void",
       signature="(ImTextureData*)",
@@ -1179,7 +1179,7 @@ local t={
       cimguiname="ImGui_ImplVulkanH_CreateOrResizeWindow",
       defaults={},
       funcname="ImGui_ImplVulkanH_CreateOrResizeWindow",
-      location="imgui_impl_vulkan:208",
+      location="imgui_impl_vulkan:211",
       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:212",
       ov_cimguiname="ImGui_ImplVulkanH_DestroyWindow",
       ret="void",
       signature="(VkInstance,VkDevice,ImGui_ImplVulkanH_Window*,const VkAllocationCallbacks*)",
@@ -1226,7 +1226,7 @@ local t={
       cimguiname="ImGui_ImplVulkanH_GetMinImageCountFromPresentMode",
       defaults={},
       funcname="ImGui_ImplVulkanH_GetMinImageCountFromPresentMode",
-      location="imgui_impl_vulkan:214",
+      location="imgui_impl_vulkan:217",
       ov_cimguiname="ImGui_ImplVulkanH_GetMinImageCountFromPresentMode",
       ret="int",
       signature="(VkPresentModeKHR)",
@@ -1245,7 +1245,7 @@ local t={
       cimguiname="ImGui_ImplVulkanH_GetWindowDataFromViewport",
       defaults={},
       funcname="ImGui_ImplVulkanH_GetWindowDataFromViewport",
-      location="imgui_impl_vulkan:215",
+      location="imgui_impl_vulkan:218",
       ov_cimguiname="ImGui_ImplVulkanH_GetWindowDataFromViewport",
       ret="ImGui_ImplVulkanH_Window*",
       signature="(ImGuiViewport*)",
@@ -1264,7 +1264,7 @@ local t={
       cimguiname="ImGui_ImplVulkanH_SelectPhysicalDevice",
       defaults={},
       funcname="ImGui_ImplVulkanH_SelectPhysicalDevice",
-      location="imgui_impl_vulkan:212",
+      location="imgui_impl_vulkan:215",
       ov_cimguiname="ImGui_ImplVulkanH_SelectPhysicalDevice",
       ret="VkPhysicalDevice",
       signature="(VkInstance)",
@@ -1292,7 +1292,7 @@ local t={
       cimguiname="ImGui_ImplVulkanH_SelectPresentMode",
       defaults={},
       funcname="ImGui_ImplVulkanH_SelectPresentMode",
-      location="imgui_impl_vulkan:211",
+      location="imgui_impl_vulkan:214",
       ov_cimguiname="ImGui_ImplVulkanH_SelectPresentMode",
       ret="VkPresentModeKHR",
       signature="(VkPhysicalDevice,VkSurfaceKHR,const VkPresentModeKHR*,int)",
@@ -1311,7 +1311,7 @@ local t={
       cimguiname="ImGui_ImplVulkanH_SelectQueueFamilyIndex",
       defaults={},
       funcname="ImGui_ImplVulkanH_SelectQueueFamilyIndex",
-      location="imgui_impl_vulkan:213",
+      location="imgui_impl_vulkan:216",
       ov_cimguiname="ImGui_ImplVulkanH_SelectQueueFamilyIndex",
       ret="uint32_t",
       signature="(VkPhysicalDevice)",
@@ -1342,7 +1342,7 @@ local t={
       cimguiname="ImGui_ImplVulkanH_SelectSurfaceFormat",
       defaults={},
       funcname="ImGui_ImplVulkanH_SelectSurfaceFormat",
-      location="imgui_impl_vulkan:210",
+      location="imgui_impl_vulkan:213",
       ov_cimguiname="ImGui_ImplVulkanH_SelectSurfaceFormat",
       ret="VkSurfaceFormatKHR",
       signature="(VkPhysicalDevice,VkSurfaceKHR,const VkFormat*,int,VkColorSpaceKHR)",
@@ -1359,7 +1359,7 @@ local t={
       constructor=true,
       defaults={},
       funcname="ImGui_ImplVulkanH_Window",
-      location="imgui_impl_vulkan:260",
+      location="imgui_impl_vulkan:263",
       namespace="ImGui_ImplVulkanH_Window",
       ov_cimguiname="ImGui_ImplVulkanH_Window_ImGui_ImplVulkanH_Window",
       signature="()",
@@ -1376,7 +1376,7 @@ local t={
       cimguiname="ImGui_ImplVulkanH_Window_destroy",
       defaults={},
       destructor=true,
-      location="imgui_impl_vulkan:260",
+      location="imgui_impl_vulkan:263",
       ov_cimguiname="ImGui_ImplVulkanH_Window_destroy",
       ret="void",
       signature="(ImGui_ImplVulkanH_Window*)",
@@ -1384,29 +1384,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:165",
       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 +1417,7 @@ local t={
       cimguiname="ImGui_ImplVulkan_CreateMainPipeline",
       defaults={},
       funcname="ImGui_ImplVulkan_CreateMainPipeline",
-      location="imgui_impl_vulkan:158",
+      location="imgui_impl_vulkan:159",
       ov_cimguiname="ImGui_ImplVulkan_CreateMainPipeline",
       ret="void",
       signature="(const ImGui_ImplVulkan_PipelineInfo*)",
@@ -1439,7 +1436,7 @@ local t={
       cimguiname="ImGui_ImplVulkan_Init",
       defaults={},
       funcname="ImGui_ImplVulkan_Init",
-      location="imgui_impl_vulkan:149",
+      location="imgui_impl_vulkan:150",
       ov_cimguiname="ImGui_ImplVulkan_Init",
       ret="bool",
       signature="(ImGui_ImplVulkan_InitInfo*)",
@@ -1465,7 +1462,7 @@ local t={
       defaults={
         user_data="nullptr"},
       funcname="ImGui_ImplVulkan_LoadFunctions",
-      location="imgui_impl_vulkan:171",
+      location="imgui_impl_vulkan:174",
       ov_cimguiname="ImGui_ImplVulkan_LoadFunctions",
       ret="bool",
       signature="(uint32_t,PFN_vkVoidFunction(*loader_func)(const char* function_name,void*,void*)",
@@ -1481,7 +1478,7 @@ local t={
       cimguiname="ImGui_ImplVulkan_NewFrame",
       defaults={},
       funcname="ImGui_ImplVulkan_NewFrame",
-      location="imgui_impl_vulkan:151",
+      location="imgui_impl_vulkan:152",
       ov_cimguiname="ImGui_ImplVulkan_NewFrame",
       ret="void",
       signature="()",
@@ -1500,7 +1497,7 @@ local t={
       cimguiname="ImGui_ImplVulkan_RemoveTexture",
       defaults={},
       funcname="ImGui_ImplVulkan_RemoveTexture",
-      location="imgui_impl_vulkan:167",
+      location="imgui_impl_vulkan:166",
       ov_cimguiname="ImGui_ImplVulkan_RemoveTexture",
       ret="void",
       signature="(VkDescriptorSet)",
@@ -1526,7 +1523,7 @@ local t={
       defaults={
         pipeline="0ULL"},
       funcname="ImGui_ImplVulkan_RenderDrawData",
-      location="imgui_impl_vulkan:152",
+      location="imgui_impl_vulkan:153",
       ov_cimguiname="ImGui_ImplVulkan_RenderDrawData",
       ret="void",
       signature="(ImDrawData*,VkCommandBuffer,VkPipeline)",
@@ -1545,7 +1542,7 @@ local t={
       cimguiname="ImGui_ImplVulkan_SetMinImageCount",
       defaults={},
       funcname="ImGui_ImplVulkan_SetMinImageCount",
-      location="imgui_impl_vulkan:153",
+      location="imgui_impl_vulkan:154",
       ov_cimguiname="ImGui_ImplVulkan_SetMinImageCount",
       ret="void",
       signature="(uint32_t)",
@@ -1561,7 +1558,7 @@ local t={
       cimguiname="ImGui_ImplVulkan_Shutdown",
       defaults={},
       funcname="ImGui_ImplVulkan_Shutdown",
-      location="imgui_impl_vulkan:150",
+      location="imgui_impl_vulkan:151",
       ov_cimguiname="ImGui_ImplVulkan_Shutdown",
       ret="void",
       signature="()",
@@ -1580,7 +1577,7 @@ local t={
       cimguiname="ImGui_ImplVulkan_UpdateTexture",
       defaults={},
       funcname="ImGui_ImplVulkan_UpdateTexture",
-      location="imgui_impl_vulkan:161",
+      location="imgui_impl_vulkan:162",
       ov_cimguiname="ImGui_ImplVulkan_UpdateTexture",
       ret="void",
       signature="(ImTextureData*)",
@@ -1654,7 +1651,7 @@ t.ImGui_ImplVulkanH_SelectQueueFamilyIndex["(VkPhysicalDevice)"]=t.ImGui_ImplVul
 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

@@ -239,8 +239,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)

generator/output/structs_and_enums.json

@@ -6,11 +6,6 @@
         "name": "ImDrawFlags_None",
         "value": "0"
       },
-      {
-        "calc_value": 1,
-        "name": "ImDrawFlags_Closed",
-        "value": "1 << 0"
-      },
       {
         "calc_value": 16,
         "name": "ImDrawFlags_RoundCornersTopLeft",
@@ -36,6 +31,11 @@
         "name": "ImDrawFlags_RoundCornersNone",
         "value": "1 << 8"
       },
+      {
+        "calc_value": 512,
+        "name": "ImDrawFlags_Closed",
+        "value": "1 << 9"
+      },
       {
         "calc_value": 48,
         "name": "ImDrawFlags_RoundCornersTop",
@@ -70,6 +70,11 @@
         "calc_value": 496,
         "name": "ImDrawFlags_RoundCornersMask_",
         "value": "ImDrawFlags_RoundCornersAll | ImDrawFlags_RoundCornersNone"
+      },
+      {
+        "calc_value": 2147483663,
+        "name": "ImDrawFlags_InvalidMask_",
+        "value": "(ImDrawFlags)0x8000000F"
       }
     ],
     "ImDrawListFlags_": [
@@ -163,6 +168,11 @@
         "calc_value": 8,
         "name": "ImFontFlags_LockBakedSizes",
         "value": "1 << 3"
+      },
+      {
+        "calc_value": 16,
+        "name": "ImFontFlags_ImplicitRefSize",
+        "value": "1 << 4"
       }
     ],
     "ImGuiActivateFlags_": [
@@ -545,223 +555,228 @@
       },
       {
         "calc_value": 19,
-        "name": "ImGuiCol_SliderGrab",
+        "name": "ImGuiCol_CheckboxSelectedBg",
         "value": "19"
       },
       {
         "calc_value": 20,
-        "name": "ImGuiCol_SliderGrabActive",
+        "name": "ImGuiCol_SliderGrab",
         "value": "20"
       },
       {
         "calc_value": 21,
-        "name": "ImGuiCol_Button",
+        "name": "ImGuiCol_SliderGrabActive",
         "value": "21"
       },
       {
         "calc_value": 22,
-        "name": "ImGuiCol_ButtonHovered",
+        "name": "ImGuiCol_Button",
         "value": "22"
       },
       {
         "calc_value": 23,
-        "name": "ImGuiCol_ButtonActive",
+        "name": "ImGuiCol_ButtonHovered",
         "value": "23"
       },
       {
         "calc_value": 24,
-        "name": "ImGuiCol_Header",
+        "name": "ImGuiCol_ButtonActive",
         "value": "24"
       },
       {
         "calc_value": 25,
-        "name": "ImGuiCol_HeaderHovered",
+        "name": "ImGuiCol_Header",
         "value": "25"
       },
       {
         "calc_value": 26,
-        "name": "ImGuiCol_HeaderActive",
+        "name": "ImGuiCol_HeaderHovered",
         "value": "26"
       },
       {
         "calc_value": 27,
-        "name": "ImGuiCol_Separator",
+        "name": "ImGuiCol_HeaderActive",
         "value": "27"
       },
       {
         "calc_value": 28,
-        "name": "ImGuiCol_SeparatorHovered",
+        "name": "ImGuiCol_Separator",
         "value": "28"
       },
       {
         "calc_value": 29,
-        "name": "ImGuiCol_SeparatorActive",
+        "name": "ImGuiCol_SeparatorHovered",
         "value": "29"
       },
       {
         "calc_value": 30,
-        "name": "ImGuiCol_ResizeGrip",
+        "name": "ImGuiCol_SeparatorActive",
         "value": "30"
       },
       {
         "calc_value": 31,
-        "name": "ImGuiCol_ResizeGripHovered",
+        "name": "ImGuiCol_ResizeGrip",
         "value": "31"
       },
       {
         "calc_value": 32,
-        "name": "ImGuiCol_ResizeGripActive",
+        "name": "ImGuiCol_ResizeGripHovered",
         "value": "32"
       },
       {
         "calc_value": 33,
-        "name": "ImGuiCol_InputTextCursor",
+        "name": "ImGuiCol_ResizeGripActive",
         "value": "33"
       },
       {
         "calc_value": 34,
-        "name": "ImGuiCol_TabHovered",
+        "name": "ImGuiCol_InputTextCursor",
         "value": "34"
       },
       {
         "calc_value": 35,
-        "name": "ImGuiCol_Tab",
+        "name": "ImGuiCol_TabHovered",
         "value": "35"
       },
       {
         "calc_value": 36,
-        "name": "ImGuiCol_TabSelected",
+        "name": "ImGuiCol_Tab",
         "value": "36"
       },
       {
         "calc_value": 37,
-        "name": "ImGuiCol_TabSelectedOverline",
+        "name": "ImGuiCol_TabSelected",
         "value": "37"
       },
       {
         "calc_value": 38,
-        "name": "ImGuiCol_TabDimmed",
+        "name": "ImGuiCol_TabSelectedOverline",
         "value": "38"
       },
       {
         "calc_value": 39,
-        "name": "ImGuiCol_TabDimmedSelected",
+        "name": "ImGuiCol_TabDimmed",
         "value": "39"
       },
       {
         "calc_value": 40,
-        "name": "ImGuiCol_TabDimmedSelectedOverline",
+        "name": "ImGuiCol_TabDimmedSelected",
         "value": "40"
       },
       {
         "calc_value": 41,
-        "name": "ImGuiCol_DockingPreview",
+        "name": "ImGuiCol_TabDimmedSelectedOverline",
         "value": "41"
       },
       {
         "calc_value": 42,
-        "name": "ImGuiCol_DockingEmptyBg",
+        "name": "ImGuiCol_DockingPreview",
         "value": "42"
       },
       {
         "calc_value": 43,
-        "name": "ImGuiCol_PlotLines",
+        "name": "ImGuiCol_DockingEmptyBg",
         "value": "43"
       },
       {
         "calc_value": 44,
-        "name": "ImGuiCol_PlotLinesHovered",
+        "name": "ImGuiCol_PlotLines",
         "value": "44"
       },
       {
         "calc_value": 45,
-        "name": "ImGuiCol_PlotHistogram",
+        "name": "ImGuiCol_PlotLinesHovered",
         "value": "45"
       },
       {
         "calc_value": 46,
-        "name": "ImGuiCol_PlotHistogramHovered",
+        "name": "ImGuiCol_PlotHistogram",
         "value": "46"
       },
       {
         "calc_value": 47,
-        "name": "ImGuiCol_TableHeaderBg",
+        "name": "ImGuiCol_PlotHistogramHovered",
         "value": "47"
       },
       {
         "calc_value": 48,
-        "name": "ImGuiCol_TableBorderStrong",
+        "name": "ImGuiCol_TableHeaderBg",
         "value": "48"
       },
       {
         "calc_value": 49,
-        "name": "ImGuiCol_TableBorderLight",
+        "name": "ImGuiCol_TableBorderStrong",
         "value": "49"
       },
       {
         "calc_value": 50,
-        "name": "ImGuiCol_TableRowBg",
+        "name": "ImGuiCol_TableBorderLight",
         "value": "50"
       },
       {
         "calc_value": 51,
-        "name": "ImGuiCol_TableRowBgAlt",
+        "name": "ImGuiCol_TableRowBg",
         "value": "51"
       },
       {
         "calc_value": 52,
-        "name": "ImGuiCol_TextLink",
+        "name": "ImGuiCol_TableRowBgAlt",
         "value": "52"
       },
       {
         "calc_value": 53,
-        "name": "ImGuiCol_TextSelectedBg",
+        "name": "ImGuiCol_TextLink",
         "value": "53"
       },
       {
         "calc_value": 54,
-        "name": "ImGuiCol_TreeLines",
+        "name": "ImGuiCol_TextSelectedBg",
         "value": "54"
       },
       {
         "calc_value": 55,
-        "name": "ImGuiCol_DragDropTarget",
+        "name": "ImGuiCol_TreeLines",
         "value": "55"
       },
       {
         "calc_value": 56,
-        "name": "ImGuiCol_DragDropTargetBg",
+        "name": "ImGuiCol_DragDropTarget",
         "value": "56"
       },
       {
         "calc_value": 57,
-        "name": "ImGuiCol_UnsavedMarker",
+        "name": "ImGuiCol_DragDropTargetBg",
         "value": "57"
       },
       {
         "calc_value": 58,
-        "name": "ImGuiCol_NavCursor",
+        "name": "ImGuiCol_UnsavedMarker",
         "value": "58"
       },
       {
         "calc_value": 59,
-        "name": "ImGuiCol_NavWindowingHighlight",
+        "name": "ImGuiCol_NavCursor",
         "value": "59"
       },
       {
         "calc_value": 60,
-        "name": "ImGuiCol_NavWindowingDimBg",
+        "name": "ImGuiCol_NavWindowingHighlight",
         "value": "60"
       },
       {
         "calc_value": 61,
-        "name": "ImGuiCol_ModalWindowDimBg",
+        "name": "ImGuiCol_NavWindowingDimBg",
         "value": "61"
       },
       {
         "calc_value": 62,
-        "name": "ImGuiCol_COUNT",
+        "name": "ImGuiCol_ModalWindowDimBg",
         "value": "62"
+      },
+      {
+        "calc_value": 63,
+        "name": "ImGuiCol_COUNT",
+        "value": "63"
       }
     ],
     "ImGuiColorEditFlags_": [
@@ -2340,6 +2355,11 @@
         "calc_value": 1024,
         "name": "ImGuiItemStatusFlags_HasShortcut",
         "value": "1 << 10"
+      },
+      {
+        "calc_value": 2048,
+        "name": "ImGuiItemStatusFlags_EditedInternal",
+        "value": "1 << 11"
       }
     ],
     "ImGuiKey": [
@@ -4317,43 +4337,48 @@
       },
       {
         "calc_value": 35,
-        "name": "ImGuiStyleVar_ButtonTextAlign",
+        "name": "ImGuiStyleVar_DragDropTargetRounding",
         "value": "35"
       },
       {
         "calc_value": 36,
-        "name": "ImGuiStyleVar_SelectableTextAlign",
+        "name": "ImGuiStyleVar_ButtonTextAlign",
         "value": "36"
       },
       {
         "calc_value": 37,
-        "name": "ImGuiStyleVar_SeparatorSize",
+        "name": "ImGuiStyleVar_SelectableTextAlign",
         "value": "37"
       },
       {
         "calc_value": 38,
-        "name": "ImGuiStyleVar_SeparatorTextBorderSize",
+        "name": "ImGuiStyleVar_SeparatorSize",
         "value": "38"
       },
       {
         "calc_value": 39,
-        "name": "ImGuiStyleVar_SeparatorTextAlign",
+        "name": "ImGuiStyleVar_SeparatorTextBorderSize",
         "value": "39"
       },
       {
         "calc_value": 40,
-        "name": "ImGuiStyleVar_SeparatorTextPadding",
+        "name": "ImGuiStyleVar_SeparatorTextAlign",
         "value": "40"
       },
       {
         "calc_value": 41,
-        "name": "ImGuiStyleVar_DockingSeparatorSize",
+        "name": "ImGuiStyleVar_SeparatorTextPadding",
         "value": "41"
       },
       {
         "calc_value": 42,
-        "name": "ImGuiStyleVar_COUNT",
+        "name": "ImGuiStyleVar_DockingSeparatorSize",
         "value": "42"
+      },
+      {
+        "calc_value": 43,
+        "name": "ImGuiStyleVar_COUNT",
+        "value": "43"
       }
     ],
     "ImGuiTabBarFlagsPrivate_": [
@@ -5443,222 +5468,222 @@
     "ImGuiSortDirection": "ImU8"
   },
   "locations": {
-    "ImBitVector": "imgui_internal:670",
+    "ImBitVector": "imgui_internal:676",
-    "ImColor": "imgui:3100",
+    "ImColor": "imgui:3105",
-    "ImDrawChannel": "imgui:3356",
+    "ImDrawChannel": "imgui:3355",
-    "ImDrawCmd": "imgui:3312",
+    "ImDrawCmd": "imgui:3311",
-    "ImDrawCmdHeader": "imgui:3348",
+    "ImDrawCmdHeader": "imgui:3347",
-    "ImDrawData": "imgui:3577",
+    "ImDrawData": "imgui:3586",
-    "ImDrawDataBuilder": "imgui_internal:898",
+    "ImDrawDataBuilder": "imgui_internal:904",
-    "ImDrawFlags_": "imgui:3381",
+    "ImDrawFlags_": "imgui:3379",
-    "ImDrawList": "imgui:3419",
+    "ImDrawList": "imgui:3418",
-    "ImDrawListFlags_": "imgui:3401",
+    "ImDrawListFlags_": "imgui:3400",
-    "ImDrawListSharedData": "imgui_internal:871",
+    "ImDrawListSharedData": "imgui_internal:877",
-    "ImDrawListSplitter": "imgui:3364",
+    "ImDrawListSplitter": "imgui:3363",
-    "ImDrawTextFlags_": "imgui_internal:443",
+    "ImDrawTextFlags_": "imgui_internal:446",
-    "ImDrawVert": "imgui:3333",
+    "ImDrawVert": "imgui:3332",
-    "ImFont": "imgui:4003",
+    "ImFont": "imgui:4014",
-    "ImFontAtlas": "imgui:3804",
+    "ImFontAtlas": "imgui:3814",
-    "ImFontAtlasBuilder": "imgui_internal:4176",
+    "ImFontAtlasBuilder": "imgui_internal:4191",
-    "ImFontAtlasFlags_": "imgui:3777",
+    "ImFontAtlasFlags_": "imgui:3787",
-    "ImFontAtlasPostProcessData": "imgui_internal:4149",
+    "ImFontAtlasPostProcessData": "imgui_internal:4164",
-    "ImFontAtlasRect": "imgui:3767",
+    "ImFontAtlasRect": "imgui:3777",
-    "ImFontAtlasRectEntry": "imgui_internal:4141",
+    "ImFontAtlasRectEntry": "imgui_internal:4156",
-    "ImFontBaked": "imgui:3955",
+    "ImFontBaked": "imgui:3965",
-    "ImFontConfig": "imgui:3686",
+    "ImFontConfig": "imgui:3696",
-    "ImFontFlags_": "imgui:3990",
+    "ImFontFlags_": "imgui:4000",
-    "ImFontGlyph": "imgui:3729",
+    "ImFontGlyph": "imgui:3739",
-    "ImFontGlyphRangesBuilder": "imgui:3745",
+    "ImFontGlyphRangesBuilder": "imgui:3755",
-    "ImFontLoader": "imgui_internal:4090",
+    "ImFontLoader": "imgui_internal:4105",
-    "ImFontStackData": "imgui_internal:906",
+    "ImFontStackData": "imgui_internal:912",
-    "ImGuiActivateFlags_": "imgui_internal:1706",
+    "ImGuiActivateFlags_": "imgui_internal:1715",
-    "ImGuiAxis": "imgui_internal:1154",
+    "ImGuiAxis": "imgui_internal:1161",
-    "ImGuiBackendFlags_": "imgui:1803",
+    "ImGuiBackendFlags_": "imgui:1804",
-    "ImGuiBoxSelectState": "imgui_internal:1897",
+    "ImGuiBoxSelectState": "imgui_internal:1906",
-    "ImGuiButtonFlagsPrivate_": "imgui_internal:1042",
+    "ImGuiButtonFlagsPrivate_": "imgui_internal:1049",
-    "ImGuiButtonFlags_": "imgui:1951",
+    "ImGuiButtonFlags_": "imgui:1954",
-    "ImGuiChildFlags_": "imgui:1262",
+    "ImGuiChildFlags_": "imgui:1263",
-    "ImGuiCol_": "imgui:1820",
+    "ImGuiCol_": "imgui:1821",
-    "ImGuiColorEditFlags_": "imgui:1963",
+    "ImGuiColorEditFlags_": "imgui:1966",
-    "ImGuiColorMod": "imgui_internal:926",
+    "ImGuiColorMod": "imgui_internal:932",
-    "ImGuiComboFlagsPrivate_": "imgui_internal:1068",
+    "ImGuiComboFlagsPrivate_": "imgui_internal:1075",
-    "ImGuiComboFlags_": "imgui:1424",
+    "ImGuiComboFlags_": "imgui:1425",
-    "ImGuiComboPreviewData": "imgui_internal:1168",
+    "ImGuiComboPreviewData": "imgui_internal:1175",
-    "ImGuiCond_": "imgui:2079",
+    "ImGuiCond_": "imgui:2082",
-    "ImGuiConfigFlags_": "imgui:1775",
+    "ImGuiConfigFlags_": "imgui:1776",
-    "ImGuiContext": "imgui_internal:2386",
+    "ImGuiContext": "imgui_internal:2397",
-    "ImGuiContextHook": "imgui_internal:2369",
+    "ImGuiContextHook": "imgui_internal:2380",
-    "ImGuiContextHookType": "imgui_internal:2367",
+    "ImGuiContextHookType": "imgui_internal:2378",
-    "ImGuiDataAuthority_": "imgui_internal:2010",
+    "ImGuiDataAuthority_": "imgui_internal:2021",
-    "ImGuiDataTypeInfo": "imgui_internal:952",
+    "ImGuiDataTypeInfo": "imgui_internal:958",
-    "ImGuiDataTypePrivate_": "imgui_internal:961",
+    "ImGuiDataTypePrivate_": "imgui_internal:967",
-    "ImGuiDataTypeStorage": "imgui_internal:946",
+    "ImGuiDataTypeStorage": "imgui_internal:952",
-    "ImGuiDataType_": "imgui:1580",
+    "ImGuiDataType_": "imgui:1581",
-    "ImGuiDeactivatedItemData": "imgui_internal:1471",
+    "ImGuiDeactivatedItemData": "imgui_internal:1480",
-    "ImGuiDebugAllocEntry": "imgui_internal:2291",
+    "ImGuiDebugAllocEntry": "imgui_internal:2302",
-    "ImGuiDebugAllocInfo": "imgui_internal:2298",
+    "ImGuiDebugAllocInfo": "imgui_internal:2309",
-    "ImGuiDebugItemPathQuery": "imgui_internal:2338",
+    "ImGuiDebugItemPathQuery": "imgui_internal:2349",
-    "ImGuiDebugLogFlags_": "imgui_internal:2268",
+    "ImGuiDebugLogFlags_": "imgui_internal:2279",
-    "ImGuiDir": "imgui:1598",
+    "ImGuiDir": "imgui:1599",
-    "ImGuiDockContext": "imgui_internal:2113",
+    "ImGuiDockContext": "imgui_internal:2124",
-    "ImGuiDockNode": "imgui_internal:2026",
+    "ImGuiDockNode": "imgui_internal:2037",
-    "ImGuiDockNodeFlagsPrivate_": "imgui_internal:1978",
+    "ImGuiDockNodeFlagsPrivate_": "imgui_internal:1989",
-    "ImGuiDockNodeFlags_": "imgui:1532",
+    "ImGuiDockNodeFlags_": "imgui:1533",
-    "ImGuiDockNodeState": "imgui_internal:2017",
+    "ImGuiDockNodeState": "imgui_internal:2028",
-    "ImGuiDragDropFlags_": "imgui:1551",
+    "ImGuiDragDropFlags_": "imgui:1552",
-    "ImGuiErrorRecoveryState": "imgui_internal:1427",
+    "ImGuiErrorRecoveryState": "imgui_internal:1435",
-    "ImGuiFocusRequestFlags_": "imgui_internal:1114",
+    "ImGuiFocusRequestFlags_": "imgui_internal:1121",
-    "ImGuiFocusScopeData": "imgui_internal:1794",
+    "ImGuiFocusScopeData": "imgui_internal:1803",
-    "ImGuiFocusedFlags_": "imgui:1478",
+    "ImGuiFocusedFlags_": "imgui:1479",
     "ImGuiFreeTypeLoaderFlags_": "imgui_freetype:29",
-    "ImGuiGroupData": "imgui_internal:1181",
+    "ImGuiGroupData": "imgui_internal:1188",
-    "ImGuiHoveredFlagsPrivate_": "imgui_internal:1025",
+    "ImGuiHoveredFlagsPrivate_": "imgui_internal:1032",
-    "ImGuiHoveredFlags_": "imgui:1492",
+    "ImGuiHoveredFlags_": "imgui:1493",
-    "ImGuiIDStackTool": "imgui_internal:2352",
+    "ImGuiIDStackTool": "imgui_internal:2363",
-    "ImGuiIO": "imgui:2486",
+    "ImGuiIO": "imgui:2489",
-    "ImGuiInputEvent": "imgui_internal:1566",
+    "ImGuiInputEvent": "imgui_internal:1575",
-    "ImGuiInputEventAppFocused": "imgui_internal:1564",
+    "ImGuiInputEventAppFocused": "imgui_internal:1573",
-    "ImGuiInputEventKey": "imgui_internal:1562",
+    "ImGuiInputEventKey": "imgui_internal:1571",
-    "ImGuiInputEventMouseButton": "imgui_internal:1560",
+    "ImGuiInputEventMouseButton": "imgui_internal:1569",
-    "ImGuiInputEventMousePos": "imgui_internal:1558",
+    "ImGuiInputEventMousePos": "imgui_internal:1567",
-    "ImGuiInputEventMouseViewport": "imgui_internal:1561",
+    "ImGuiInputEventMouseViewport": "imgui_internal:1570",
-    "ImGuiInputEventMouseWheel": "imgui_internal:1559",
+    "ImGuiInputEventMouseWheel": "imgui_internal:1568",
-    "ImGuiInputEventText": "imgui_internal:1563",
+    "ImGuiInputEventText": "imgui_internal:1572",
-    "ImGuiInputEventType": "imgui_internal:1534",
+    "ImGuiInputEventType": "imgui_internal:1543",
-    "ImGuiInputFlagsPrivate_": "imgui_internal:1633",
+    "ImGuiInputFlagsPrivate_": "imgui_internal:1642",
-    "ImGuiInputFlags_": "imgui:1751",
+    "ImGuiInputFlags_": "imgui:1752",
-    "ImGuiInputSource": "imgui_internal:1547",
+    "ImGuiInputSource": "imgui_internal:1556",
-    "ImGuiInputTextCallbackData": "imgui:2749",
+    "ImGuiInputTextCallbackData": "imgui:2753",
-    "ImGuiInputTextDeactivatedState": "imgui_internal:1218",
+    "ImGuiInputTextDeactivatedState": "imgui_internal:1226",
-    "ImGuiInputTextFlagsPrivate_": "imgui_internal:1033",
+    "ImGuiInputTextFlagsPrivate_": "imgui_internal:1040",
-    "ImGuiInputTextFlags_": "imgui:1297",
+    "ImGuiInputTextFlags_": "imgui:1298",
-    "ImGuiInputTextState": "imgui_internal:1240",
+    "ImGuiInputTextState": "imgui_internal:1248",
-    "ImGuiItemFlagsPrivate_": "imgui_internal:974",
+    "ImGuiItemFlagsPrivate_": "imgui_internal:980",
-    "ImGuiItemFlags_": "imgui:1283",
+    "ImGuiItemFlags_": "imgui:1284",
-    "ImGuiItemStatusFlags_": "imgui_internal:998",
+    "ImGuiItemStatusFlags_": "imgui_internal:1004",
-    "ImGuiKey": "imgui:1622",
+    "ImGuiKey": "imgui:1623",
-    "ImGuiKeyData": "imgui:2478",
+    "ImGuiKeyData": "imgui:2481",
-    "ImGuiKeyOwnerData": "imgui_internal:1620",
+    "ImGuiKeyOwnerData": "imgui_internal:1629",
-    "ImGuiKeyRoutingData": "imgui_internal:1594",
+    "ImGuiKeyRoutingData": "imgui_internal:1603",
-    "ImGuiKeyRoutingTable": "imgui_internal:1608",
+    "ImGuiKeyRoutingTable": "imgui_internal:1617",
-    "ImGuiLastItemData": "imgui_internal:1396",
+    "ImGuiLastItemData": "imgui_internal:1404",
-    "ImGuiLayoutType_": "imgui_internal:1135",
+    "ImGuiLayoutType_": "imgui_internal:1142",
-    "ImGuiListClipper": "imgui:2989",
+    "ImGuiListClipper": "imgui:2994",
-    "ImGuiListClipperData": "imgui_internal:1690",
+    "ImGuiListClipperData": "imgui_internal:1699",
-    "ImGuiListClipperFlags_": "imgui:2963",
+    "ImGuiListClipperFlags_": "imgui:2968",
-    "ImGuiListClipperRange": "imgui_internal:1677",
+    "ImGuiListClipperRange": "imgui_internal:1686",
-    "ImGuiLocEntry": "imgui_internal:2239",
+    "ImGuiLocEntry": "imgui_internal:2250",
-    "ImGuiLocKey": "imgui_internal:2221",
+    "ImGuiLocKey": "imgui_internal:2232",
-    "ImGuiLogFlags_": "imgui_internal:1142",
+    "ImGuiLogFlags_": "imgui_internal:1149",
-    "ImGuiMenuColumns": "imgui_internal:1200",
+    "ImGuiMenuColumns": "imgui_internal:1207",
-    "ImGuiMetricsConfig": "imgui_internal:2308",
+    "ImGuiMetricsConfig": "imgui_internal:2319",
-    "ImGuiMouseButton_": "imgui:2037",
+    "ImGuiMouseButton_": "imgui:2040",
-    "ImGuiMouseCursor_": "imgui:2047",
+    "ImGuiMouseCursor_": "imgui:2050",
-    "ImGuiMouseSource": "imgui:2068",
+    "ImGuiMouseSource": "imgui:2071",
-    "ImGuiMultiSelectFlags_": "imgui:3158",
+    "ImGuiMultiSelectFlags_": "imgui:3163",
-    "ImGuiMultiSelectIO": "imgui:3193",
+    "ImGuiMultiSelectIO": "imgui:3198",
-    "ImGuiMultiSelectState": "imgui_internal:1954",
+    "ImGuiMultiSelectState": "imgui_internal:1965",
-    "ImGuiMultiSelectTempData": "imgui_internal:1929",
+    "ImGuiMultiSelectTempData": "imgui_internal:1939",
-    "ImGuiNavItemData": "imgui_internal:1777",
+    "ImGuiNavItemData": "imgui_internal:1786",
-    "ImGuiNavLayer": "imgui_internal:1769",
+    "ImGuiNavLayer": "imgui_internal:1778",
-    "ImGuiNavMoveFlags_": "imgui_internal:1747",
+    "ImGuiNavMoveFlags_": "imgui_internal:1756",
-    "ImGuiNavRenderCursorFlags_": "imgui_internal:1732",
+    "ImGuiNavRenderCursorFlags_": "imgui_internal:1741",
-    "ImGuiNextItemData": "imgui_internal:1374",
+    "ImGuiNextItemData": "imgui_internal:1382",
-    "ImGuiNextItemDataFlags_": "imgui_internal:1363",
+    "ImGuiNextItemDataFlags_": "imgui_internal:1371",
-    "ImGuiNextWindowData": "imgui_internal:1331",
+    "ImGuiNextWindowData": "imgui_internal:1339",
-    "ImGuiNextWindowDataFlags_": "imgui_internal:1311",
+    "ImGuiNextWindowDataFlags_": "imgui_internal:1319",
-    "ImGuiOldColumnData": "imgui_internal:1862",
+    "ImGuiOldColumnData": "imgui_internal:1871",
-    "ImGuiOldColumnFlags_": "imgui_internal:1842",
+    "ImGuiOldColumnFlags_": "imgui_internal:1851",
-    "ImGuiOldColumns": "imgui_internal:1872",
+    "ImGuiOldColumns": "imgui_internal:1881",
-    "ImGuiOnceUponAFrame": "imgui:2852",
+    "ImGuiOnceUponAFrame": "imgui:2857",
-    "ImGuiPayload": "imgui:2817",
+    "ImGuiPayload": "imgui:2822",
-    "ImGuiPlatformIO": "imgui:4191",
+    "ImGuiPlatformIO": "imgui:4203",
-    "ImGuiPlatformImeData": "imgui:4313",
+    "ImGuiPlatformImeData": "imgui:4331",
-    "ImGuiPlatformMonitor": "imgui:4303",
+    "ImGuiPlatformMonitor": "imgui:4321",
-    "ImGuiPlotType": "imgui_internal:1161",
+    "ImGuiPlotType": "imgui_internal:1168",
-    "ImGuiPopupData": "imgui_internal:1491",
+    "ImGuiPopupData": "imgui_internal:1500",
-    "ImGuiPopupFlags_": "imgui:1387",
+    "ImGuiPopupFlags_": "imgui:1388",
-    "ImGuiPopupPositionPolicy": "imgui_internal:1483",
+    "ImGuiPopupPositionPolicy": "imgui_internal:1492",
-    "ImGuiPtrOrIndex": "imgui_internal:1461",
+    "ImGuiPtrOrIndex": "imgui_internal:1469",
-    "ImGuiScrollFlags_": "imgui_internal:1718",
+    "ImGuiScrollFlags_": "imgui_internal:1727",
-    "ImGuiSelectableFlagsPrivate_": "imgui_internal:1081",
+    "ImGuiSelectableFlagsPrivate_": "imgui_internal:1088",
-    "ImGuiSelectableFlags_": "imgui:1406",
+    "ImGuiSelectableFlags_": "imgui:1407",
-    "ImGuiSelectionBasicStorage": "imgui:3239",
+    "ImGuiSelectionBasicStorage": "imgui:3244",
-    "ImGuiSelectionExternalStorage": "imgui:3262",
+    "ImGuiSelectionExternalStorage": "imgui:3267",
-    "ImGuiSelectionRequest": "imgui:3213",
+    "ImGuiSelectionRequest": "imgui:3218",
-    "ImGuiSelectionRequestType": "imgui:3205",
+    "ImGuiSelectionRequestType": "imgui:3210",
-    "ImGuiSeparatorFlags_": "imgui_internal:1103",
+    "ImGuiSeparatorFlags_": "imgui_internal:1110",
-    "ImGuiSettingsHandler": "imgui_internal:2201",
+    "ImGuiSettingsHandler": "imgui_internal:2212",
-    "ImGuiShrinkWidthItem": "imgui_internal:1454",
+    "ImGuiShrinkWidthItem": "imgui_internal:1462",
-    "ImGuiSizeCallbackData": "imgui:2786",
+    "ImGuiSizeCallbackData": "imgui:2790",
-    "ImGuiSliderFlagsPrivate_": "imgui_internal:1074",
+    "ImGuiSliderFlagsPrivate_": "imgui_internal:1081",
-    "ImGuiSliderFlags_": "imgui:2020",
+    "ImGuiSliderFlags_": "imgui:2023",
-    "ImGuiSortDirection": "imgui:1609",
+    "ImGuiSortDirection": "imgui:1610",
-    "ImGuiStackLevelInfo": "imgui_internal:2327",
+    "ImGuiStackLevelInfo": "imgui_internal:2338",
-    "ImGuiStorage": "imgui:2925",
+    "ImGuiStorage": "imgui:2930",
-    "ImGuiStoragePair": "imgui:2908",
+    "ImGuiStoragePair": "imgui:2913",
-    "ImGuiStyle": "imgui:2366",
+    "ImGuiStyle": "imgui:2369",
-    "ImGuiStyleMod": "imgui_internal:933",
+    "ImGuiStyleMod": "imgui_internal:939",
-    "ImGuiStyleVarInfo": "imgui_internal:917",
+    "ImGuiStyleVarInfo": "imgui_internal:923",
-    "ImGuiStyleVar_": "imgui:1902",
+    "ImGuiStyleVar_": "imgui:1904",
-    "ImGuiTabBar": "imgui_internal:3057",
+    "ImGuiTabBar": "imgui_internal:3069",
-    "ImGuiTabBarFlagsPrivate_": "imgui_internal:3019",
+    "ImGuiTabBarFlagsPrivate_": "imgui_internal:3031",
-    "ImGuiTabBarFlags_": "imgui:1439",
+    "ImGuiTabBarFlags_": "imgui:1440",
-    "ImGuiTabItem": "imgui_internal:3037",
+    "ImGuiTabItem": "imgui_internal:3049",
-    "ImGuiTabItemFlagsPrivate_": "imgui_internal:3027",
+    "ImGuiTabItemFlagsPrivate_": "imgui_internal:3039",
-    "ImGuiTabItemFlags_": "imgui:1463",
+    "ImGuiTabItemFlags_": "imgui:1464",
-    "ImGuiTable": "imgui_internal:3203",
+    "ImGuiTable": "imgui_internal:3215",
-    "ImGuiTableBgTarget_": "imgui:2220",
+    "ImGuiTableBgTarget_": "imgui:2223",
-    "ImGuiTableCellData": "imgui_internal:3171",
+    "ImGuiTableCellData": "imgui_internal:3183",
-    "ImGuiTableColumn": "imgui_internal:3111",
+    "ImGuiTableColumn": "imgui_internal:3123",
-    "ImGuiTableColumnFlags_": "imgui:2167",
+    "ImGuiTableColumnFlags_": "imgui:2170",
-    "ImGuiTableColumnSettings": "imgui_internal:3353",
+    "ImGuiTableColumnSettings": "imgui_internal:3365",
-    "ImGuiTableColumnSortSpecs": "imgui:2242",
+    "ImGuiTableColumnSortSpecs": "imgui:2245",
-    "ImGuiTableFlags_": "imgui:2114",
+    "ImGuiTableFlags_": "imgui:2117",
-    "ImGuiTableHeaderData": "imgui_internal:3180",
+    "ImGuiTableHeaderData": "imgui_internal:3192",
-    "ImGuiTableInstanceData": "imgui_internal:3190",
+    "ImGuiTableInstanceData": "imgui_internal:3202",
-    "ImGuiTableRowFlags_": "imgui:2205",
+    "ImGuiTableRowFlags_": "imgui:2208",
-    "ImGuiTableSettings": "imgui_internal:3377",
+    "ImGuiTableSettings": "imgui_internal:3389",
-    "ImGuiTableSortSpecs": "imgui:2232",
+    "ImGuiTableSortSpecs": "imgui:2235",
-    "ImGuiTableTempData": "imgui_internal:3329",
+    "ImGuiTableTempData": "imgui_internal:3341",
-    "ImGuiTextBuffer": "imgui:2887",
+    "ImGuiTextBuffer": "imgui:2892",
-    "ImGuiTextFilter": "imgui:2860",
+    "ImGuiTextFilter": "imgui:2865",
-    "ImGuiTextFlags_": "imgui_internal:1121",
+    "ImGuiTextFlags_": "imgui_internal:1128",
-    "ImGuiTextIndex": "imgui_internal:823",
+    "ImGuiTextIndex": "imgui_internal:829",
-    "ImGuiTextRange": "imgui:2870",
+    "ImGuiTextRange": "imgui:2875",
-    "ImGuiTooltipFlags_": "imgui_internal:1127",
+    "ImGuiTooltipFlags_": "imgui_internal:1134",
-    "ImGuiTreeNodeFlagsPrivate_": "imgui_internal:1094",
+    "ImGuiTreeNodeFlagsPrivate_": "imgui_internal:1101",
-    "ImGuiTreeNodeFlags_": "imgui:1348",
+    "ImGuiTreeNodeFlags_": "imgui:1349",
-    "ImGuiTreeNodeStackData": "imgui_internal:1415",
+    "ImGuiTreeNodeStackData": "imgui_internal:1423",
-    "ImGuiTypingSelectFlags_": "imgui_internal:1805",
+    "ImGuiTypingSelectFlags_": "imgui_internal:1814",
-    "ImGuiTypingSelectRequest": "imgui_internal:1813",
+    "ImGuiTypingSelectRequest": "imgui_internal:1822",
-    "ImGuiTypingSelectState": "imgui_internal:1824",
+    "ImGuiTypingSelectState": "imgui_internal:1833",
-    "ImGuiViewport": "imgui:4103",
+    "ImGuiViewport": "imgui:4114",
-    "ImGuiViewportFlags_": "imgui:4075",
+    "ImGuiViewportFlags_": "imgui:4086",
-    "ImGuiViewportP": "imgui_internal:2130",
+    "ImGuiViewportP": "imgui_internal:2141",
-    "ImGuiWindow": "imgui_internal:2864",
+    "ImGuiWindow": "imgui_internal:2876",
-    "ImGuiWindowBgClickFlags_": "imgui_internal:1305",
+    "ImGuiWindowBgClickFlags_": "imgui_internal:1313",
-    "ImGuiWindowClass": "imgui:2801",
+    "ImGuiWindowClass": "imgui:2805",
-    "ImGuiWindowDockStyle": "imgui_internal:2108",
+    "ImGuiWindowDockStyle": "imgui_internal:2119",
-    "ImGuiWindowDockStyleCol": "imgui_internal:2093",
+    "ImGuiWindowDockStyleCol": "imgui_internal:2104",
-    "ImGuiWindowFlags_": "imgui:1211",
+    "ImGuiWindowFlags_": "imgui:1212",
-    "ImGuiWindowRefreshFlags_": "imgui_internal:1296",
+    "ImGuiWindowRefreshFlags_": "imgui_internal:1304",
-    "ImGuiWindowSettings": "imgui_internal:2182",
+    "ImGuiWindowSettings": "imgui_internal:2193",
-    "ImGuiWindowStackData": "imgui_internal:1445",
+    "ImGuiWindowStackData": "imgui_internal:1453",
-    "ImGuiWindowTempData": "imgui_internal:2806",
+    "ImGuiWindowTempData": "imgui_internal:2818",
-    "ImRect": "imgui_internal:592",
+    "ImRect": "imgui_internal:596",
-    "ImTextureData": "imgui:3642",
+    "ImTextureData": "imgui:3651",
-    "ImTextureFormat": "imgui:3610",
+    "ImTextureFormat": "imgui:3619",
-    "ImTextureRect": "imgui:3629",
+    "ImTextureRect": "imgui:3638",
     "ImTextureRef": "imgui:372",
-    "ImTextureStatus": "imgui:3617",
+    "ImTextureStatus": "imgui:3626",
-    "ImVec1": "imgui_internal:566",
+    "ImVec1": "imgui_internal:570",
     "ImVec2": "imgui:300",
-    "ImVec2i": "imgui_internal:574",
+    "ImVec2i": "imgui_internal:578",
-    "ImVec2ih": "imgui_internal:582",
+    "ImVec2ih": "imgui_internal:586",
     "ImVec4": "imgui:313",
-    "ImWcharClass": "imgui_internal:455",
+    "ImWcharClass": "imgui_internal:458",
-    "stbrp_context_opaque": "imgui_internal:4173"
+    "stbrp_context_opaque": "imgui_internal:4188"
   },
   "nonPOD": {
     "ImBitArray": true,
@@ -6784,6 +6809,11 @@
         "name": "UnclipRect",
         "type": "ImRect"
       },
+      {
+        "name": "UnclipRects[2]",
+        "size": 2,
+        "type": "ImRect"
+      },
       {
         "name": "BoxSelectRectPrev",
         "type": "ImRect"
@@ -6932,6 +6962,10 @@
         "name": "WithinEndChildID",
         "type": "ImGuiID"
       },
+      {
+        "name": "WithinEndPopupID",
+        "type": "ImGuiID"
+      },
       {
         "name": "TestEngine",
         "type": "void*"
@@ -8398,14 +8432,14 @@
         "name": "SplitAxis",
         "type": "ImGuiAxis"
       },
-      {
-        "name": "WindowClass",
-        "type": "ImGuiWindowClass"
-      },
       {
         "name": "LastBgColor",
         "type": "ImU32"
       },
+      {
+        "name": "WindowClass",
+        "type": "ImGuiWindowClass"
+      },
       {
         "name": "HostWindow",
         "type": "ImGuiWindow*"
@@ -9783,10 +9817,6 @@
         "name": "BackupCursorMaxPos",
         "type": "ImVec2"
       },
-      {
-        "name": "LastSubmittedItem",
-        "type": "ImGuiSelectionUserData"
-      },
       {
         "name": "BoxSelectId",
         "type": "ImGuiID"
@@ -10181,6 +10211,18 @@
         "name": "Renderer_RenderState",
         "type": "void*"
       },
+      {
+        "name": "DrawCallback_ResetRenderState",
+        "type": "ImDrawCallback"
+      },
+      {
+        "name": "DrawCallback_SetSamplerLinear",
+        "type": "ImDrawCallback"
+      },
+      {
+        "name": "DrawCallback_SetSamplerNearest",
+        "type": "ImDrawCallback"
+      },
       {
         "name": "Platform_CreateWindow",
         "type": "void(*)(ImGuiViewport* vp)"
@@ -10827,7 +10869,7 @@
       },
       {
         "name": "Colors[ImGuiCol_COUNT]",
-        "size": 62,
+        "size": 63,
         "type": "ImVec4"
       },
       {
@@ -12122,6 +12164,10 @@
         "name": "PlatformUserData",
         "type": "void*"
       },
+      {
+        "name": "PlatformIconData",
+        "type": "void*"
+      },
       {
         "name": "PlatformHandle",
         "type": "void*"
@@ -12795,6 +12841,10 @@
       {
         "name": "DockingAllowUnclassed",
         "type": "bool"
+      },
+      {
+        "name": "PlatformIconData",
+        "type": "void*"
       }
     ],
     "ImGuiWindowDockStyle": [