Merge branch 'docking_inter'

2026-05-30 21:15:34 +00:00 · 2026-05-30 12:05:39 +02:00
parent d3f0c2f4a7 bbddc623b5
commit d298666861
18 changed files with 5777 additions and 3549 deletions
--- a/README.md
+++ b/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.
--- a/backend_test/example_sdl3_vulkan/main.c
+++ b/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);
--- a/backend_test/example_sdl_vulkan/main.c
+++ b/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);
--- a/cimgui.cpp
+++ b/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

@@ -1725,7 +1725,7 @@ CIMGUI_API void igSetNextItemShortcut(ImGuiKeyChord key_chord,ImGuiInputFlags fl
 {
    return ImGui::SetNextItemShortcut(key_chord,flags);
 }
-CIMGUI_API void igSetItemKeyOwner_Nil(ImGuiKey key)
+CIMGUI_API bool igSetItemKeyOwner_Nil(ImGuiKey key)
 {
    return ImGui::SetItemKeyOwner(key);
 }
@@ -2394,9 +2394,17 @@ CIMGUI_API void ImDrawList_AddLine(ImDrawList* self,const ImVec2_c p1,const ImVe
 {
    return self->AddLine(ConvertToCPP_ImVec2(p1),ConvertToCPP_ImVec2(p2),col,thickness);
 }
-CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2_c p_min,const ImVec2_c p_max,ImU32 col,float rounding,ImDrawFlags flags,float thickness)
+CIMGUI_API void ImDrawList_AddLineH(ImDrawList* self,float min_x,float max_x,float y,ImU32 col,float thickness)
 {
-    return self->AddRect(ConvertToCPP_ImVec2(p_min),ConvertToCPP_ImVec2(p_max),col,rounding,flags,thickness);
+    return self->AddLineH(min_x,max_x,y,col,thickness);
+}
+CIMGUI_API void ImDrawList_AddLineV(ImDrawList* self,float x,float min_y,float max_y,ImU32 col,float thickness)
+{
+    return self->AddLineV(x,min_y,max_y,col,thickness);
+}
+CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2_c p_min,const ImVec2_c p_max,ImU32 col,float rounding,float thickness,ImDrawFlags flags)
+{
+    return self->AddRect(ConvertToCPP_ImVec2(p_min),ConvertToCPP_ImVec2(p_max),col,rounding,thickness,flags);
 }
 CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2_c p_min,const ImVec2_c p_max,ImU32 col,float rounding,ImDrawFlags flags)
 {
@@ -2462,9 +2470,9 @@ CIMGUI_API void ImDrawList_AddBezierQuadratic(ImDrawList* self,const ImVec2_c p1
 {
    return self->AddBezierQuadratic(ConvertToCPP_ImVec2(p1),ConvertToCPP_ImVec2(p2),ConvertToCPP_ImVec2(p3),col,thickness,num_segments);
 }
-CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2_c* points,int num_points,ImU32 col,ImDrawFlags flags,float thickness)
+CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2_c* points,int num_points,ImU32 col,float thickness,ImDrawFlags flags)
 {
-    return self->AddPolyline(reinterpret_cast<const ImVec2*>(points),num_points,col,flags,thickness);
+    return self->AddPolyline(reinterpret_cast<const ImVec2*>(points),num_points,col,thickness,flags);
 }
 CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2_c* points,int num_points,ImU32 col)
 {
@@ -2506,9 +2514,9 @@ CIMGUI_API void ImDrawList_PathFillConcave(ImDrawList* self,ImU32 col)
 {
    return self->PathFillConcave(col);
 }
-CIMGUI_API void ImDrawList_PathStroke(ImDrawList* self,ImU32 col,ImDrawFlags flags,float thickness)
+CIMGUI_API void ImDrawList_PathStroke(ImDrawList* self,ImU32 col,float thickness,ImDrawFlags flags)
 {
-    return self->PathStroke(col,flags,thickness);
+    return self->PathStroke(col,thickness,flags);
 }
 CIMGUI_API void ImDrawList_PathArcTo(ImDrawList* self,const ImVec2_c center,float radius,float a_min,float a_max,int num_segments)
 {
@@ -2818,6 +2826,10 @@ CIMGUI_API void ImFontAtlas_Clear(ImFontAtlas* self)
 {
    return self->Clear();
 }
+CIMGUI_API void ImFontAtlas_ClearFonts(ImFontAtlas* self)
+{
+    return self->ClearFonts();
+}
 CIMGUI_API void ImFontAtlas_CompactCache(ImFontAtlas* self)
 {
    return self->CompactCache();
@@ -2830,10 +2842,6 @@ CIMGUI_API void ImFontAtlas_ClearInputData(ImFontAtlas* self)
 {
    return self->ClearInputData();
 }
-CIMGUI_API void ImFontAtlas_ClearFonts(ImFontAtlas* self)
-{
-    return self->ClearFonts();
-}
 CIMGUI_API void ImFontAtlas_ClearTexData(ImFontAtlas* self)
 {
    return self->ClearTexData();
@@ -3529,6 +3537,14 @@ CIMGUI_API void ImRect_Add_Rect(ImRect* self,const ImRect_c r)
 {
    return self->Add(ConvertToCPP_ImRect(r));
 }
+CIMGUI_API void ImRect_AddX(ImRect* self,float x)
+{
+    return self->AddX(x);
+}
+CIMGUI_API void ImRect_AddY(ImRect* self,float y)
+{
+    return self->AddY(y);
+}
 CIMGUI_API void ImRect_Expand_Float(ImRect* self,const float amount)
 {
    return self->Expand(amount);
@@ -4669,6 +4685,10 @@ CIMGUI_API bool igBeginChildEx(const char* name,ImGuiID id,const ImVec2_c size_a
 {
    return ImGui::BeginChildEx(name,id,ConvertToCPP_ImVec2(size_arg),child_flags,window_flags);
 }
+CIMGUI_API ImGuiWindow* igFindFrontMostVisibleChildWindow(ImGuiWindow* window)
+{
+    return ImGui::FindFrontMostVisibleChildWindow(window);
+}
 CIMGUI_API bool igBeginPopupEx(ImGuiID id,ImGuiWindowFlags extra_window_flags)
 {
    return ImGui::BeginPopupEx(id,extra_window_flags);
@@ -4941,7 +4961,7 @@ CIMGUI_API void igSetKeyOwnersForKeyChord(ImGuiKeyChord key,ImGuiID owner_id,ImG
 {
    return ImGui::SetKeyOwnersForKeyChord(key,owner_id,flags);
 }
-CIMGUI_API void igSetItemKeyOwner_InputFlags(ImGuiKey key,ImGuiInputFlags flags)
+CIMGUI_API bool igSetItemKeyOwner_InputFlags(ImGuiKey key,ImGuiInputFlags flags)
 {
    return ImGui::SetItemKeyOwner(key,flags);
 }
@@ -5009,6 +5029,10 @@ CIMGUI_API void igPopFocusScope()
 {
    return ImGui::PopFocusScope();
 }
+CIMGUI_API bool igIsInNavFocusRoute(ImGuiID focus_scope_id)
+{
+    return ImGui::IsInNavFocusRoute(focus_scope_id);
+}
 CIMGUI_API ImGuiID igGetCurrentFocusScope()
 {
    return ImGui::GetCurrentFocusScope();
@@ -5037,9 +5061,9 @@ CIMGUI_API void igRenderDragDropTargetRectForItem(const ImRect_c bb)
 {
    return ImGui::RenderDragDropTargetRectForItem(ConvertToCPP_ImRect(bb));
 }
-CIMGUI_API void igRenderDragDropTargetRectEx(ImDrawList* draw_list,const ImRect_c bb)
+CIMGUI_API void igRenderDragDropTargetRectEx(ImDrawList* draw_list,const ImRect_c bb,float rounding)
 {
-    return ImGui::RenderDragDropTargetRectEx(draw_list,ConvertToCPP_ImRect(bb));
+    return ImGui::RenderDragDropTargetRectEx(draw_list,ConvertToCPP_ImRect(bb),rounding);
 }
 CIMGUI_API ImGuiTypingSelectRequest* igGetTypingSelectRequest(ImGuiTypingSelectFlags flags)
 {
@@ -5209,6 +5233,10 @@ CIMGUI_API void igTableUpdateColumnsWeightFromWidth(ImGuiTable* table)
 {
    return ImGui::TableUpdateColumnsWeightFromWidth(table);
 }
+CIMGUI_API void igTableApplyExternalUnclipRect(ImGuiTable* table,ImRect* rect)
+{
+    return ImGui::TableApplyExternalUnclipRect(table,*rect);
+}
 CIMGUI_API void igTableDrawBorders(ImGuiTable* table)
 {
    return ImGui::TableDrawBorders(table);
@@ -6150,6 +6178,10 @@ CIMGUI_API void igImFontAtlasTextureBlockQueueUpload(ImFontAtlas* atlas,ImTextur
 {
    return ImFontAtlasTextureBlockQueueUpload(atlas,tex,x,y,w,h);
 }
+CIMGUI_API void igImTextureDataQueueUpload(ImTextureData* tex,int x,int y,int w,int h)
+{
+    return ImTextureDataQueueUpload(tex,x,y,w,h);
+}
 CIMGUI_API int igImTextureDataGetFormatBytesPerPixel(ImTextureFormat format)
 {
    return ImTextureDataGetFormatBytesPerPixel(format);
--- a/cimgui.h
+++ b/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
 #ifndef CIMGUI_INCLUDED
@@ -719,6 +719,7 @@ typedef enum {
    ImGuiCol_ScrollbarGrabHovered,
    ImGuiCol_ScrollbarGrabActive,
    ImGuiCol_CheckMark,
+    ImGuiCol_CheckboxSelectedBg,
    ImGuiCol_SliderGrab,
    ImGuiCol_SliderGrabActive,
    ImGuiCol_Button,
@@ -798,6 +799,7 @@ typedef enum {
    ImGuiStyleVar_TableAngledHeadersTextAlign,
    ImGuiStyleVar_TreeLinesSize,
    ImGuiStyleVar_TreeLinesRounding,
+    ImGuiStyleVar_DragDropTargetRounding,
    ImGuiStyleVar_ButtonTextAlign,
    ImGuiStyleVar_SelectableTextAlign,
    ImGuiStyleVar_SeparatorSize,
@@ -1374,12 +1376,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,
@@ -1387,6 +1389,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,
@@ -1605,6 +1608,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;

@@ -1654,6 +1658,9 @@ struct ImGuiPlatformIO
    int Renderer_TextureMaxWidth;
    int Renderer_TextureMaxHeight;
    void* Renderer_RenderState;
+    ImDrawCallback DrawCallback_ResetRenderState;
+    ImDrawCallback DrawCallback_SetSamplerLinear;
+    ImDrawCallback DrawCallback_SetSamplerNearest;
    ImVector_ImTextureDataPtr Textures;
 };
 struct ImGuiPlatformImeData
@@ -1866,6 +1873,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,
@@ -2457,6 +2465,7 @@ struct ImGuiBoxSelectState
    ImGuiWindow* Window;
    bool UnclipMode;
    ImRect_c UnclipRect;
+    ImRect_c UnclipRects[2];
    ImRect_c BoxSelectRectPrev;
    ImRect_c BoxSelectRectCurr;
 };
@@ -2468,7 +2477,6 @@ struct ImGuiMultiSelectTempData
    ImGuiMultiSelectFlags Flags;
    ImVec2_c ScopeRectMin;
    ImVec2_c BackupCursorMaxPos;
-    ImGuiSelectionUserData LastSubmittedItem;
    ImGuiID BoxSelectId;
    ImGuiKeyChord KeyMods;
    ImS8 LoopRequestSetAll;
@@ -2720,6 +2728,7 @@ struct ImGuiContext
    float CurrentDpiScale;
    ImDrawListSharedData DrawListSharedData;
    ImGuiID WithinEndChildID;
+    ImGuiID WithinEndPopupID;
    void* TestEngine;
    ImVector_ImGuiInputEvent InputEventsQueue;
    ImVector_ImGuiInputEvent InputEventsTrail;
@@ -3551,8 +3560,6 @@ typedef enum {
    ImGuiFreeTypeLoaderFlags_Bitmap = 1 << 9,
 }ImGuiFreeTypeLoaderFlags_;
 #endif
-#define ImDrawCallback_ResetRenderState       (ImDrawCallback)(-8)
-
 #define ImTextureID_Invalid       ((ImTextureID)0)

 #else
@@ -4089,7 +4096,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);
@@ -4257,7 +4264,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);
@@ -4274,7 +4283,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);
@@ -4285,7 +4294,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);
@@ -4363,10 +4372,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);
@@ -4542,6 +4551,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);
@@ -4827,6 +4838,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);
@@ -4895,7 +4907,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);
@@ -4912,6 +4924,7 @@ CIMGUI_API bool igTestShortcutRouting(ImGuiKeyChord key_chord,ImGuiID owner_id);
 CIMGUI_API ImGuiKeyRoutingData* igGetShortcutRoutingData(ImGuiKeyChord key_chord);
 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);
@@ -4919,7 +4932,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);
@@ -4962,6 +4975,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);
@@ -5198,6 +5212,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);
--- a/cimgui_impl.h
+++ b/cimgui_impl.h
@@ -196,6 +196,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);
@@ -204,7 +206,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);
--- a/generator/cpp2ffi.lua
+++ b/generator/cpp2ffi.lua
--- a/generator/generator.lua
+++ b/generator/generator.lua
@@ -120,10 +120,13 @@ local save_data = cpp2ffi.save_data
 local copyfile = cpp2ffi.copyfile
 local serializeTableF = cpp2ffi.serializeTableF

-local function func_header_impl_generate(FP)
+local function func_header_impl_generate(FP, defines)

    local outtab = {}
-    
+	--may be key sorting is not enough and declaration order needed 
+    cpp2ffi.table_do_sorted(defines, function(k,v)
+		table.insert(outtab,"#define "..k.." "..v.."\n")
+	end)
    -- for _,t in ipairs(FP.funcdefs) do
        -- if t.cimguiname then
            -- local cimf = FP.defsT[t.cimguiname]
@@ -286,6 +289,7 @@ local function cimgui_generation(parser)
 	

 	local  tdt = parser:generate_templates()
+	cpp2ffi.prtable("generate_templates",tdt)
 	local cstructsstr = outpre..tdt..outpost 
    
 	if gdefines.IMGUI_HAS_DOCK then
@@ -379,16 +383,15 @@ end
 local function parseImGuiHeader(header,names)
 	--prepare parser
 	local parser = cpp2ffi.Parser()
-	
+	parser.modulename = "cimgui"
 	parser.getCname = function(stname,funcname,namespace)
 		local pre = (stname == "") and (namespace and (namespace=="ImGui" and "ig" or namespace.."_") or "ig") or stname.."_"
 		return pre..funcname
 	end
 	parser.cname_overloads = cimgui_overloads
-	--parser.manuals = cimgui_manuals
 	parser:set_manuals(cimgui_manuals, "cimgui")
 	parser.skipped = cimgui_skipped
-	parser.UDTs = {"ImVec2","ImVec4","ImColor","ImRect"}
+	--parser.UDTs = {"ImVec2","ImVec4","ImColor","ImRect"}
 	--parser.gen_template_typedef = gen_template_typedef --use auto
 	parser.COMMENTS_GENERATION = COMMENTS_GENERATION
 	parser.CONSTRUCTORS_GENERATION = CONSTRUCTORS_GENERATION
@@ -457,7 +460,11 @@ if ff then
 else
 	backends_folder = IMGUI_PATH .. "/backends/"
 end
- 
+local function getCname(stname,funcname, namespace)
+		if #stname == 0 then return funcname end --top level
+		local pre = stname.."_"
+		return pre..funcname
+	end
 local parser2

 if #implementations > 0 then
@@ -489,13 +496,15 @@ if #implementations > 0 then
 			end
 		end
 		parser2.cimgui_inherited =  dofile([[./output/structs_and_enums.lua]])
+		parser2.getCname = getCname
 		local defines = parser2:take_lines(CPRE..extra_defines..extra_includes..source, {locati}, COMPILER)
-		
+
 		local parser3 = cpp2ffi.Parser()
+		parser3.getCname = getCname
 		parser3.cimgui_inherited =  dofile([[./output/structs_and_enums.lua]])
-		parser3:take_lines(CPRE..extra_defines..extra_includes..source, {locati}, COMPILER)
+		local defines = parser3:take_lines(CPRE..extra_defines..extra_includes..source, {locati}, COMPILER)
 		parser3:do_parse()
-		local cfuncsstr = func_header_impl_generate(parser3) 
+		local cfuncsstr = func_header_impl_generate(parser3, defines) 
 		local cstructstr1,cstructstr2 = parser3.structs_and_enums[1], parser3.structs_and_enums[2]
 		local cstru = cstructstr1 .. cstructstr2
 		if cstru ~="" then
@@ -547,9 +556,5 @@ if parser2 then
    save_data("./output/impl_definitions.json",json.encode(json_prepare(parser2.defsT),{dict_on_empty={defaults=true}}))
 end
 --]]
-------------------copy C files to repo root
-copyfile("./output/cimgui.h", "../cimgui.h")
-copyfile("./output/cimgui.cpp", "../cimgui.cpp")
-os.remove("./output/cimgui.h")
-os.remove("./output/cimgui.cpp")
+
 print"all done!!"
--- a/generator/output/constants.json
+++ b/generator/output/constants.json
@@ -19,8 +19,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_NUM": "19270",
+  "IMGUI_VERSION": "\"1.92.8\"",
+  "IMGUI_VERSION_NUM": "19280",
  "IMGUI_WINDOW_HARD_MIN_SIZE": "4.0f",
  "IMSTB_TEXTEDIT_CHARTYPE": "char",
  "IMSTB_TEXTEDIT_GETWIDTH_NEWLINE": "(-1.0f)",
@@ -83,7 +83,6 @@
  "ImAtof(STR)": "atof(STR)",
  "ImCeil(X)": "ceilf(X)",
  "ImCos(X)": "cosf(X)",
-  "ImDrawCallback_ResetRenderState": "(ImDrawCallback)(-8)",
  "ImFabs(X)": "fabsf(X)",
  "ImFmod(X,Y)": "fmodf((X), (Y))",
  "ImFontAtlasRectId_GenerationMask_": "(0x3FF00000)",
--- a/generator/output/constants.lua
+++ b/generator/output/constants.lua
@@ -19,8 +19,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_NUM="19270",
+  IMGUI_VERSION="\"1.92.8\"",
+  IMGUI_VERSION_NUM="19280",
  IMGUI_WINDOW_HARD_MIN_SIZE="4.0f",
  IMSTB_TEXTEDIT_CHARTYPE="char",
  IMSTB_TEXTEDIT_GETWIDTH_NEWLINE="(-1.0f)",
@@ -83,7 +83,6 @@ local t={
  ["ImAtof(STR)"]="atof(STR)",
  ["ImCeil(X)"]="ceilf(X)",
  ["ImCos(X)"]="cosf(X)",
-  ImDrawCallback_ResetRenderState="(ImDrawCallback)(-8)",
  ["ImFabs(X)"]="fabsf(X)",
  ["ImFmod(X,Y)"]="fmodf((X), (Y))",
  ImFontAtlasRectId_GenerationMask_="(0x3FF00000)",
--- a/generator/output/definitions.json
+++ b/generator/output/definitions.json
--- a/generator/output/definitions.lua
+++ b/generator/output/definitions.lua
--- a/generator/output/impl_definitions.json
+++ b/generator/output/impl_definitions.json
@@ -489,7 +489,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
-      "location": "imgui_impl_opengl2:37",
+      "location": "imgui_impl_opengl2:38",
      "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:38",
+      "location": "imgui_impl_opengl2:39",
      "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:31",
+      "location": "imgui_impl_opengl2:32",
      "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:33",
+      "location": "imgui_impl_opengl2:34",
      "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:34",
+      "location": "imgui_impl_opengl2:35",
      "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:32",
+      "location": "imgui_impl_opengl2:33",
      "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:41",
+      "location": "imgui_impl_opengl2:42",
      "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:200",
+      "location": "imgui_impl_vulkan:203",
      "ov_cimguiname": "ImGui_ImplVulkanH_CreateOrResizeWindow",
      "ret": "void",
      "signature": "(VkInstance,VkPhysicalDevice,VkDevice,ImGui_ImplVulkanH_Window*,uint32_t,const VkAllocationCallbacks*,int,int,uint32_t,VkImageUsageFlags)",
@@ -1397,7 +1397,7 @@
      "cimguiname": "ImGui_ImplVulkanH_DestroyWindow",
      "defaults": {},
      "funcname": "ImGui_ImplVulkanH_DestroyWindow",
-      "location": "imgui_impl_vulkan:201",
+      "location": "imgui_impl_vulkan:204",
      "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:206",
+      "location": "imgui_impl_vulkan:209",
      "ov_cimguiname": "ImGui_ImplVulkanH_GetMinImageCountFromPresentMode",
      "ret": "int",
      "signature": "(VkPresentModeKHR)",
@@ -1441,7 +1441,7 @@
      "cimguiname": "ImGui_ImplVulkanH_SelectPhysicalDevice",
      "defaults": {},
      "funcname": "ImGui_ImplVulkanH_SelectPhysicalDevice",
-      "location": "imgui_impl_vulkan:204",
+      "location": "imgui_impl_vulkan:207",
      "ov_cimguiname": "ImGui_ImplVulkanH_SelectPhysicalDevice",
      "ret": "VkPhysicalDevice",
      "signature": "(VkInstance)",
@@ -1475,7 +1475,7 @@
      "cimguiname": "ImGui_ImplVulkanH_SelectPresentMode",
      "defaults": {},
      "funcname": "ImGui_ImplVulkanH_SelectPresentMode",
-      "location": "imgui_impl_vulkan:203",
+      "location": "imgui_impl_vulkan:206",
      "ov_cimguiname": "ImGui_ImplVulkanH_SelectPresentMode",
      "ret": "VkPresentModeKHR",
      "signature": "(VkPhysicalDevice,VkSurfaceKHR,const VkPresentModeKHR*,int)",
@@ -1497,7 +1497,7 @@
      "cimguiname": "ImGui_ImplVulkanH_SelectQueueFamilyIndex",
      "defaults": {},
      "funcname": "ImGui_ImplVulkanH_SelectQueueFamilyIndex",
-      "location": "imgui_impl_vulkan:205",
+      "location": "imgui_impl_vulkan:208",
      "ov_cimguiname": "ImGui_ImplVulkanH_SelectQueueFamilyIndex",
      "ret": "uint32_t",
      "signature": "(VkPhysicalDevice)",
@@ -1535,7 +1535,7 @@
      "cimguiname": "ImGui_ImplVulkanH_SelectSurfaceFormat",
      "defaults": {},
      "funcname": "ImGui_ImplVulkanH_SelectSurfaceFormat",
-      "location": "imgui_impl_vulkan:202",
+      "location": "imgui_impl_vulkan:205",
      "ov_cimguiname": "ImGui_ImplVulkanH_SelectSurfaceFormat",
      "ret": "VkSurfaceFormatKHR",
      "signature": "(VkPhysicalDevice,VkSurfaceKHR,const VkFormat*,int,VkColorSpaceKHR)",
@@ -1553,7 +1553,8 @@
      "constructor": true,
      "defaults": {},
      "funcname": "ImGui_ImplVulkanH_Window",
-      "location": "imgui_impl_vulkan:252",
+      "location": "imgui_impl_vulkan:255",
+      "namespace": "ImGui_ImplVulkanH_Window",
      "ov_cimguiname": "ImGui_ImplVulkanH_Window_ImGui_ImplVulkanH_Window",
      "signature": "()",
      "stname": "ImGui_ImplVulkanH_Window"
@@ -1572,7 +1573,7 @@
      "cimguiname": "ImGui_ImplVulkanH_Window_destroy",
      "defaults": {},
      "destructor": true,
-      "location": "imgui_impl_vulkan:252",
+      "location": "imgui_impl_vulkan:255",
      "ov_cimguiname": "ImGui_ImplVulkanH_Window_destroy",
      "ret": "void",
      "signature": "(ImGui_ImplVulkanH_Window*)",
@@ -1581,12 +1582,8 @@
  ],
  "ImGui_ImplVulkan_AddTexture": [
    {
-      "args": "(VkSampler sampler,VkImageView image_view,VkImageLayout image_layout)",
+      "args": "(VkImageView image_view,VkImageLayout image_layout)",
      "argsT": [
-        {
-          "name": "sampler",
-          "type": "VkSampler"
-        },
        {
          "name": "image_view",
          "type": "VkImageView"
@@ -1596,16 +1593,16 @@
          "type": "VkImageLayout"
        }
      ],
-      "argsoriginal": "(VkSampler sampler,VkImageView image_view,VkImageLayout image_layout)",
-      "call_args": "(sampler,image_view,image_layout)",
-      "call_args_old": "(sampler,image_view,image_layout)",
+      "argsoriginal": "(VkImageView image_view,VkImageLayout image_layout)",
+      "call_args": "(image_view,image_layout)",
+      "call_args_old": "(image_view,image_layout)",
      "cimguiname": "ImGui_ImplVulkan_AddTexture",
      "defaults": {},
      "funcname": "ImGui_ImplVulkan_AddTexture",
-      "location": "imgui_impl_vulkan:158",
+      "location": "imgui_impl_vulkan:157",
      "ov_cimguiname": "ImGui_ImplVulkan_AddTexture",
      "ret": "VkDescriptorSet",
-      "signature": "(VkSampler,VkImageView,VkImageLayout)",
+      "signature": "(VkImageView,VkImageLayout)",
      "stname": ""
    }
  ],
@@ -1624,7 +1621,7 @@
      "cimguiname": "ImGui_ImplVulkan_CreateMainPipeline",
      "defaults": {},
      "funcname": "ImGui_ImplVulkan_CreateMainPipeline",
-      "location": "imgui_impl_vulkan:150",
+      "location": "imgui_impl_vulkan:151",
      "ov_cimguiname": "ImGui_ImplVulkan_CreateMainPipeline",
      "ret": "void",
      "signature": "(const ImGui_ImplVulkan_PipelineInfo*)",
@@ -1646,7 +1643,7 @@
      "cimguiname": "ImGui_ImplVulkan_Init",
      "defaults": {},
      "funcname": "ImGui_ImplVulkan_Init",
-      "location": "imgui_impl_vulkan:141",
+      "location": "imgui_impl_vulkan:142",
      "ov_cimguiname": "ImGui_ImplVulkan_Init",
      "ret": "bool",
      "signature": "(ImGui_ImplVulkan_InitInfo*)",
@@ -1678,7 +1675,7 @@
        "user_data": "nullptr"
      },
      "funcname": "ImGui_ImplVulkan_LoadFunctions",
-      "location": "imgui_impl_vulkan:163",
+      "location": "imgui_impl_vulkan:166",
      "ov_cimguiname": "ImGui_ImplVulkan_LoadFunctions",
      "ret": "bool",
      "signature": "(uint32_t,PFN_vkVoidFunction(*loader_func)(const char* function_name,void*,void*)",
@@ -1695,7 +1692,7 @@
      "cimguiname": "ImGui_ImplVulkan_NewFrame",
      "defaults": {},
      "funcname": "ImGui_ImplVulkan_NewFrame",
-      "location": "imgui_impl_vulkan:143",
+      "location": "imgui_impl_vulkan:144",
      "ov_cimguiname": "ImGui_ImplVulkan_NewFrame",
      "ret": "void",
      "signature": "()",
@@ -1717,7 +1714,7 @@
      "cimguiname": "ImGui_ImplVulkan_RemoveTexture",
      "defaults": {},
      "funcname": "ImGui_ImplVulkan_RemoveTexture",
-      "location": "imgui_impl_vulkan:159",
+      "location": "imgui_impl_vulkan:158",
      "ov_cimguiname": "ImGui_ImplVulkan_RemoveTexture",
      "ret": "void",
      "signature": "(VkDescriptorSet)",
@@ -1749,7 +1746,7 @@
        "pipeline": "0ULL"
      },
      "funcname": "ImGui_ImplVulkan_RenderDrawData",
-      "location": "imgui_impl_vulkan:144",
+      "location": "imgui_impl_vulkan:145",
      "ov_cimguiname": "ImGui_ImplVulkan_RenderDrawData",
      "ret": "void",
      "signature": "(ImDrawData*,VkCommandBuffer,VkPipeline)",
@@ -1771,7 +1768,7 @@
      "cimguiname": "ImGui_ImplVulkan_SetMinImageCount",
      "defaults": {},
      "funcname": "ImGui_ImplVulkan_SetMinImageCount",
-      "location": "imgui_impl_vulkan:145",
+      "location": "imgui_impl_vulkan:146",
      "ov_cimguiname": "ImGui_ImplVulkan_SetMinImageCount",
      "ret": "void",
      "signature": "(uint32_t)",
@@ -1788,7 +1785,7 @@
      "cimguiname": "ImGui_ImplVulkan_Shutdown",
      "defaults": {},
      "funcname": "ImGui_ImplVulkan_Shutdown",
-      "location": "imgui_impl_vulkan:142",
+      "location": "imgui_impl_vulkan:143",
      "ov_cimguiname": "ImGui_ImplVulkan_Shutdown",
      "ret": "void",
      "signature": "()",
@@ -1810,7 +1807,7 @@
      "cimguiname": "ImGui_ImplVulkan_UpdateTexture",
      "defaults": {},
      "funcname": "ImGui_ImplVulkan_UpdateTexture",
-      "location": "imgui_impl_vulkan:153",
+      "location": "imgui_impl_vulkan:154",
      "ov_cimguiname": "ImGui_ImplVulkan_UpdateTexture",
      "ret": "void",
      "signature": "(ImTextureData*)",
--- a/generator/output/impl_definitions.lua
+++ b/generator/output/impl_definitions.lua
@@ -418,7 +418,7 @@ local t={
      cimguiname="ImGui_ImplOpenGL2_CreateDeviceObjects",
      defaults={},
      funcname="ImGui_ImplOpenGL2_CreateDeviceObjects",
-      location="imgui_impl_opengl2:37",
+      location="imgui_impl_opengl2:38",
      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:38",
+      location="imgui_impl_opengl2:39",
      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:31",
+      location="imgui_impl_opengl2:32",
      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:33",
+      location="imgui_impl_opengl2:34",
      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:34",
+      location="imgui_impl_opengl2:35",
      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:32",
+      location="imgui_impl_opengl2:33",
      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:41",
+      location="imgui_impl_opengl2:42",
      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:200",
+      location="imgui_impl_vulkan:203",
      ov_cimguiname="ImGui_ImplVulkanH_CreateOrResizeWindow",
      ret="void",
      signature="(VkInstance,VkPhysicalDevice,VkDevice,ImGui_ImplVulkanH_Window*,uint32_t,const VkAllocationCallbacks*,int,int,uint32_t,VkImageUsageFlags)",
@@ -1207,7 +1207,7 @@ local t={
      cimguiname="ImGui_ImplVulkanH_DestroyWindow",
      defaults={},
      funcname="ImGui_ImplVulkanH_DestroyWindow",
-      location="imgui_impl_vulkan:201",
+      location="imgui_impl_vulkan:204",
      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:206",
+      location="imgui_impl_vulkan:209",
      ov_cimguiname="ImGui_ImplVulkanH_GetMinImageCountFromPresentMode",
      ret="int",
      signature="(VkPresentModeKHR)",
@@ -1245,7 +1245,7 @@ local t={
      cimguiname="ImGui_ImplVulkanH_SelectPhysicalDevice",
      defaults={},
      funcname="ImGui_ImplVulkanH_SelectPhysicalDevice",
-      location="imgui_impl_vulkan:204",
+      location="imgui_impl_vulkan:207",
      ov_cimguiname="ImGui_ImplVulkanH_SelectPhysicalDevice",
      ret="VkPhysicalDevice",
      signature="(VkInstance)",
@@ -1273,7 +1273,7 @@ local t={
      cimguiname="ImGui_ImplVulkanH_SelectPresentMode",
      defaults={},
      funcname="ImGui_ImplVulkanH_SelectPresentMode",
-      location="imgui_impl_vulkan:203",
+      location="imgui_impl_vulkan:206",
      ov_cimguiname="ImGui_ImplVulkanH_SelectPresentMode",
      ret="VkPresentModeKHR",
      signature="(VkPhysicalDevice,VkSurfaceKHR,const VkPresentModeKHR*,int)",
@@ -1292,7 +1292,7 @@ local t={
      cimguiname="ImGui_ImplVulkanH_SelectQueueFamilyIndex",
      defaults={},
      funcname="ImGui_ImplVulkanH_SelectQueueFamilyIndex",
-      location="imgui_impl_vulkan:205",
+      location="imgui_impl_vulkan:208",
      ov_cimguiname="ImGui_ImplVulkanH_SelectQueueFamilyIndex",
      ret="uint32_t",
      signature="(VkPhysicalDevice)",
@@ -1323,7 +1323,7 @@ local t={
      cimguiname="ImGui_ImplVulkanH_SelectSurfaceFormat",
      defaults={},
      funcname="ImGui_ImplVulkanH_SelectSurfaceFormat",
-      location="imgui_impl_vulkan:202",
+      location="imgui_impl_vulkan:205",
      ov_cimguiname="ImGui_ImplVulkanH_SelectSurfaceFormat",
      ret="VkSurfaceFormatKHR",
      signature="(VkPhysicalDevice,VkSurfaceKHR,const VkFormat*,int,VkColorSpaceKHR)",
@@ -1340,7 +1340,8 @@ local t={
      constructor=true,
      defaults={},
      funcname="ImGui_ImplVulkanH_Window",
-      location="imgui_impl_vulkan:252",
+      location="imgui_impl_vulkan:255",
+      namespace="ImGui_ImplVulkanH_Window",
      ov_cimguiname="ImGui_ImplVulkanH_Window_ImGui_ImplVulkanH_Window",
      signature="()",
      stname="ImGui_ImplVulkanH_Window"},
@@ -1356,7 +1357,7 @@ local t={
      cimguiname="ImGui_ImplVulkanH_Window_destroy",
      defaults={},
      destructor=true,
-      location="imgui_impl_vulkan:252",
+      location="imgui_impl_vulkan:255",
      ov_cimguiname="ImGui_ImplVulkanH_Window_destroy",
      ret="void",
      signature="(ImGui_ImplVulkanH_Window*)",
@@ -1364,29 +1365,26 @@ local t={
    ["(ImGui_ImplVulkanH_Window*)"]=nil},
  ImGui_ImplVulkan_AddTexture={
    [1]={
-      args="(VkSampler sampler,VkImageView image_view,VkImageLayout image_layout)",
+      args="(VkImageView image_view,VkImageLayout image_layout)",
      argsT={
        [1]={
-          name="sampler",
-          type="VkSampler"},
-        [2]={
          name="image_view",
          type="VkImageView"},
-        [3]={
+        [2]={
          name="image_layout",
          type="VkImageLayout"}},
-      argsoriginal="(VkSampler sampler,VkImageView image_view,VkImageLayout image_layout)",
-      call_args="(sampler,image_view,image_layout)",
-      call_args_old="(sampler,image_view,image_layout)",
+      argsoriginal="(VkImageView image_view,VkImageLayout image_layout)",
+      call_args="(image_view,image_layout)",
+      call_args_old="(image_view,image_layout)",
      cimguiname="ImGui_ImplVulkan_AddTexture",
      defaults={},
      funcname="ImGui_ImplVulkan_AddTexture",
-      location="imgui_impl_vulkan:158",
+      location="imgui_impl_vulkan:157",
      ov_cimguiname="ImGui_ImplVulkan_AddTexture",
      ret="VkDescriptorSet",
-      signature="(VkSampler,VkImageView,VkImageLayout)",
+      signature="(VkImageView,VkImageLayout)",
      stname=""},
-    ["(VkSampler,VkImageView,VkImageLayout)"]=nil},
+    ["(VkImageView,VkImageLayout)"]=nil},
  ImGui_ImplVulkan_CreateMainPipeline={
    [1]={
      args="(const ImGui_ImplVulkan_PipelineInfo* info)",
@@ -1400,7 +1398,7 @@ local t={
      cimguiname="ImGui_ImplVulkan_CreateMainPipeline",
      defaults={},
      funcname="ImGui_ImplVulkan_CreateMainPipeline",
-      location="imgui_impl_vulkan:150",
+      location="imgui_impl_vulkan:151",
      ov_cimguiname="ImGui_ImplVulkan_CreateMainPipeline",
      ret="void",
      signature="(const ImGui_ImplVulkan_PipelineInfo*)",
@@ -1419,7 +1417,7 @@ local t={
      cimguiname="ImGui_ImplVulkan_Init",
      defaults={},
      funcname="ImGui_ImplVulkan_Init",
-      location="imgui_impl_vulkan:141",
+      location="imgui_impl_vulkan:142",
      ov_cimguiname="ImGui_ImplVulkan_Init",
      ret="bool",
      signature="(ImGui_ImplVulkan_InitInfo*)",
@@ -1445,7 +1443,7 @@ local t={
      defaults={
        user_data="nullptr"},
      funcname="ImGui_ImplVulkan_LoadFunctions",
-      location="imgui_impl_vulkan:163",
+      location="imgui_impl_vulkan:166",
      ov_cimguiname="ImGui_ImplVulkan_LoadFunctions",
      ret="bool",
      signature="(uint32_t,PFN_vkVoidFunction(*loader_func)(const char* function_name,void*,void*)",
@@ -1461,7 +1459,7 @@ local t={
      cimguiname="ImGui_ImplVulkan_NewFrame",
      defaults={},
      funcname="ImGui_ImplVulkan_NewFrame",
-      location="imgui_impl_vulkan:143",
+      location="imgui_impl_vulkan:144",
      ov_cimguiname="ImGui_ImplVulkan_NewFrame",
      ret="void",
      signature="()",
@@ -1480,7 +1478,7 @@ local t={
      cimguiname="ImGui_ImplVulkan_RemoveTexture",
      defaults={},
      funcname="ImGui_ImplVulkan_RemoveTexture",
-      location="imgui_impl_vulkan:159",
+      location="imgui_impl_vulkan:158",
      ov_cimguiname="ImGui_ImplVulkan_RemoveTexture",
      ret="void",
      signature="(VkDescriptorSet)",
@@ -1506,7 +1504,7 @@ local t={
      defaults={
        pipeline="0ULL"},
      funcname="ImGui_ImplVulkan_RenderDrawData",
-      location="imgui_impl_vulkan:144",
+      location="imgui_impl_vulkan:145",
      ov_cimguiname="ImGui_ImplVulkan_RenderDrawData",
      ret="void",
      signature="(ImDrawData*,VkCommandBuffer,VkPipeline)",
@@ -1525,7 +1523,7 @@ local t={
      cimguiname="ImGui_ImplVulkan_SetMinImageCount",
      defaults={},
      funcname="ImGui_ImplVulkan_SetMinImageCount",
-      location="imgui_impl_vulkan:145",
+      location="imgui_impl_vulkan:146",
      ov_cimguiname="ImGui_ImplVulkan_SetMinImageCount",
      ret="void",
      signature="(uint32_t)",
@@ -1541,7 +1539,7 @@ local t={
      cimguiname="ImGui_ImplVulkan_Shutdown",
      defaults={},
      funcname="ImGui_ImplVulkan_Shutdown",
-      location="imgui_impl_vulkan:142",
+      location="imgui_impl_vulkan:143",
      ov_cimguiname="ImGui_ImplVulkan_Shutdown",
      ret="void",
      signature="()",
@@ -1560,7 +1558,7 @@ local t={
      cimguiname="ImGui_ImplVulkan_UpdateTexture",
      defaults={},
      funcname="ImGui_ImplVulkan_UpdateTexture",
-      location="imgui_impl_vulkan:153",
+      location="imgui_impl_vulkan:154",
      ov_cimguiname="ImGui_ImplVulkan_UpdateTexture",
      ret="void",
      signature="(ImTextureData*)",
@@ -1633,7 +1631,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]
--- a/generator/output/overloads.txt
+++ b/generator/output/overloads.txt
@@ -243,8 +243,8 @@ igSelectable	2
 1	bool	igSelectable_Bool (const char*,bool,ImGuiSelectableFlags,const ImVec2)
 2	bool	igSelectable_BoolPtr (const char*,bool*,ImGuiSelectableFlags,const ImVec2)
 igSetItemKeyOwner	2
-1	void	igSetItemKeyOwner_Nil (ImGuiKey)
-2	void	igSetItemKeyOwner_InputFlags (ImGuiKey,ImGuiInputFlags)
+1	bool	igSetItemKeyOwner_Nil (ImGuiKey)
+2	bool	igSetItemKeyOwner_InputFlags (ImGuiKey,ImGuiInputFlags)
 igSetScrollFromPosX	2
 1	void	igSetScrollFromPosX_Float (float,float)
 2	void	igSetScrollFromPosX_WindowPtr (ImGuiWindow*,float,float)
--- a/generator/output/structs_and_enums.json
+++ b/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_": [
@@ -525,213 +535,218 @@
      },
      {
        "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_PlotLines",
+        "name": "ImGuiCol_TabDimmedSelectedOverline",
        "value": "41"
      },
      {
        "calc_value": 42,
-        "name": "ImGuiCol_PlotLinesHovered",
+        "name": "ImGuiCol_PlotLines",
        "value": "42"
      },
      {
        "calc_value": 43,
-        "name": "ImGuiCol_PlotHistogram",
+        "name": "ImGuiCol_PlotLinesHovered",
        "value": "43"
      },
      {
        "calc_value": 44,
-        "name": "ImGuiCol_PlotHistogramHovered",
+        "name": "ImGuiCol_PlotHistogram",
        "value": "44"
      },
      {
        "calc_value": 45,
-        "name": "ImGuiCol_TableHeaderBg",
+        "name": "ImGuiCol_PlotHistogramHovered",
        "value": "45"
      },
      {
        "calc_value": 46,
-        "name": "ImGuiCol_TableBorderStrong",
+        "name": "ImGuiCol_TableHeaderBg",
        "value": "46"
      },
      {
        "calc_value": 47,
-        "name": "ImGuiCol_TableBorderLight",
+        "name": "ImGuiCol_TableBorderStrong",
        "value": "47"
      },
      {
        "calc_value": 48,
-        "name": "ImGuiCol_TableRowBg",
+        "name": "ImGuiCol_TableBorderLight",
        "value": "48"
      },
      {
        "calc_value": 49,
-        "name": "ImGuiCol_TableRowBgAlt",
+        "name": "ImGuiCol_TableRowBg",
        "value": "49"
      },
      {
        "calc_value": 50,
-        "name": "ImGuiCol_TextLink",
+        "name": "ImGuiCol_TableRowBgAlt",
        "value": "50"
      },
      {
        "calc_value": 51,
-        "name": "ImGuiCol_TextSelectedBg",
+        "name": "ImGuiCol_TextLink",
        "value": "51"
      },
      {
        "calc_value": 52,
-        "name": "ImGuiCol_TreeLines",
+        "name": "ImGuiCol_TextSelectedBg",
        "value": "52"
      },
      {
        "calc_value": 53,
-        "name": "ImGuiCol_DragDropTarget",
+        "name": "ImGuiCol_TreeLines",
        "value": "53"
      },
      {
        "calc_value": 54,
-        "name": "ImGuiCol_DragDropTargetBg",
+        "name": "ImGuiCol_DragDropTarget",
        "value": "54"
      },
      {
        "calc_value": 55,
-        "name": "ImGuiCol_UnsavedMarker",
+        "name": "ImGuiCol_DragDropTargetBg",
        "value": "55"
      },
      {
        "calc_value": 56,
-        "name": "ImGuiCol_NavCursor",
+        "name": "ImGuiCol_UnsavedMarker",
        "value": "56"
      },
      {
        "calc_value": 57,
-        "name": "ImGuiCol_NavWindowingHighlight",
+        "name": "ImGuiCol_NavCursor",
        "value": "57"
      },
      {
        "calc_value": 58,
-        "name": "ImGuiCol_NavWindowingDimBg",
+        "name": "ImGuiCol_NavWindowingHighlight",
        "value": "58"
      },
      {
        "calc_value": 59,
-        "name": "ImGuiCol_ModalWindowDimBg",
+        "name": "ImGuiCol_NavWindowingDimBg",
        "value": "59"
      },
      {
        "calc_value": 60,
-        "name": "ImGuiCol_COUNT",
+        "name": "ImGuiCol_ModalWindowDimBg",
        "value": "60"
+      },
+      {
+        "calc_value": 61,
+        "name": "ImGuiCol_COUNT",
+        "value": "61"
      }
    ],
    "ImGuiColorEditFlags_": [
@@ -2112,6 +2127,11 @@
        "calc_value": 1024,
        "name": "ImGuiItemStatusFlags_HasShortcut",
        "value": "1 << 10"
+      },
+      {
+        "calc_value": 2048,
+        "name": "ImGuiItemStatusFlags_EditedInternal",
+        "value": "1 << 11"
      }
    ],
    "ImGuiKey": [
@@ -4059,38 +4079,43 @@
      },
      {
        "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_COUNT",
+        "name": "ImGuiStyleVar_SeparatorTextPadding",
        "value": "41"
+      },
+      {
+        "calc_value": 42,
+        "name": "ImGuiStyleVar_COUNT",
+        "value": "42"
      }
    ],
    "ImGuiTabBarFlagsPrivate_": [
@@ -5058,211 +5083,211 @@
    "ImGuiSortDirection": "ImU8"
  },
  "locations": {
-    "ImBitVector": "imgui_internal:659",
-    "ImColor": "imgui:2968",
-    "ImDrawChannel": "imgui:3224",
-    "ImDrawCmd": "imgui:3180",
-    "ImDrawCmdHeader": "imgui:3216",
-    "ImDrawData": "imgui:3445",
-    "ImDrawDataBuilder": "imgui_internal:887",
-    "ImDrawFlags_": "imgui:3249",
-    "ImDrawList": "imgui:3287",
-    "ImDrawListFlags_": "imgui:3269",
-    "ImDrawListSharedData": "imgui_internal:860",
-    "ImDrawListSplitter": "imgui:3232",
-    "ImDrawTextFlags_": "imgui_internal:432",
-    "ImDrawVert": "imgui:3201",
-    "ImFont": "imgui:3871",
-    "ImFontAtlas": "imgui:3672",
-    "ImFontAtlasBuilder": "imgui_internal:3879",
-    "ImFontAtlasFlags_": "imgui:3645",
-    "ImFontAtlasPostProcessData": "imgui_internal:3852",
-    "ImFontAtlasRect": "imgui:3635",
-    "ImFontAtlasRectEntry": "imgui_internal:3844",
-    "ImFontBaked": "imgui:3823",
-    "ImFontConfig": "imgui:3554",
-    "ImFontFlags_": "imgui:3858",
-    "ImFontGlyph": "imgui:3597",
-    "ImFontGlyphRangesBuilder": "imgui:3613",
-    "ImFontLoader": "imgui_internal:3793",
-    "ImFontStackData": "imgui_internal:895",
-    "ImGuiActivateFlags_": "imgui_internal:1684",
-    "ImGuiAxis": "imgui_internal:1143",
-    "ImGuiBackendFlags_": "imgui:1726",
-    "ImGuiBoxSelectState": "imgui_internal:1875",
-    "ImGuiButtonFlagsPrivate_": "imgui_internal:1031",
-    "ImGuiButtonFlags_": "imgui:1865",
-    "ImGuiChildFlags_": "imgui:1215",
-    "ImGuiCol_": "imgui:1737",
-    "ImGuiColorEditFlags_": "imgui:1877",
-    "ImGuiColorMod": "imgui_internal:915",
-    "ImGuiComboFlagsPrivate_": "imgui_internal:1057",
-    "ImGuiComboFlags_": "imgui:1377",
-    "ImGuiComboPreviewData": "imgui_internal:1157",
-    "ImGuiCond_": "imgui:1993",
-    "ImGuiConfigFlags_": "imgui:1707",
-    "ImGuiContext": "imgui_internal:2192",
-    "ImGuiContextHook": "imgui_internal:2175",
-    "ImGuiContextHookType": "imgui_internal:2173",
-    "ImGuiDataTypeInfo": "imgui_internal:941",
-    "ImGuiDataTypePrivate_": "imgui_internal:950",
-    "ImGuiDataTypeStorage": "imgui_internal:935",
-    "ImGuiDataType_": "imgui:1512",
-    "ImGuiDeactivatedItemData": "imgui_internal:1452",
-    "ImGuiDebugAllocEntry": "imgui_internal:2098",
-    "ImGuiDebugAllocInfo": "imgui_internal:2105",
-    "ImGuiDebugItemPathQuery": "imgui_internal:2144",
-    "ImGuiDebugLogFlags_": "imgui_internal:2075",
-    "ImGuiDir": "imgui:1530",
-    "ImGuiDragDropFlags_": "imgui:1483",
-    "ImGuiErrorRecoveryState": "imgui_internal:1408",
-    "ImGuiFocusRequestFlags_": "imgui_internal:1103",
-    "ImGuiFocusScopeData": "imgui_internal:1772",
-    "ImGuiFocusedFlags_": "imgui:1431",
+    "ImBitVector": "imgui_internal:665",
+    "ImColor": "imgui:2971",
+    "ImDrawChannel": "imgui:3221",
+    "ImDrawCmd": "imgui:3177",
+    "ImDrawCmdHeader": "imgui:3213",
+    "ImDrawData": "imgui:3452",
+    "ImDrawDataBuilder": "imgui_internal:893",
+    "ImDrawFlags_": "imgui:3245",
+    "ImDrawList": "imgui:3284",
+    "ImDrawListFlags_": "imgui:3266",
+    "ImDrawListSharedData": "imgui_internal:866",
+    "ImDrawListSplitter": "imgui:3229",
+    "ImDrawTextFlags_": "imgui_internal:435",
+    "ImDrawVert": "imgui:3198",
+    "ImFont": "imgui:3880",
+    "ImFontAtlas": "imgui:3680",
+    "ImFontAtlasBuilder": "imgui_internal:3894",
+    "ImFontAtlasFlags_": "imgui:3653",
+    "ImFontAtlasPostProcessData": "imgui_internal:3867",
+    "ImFontAtlasRect": "imgui:3643",
+    "ImFontAtlasRectEntry": "imgui_internal:3859",
+    "ImFontBaked": "imgui:3831",
+    "ImFontConfig": "imgui:3562",
+    "ImFontFlags_": "imgui:3866",
+    "ImFontGlyph": "imgui:3605",
+    "ImFontGlyphRangesBuilder": "imgui:3621",
+    "ImFontLoader": "imgui_internal:3808",
+    "ImFontStackData": "imgui_internal:901",
+    "ImGuiActivateFlags_": "imgui_internal:1693",
+    "ImGuiAxis": "imgui_internal:1150",
+    "ImGuiBackendFlags_": "imgui:1727",
+    "ImGuiBoxSelectState": "imgui_internal:1884",
+    "ImGuiButtonFlagsPrivate_": "imgui_internal:1038",
+    "ImGuiButtonFlags_": "imgui:1868",
+    "ImGuiChildFlags_": "imgui:1216",
+    "ImGuiCol_": "imgui:1738",
+    "ImGuiColorEditFlags_": "imgui:1880",
+    "ImGuiColorMod": "imgui_internal:921",
+    "ImGuiComboFlagsPrivate_": "imgui_internal:1064",
+    "ImGuiComboFlags_": "imgui:1378",
+    "ImGuiComboPreviewData": "imgui_internal:1164",
+    "ImGuiCond_": "imgui:1996",
+    "ImGuiConfigFlags_": "imgui:1708",
+    "ImGuiContext": "imgui_internal:2203",
+    "ImGuiContextHook": "imgui_internal:2186",
+    "ImGuiContextHookType": "imgui_internal:2184",
+    "ImGuiDataTypeInfo": "imgui_internal:947",
+    "ImGuiDataTypePrivate_": "imgui_internal:956",
+    "ImGuiDataTypeStorage": "imgui_internal:941",
+    "ImGuiDataType_": "imgui:1513",
+    "ImGuiDeactivatedItemData": "imgui_internal:1461",
+    "ImGuiDebugAllocEntry": "imgui_internal:2109",
+    "ImGuiDebugAllocInfo": "imgui_internal:2116",
+    "ImGuiDebugItemPathQuery": "imgui_internal:2155",
+    "ImGuiDebugLogFlags_": "imgui_internal:2086",
+    "ImGuiDir": "imgui:1531",
+    "ImGuiDragDropFlags_": "imgui:1484",
+    "ImGuiErrorRecoveryState": "imgui_internal:1416",
+    "ImGuiFocusRequestFlags_": "imgui_internal:1110",
+    "ImGuiFocusScopeData": "imgui_internal:1781",
+    "ImGuiFocusedFlags_": "imgui:1432",
    "ImGuiFreeTypeLoaderFlags_": "imgui_freetype:29",
-    "ImGuiGroupData": "imgui_internal:1170",
-    "ImGuiHoveredFlagsPrivate_": "imgui_internal:1014",
-    "ImGuiHoveredFlags_": "imgui:1445",
-    "ImGuiIDStackTool": "imgui_internal:2158",
-    "ImGuiIO": "imgui:2398",
-    "ImGuiInputEvent": "imgui_internal:1545",
-    "ImGuiInputEventAppFocused": "imgui_internal:1543",
-    "ImGuiInputEventKey": "imgui_internal:1541",
-    "ImGuiInputEventMouseButton": "imgui_internal:1540",
-    "ImGuiInputEventMousePos": "imgui_internal:1538",
-    "ImGuiInputEventMouseWheel": "imgui_internal:1539",
-    "ImGuiInputEventText": "imgui_internal:1542",
-    "ImGuiInputEventType": "imgui_internal:1515",
-    "ImGuiInputFlagsPrivate_": "imgui_internal:1611",
-    "ImGuiInputFlags_": "imgui:1683",
-    "ImGuiInputSource": "imgui_internal:1527",
-    "ImGuiInputTextCallbackData": "imgui:2639",
-    "ImGuiInputTextDeactivatedState": "imgui_internal:1207",
-    "ImGuiInputTextFlagsPrivate_": "imgui_internal:1022",
-    "ImGuiInputTextFlags_": "imgui:1250",
-    "ImGuiInputTextState": "imgui_internal:1229",
-    "ImGuiItemFlagsPrivate_": "imgui_internal:963",
-    "ImGuiItemFlags_": "imgui:1236",
-    "ImGuiItemStatusFlags_": "imgui_internal:987",
-    "ImGuiKey": "imgui:1554",
-    "ImGuiKeyData": "imgui:2390",
-    "ImGuiKeyOwnerData": "imgui_internal:1598",
-    "ImGuiKeyRoutingData": "imgui_internal:1572",
-    "ImGuiKeyRoutingTable": "imgui_internal:1586",
-    "ImGuiLastItemData": "imgui_internal:1377",
-    "ImGuiLayoutType_": "imgui_internal:1124",
-    "ImGuiListClipper": "imgui:2857",
-    "ImGuiListClipperData": "imgui_internal:1668",
-    "ImGuiListClipperFlags_": "imgui:2831",
-    "ImGuiListClipperRange": "imgui_internal:1655",
-    "ImGuiLocEntry": "imgui_internal:2046",
-    "ImGuiLocKey": "imgui_internal:2031",
-    "ImGuiLogFlags_": "imgui_internal:1131",
-    "ImGuiMenuColumns": "imgui_internal:1189",
-    "ImGuiMetricsConfig": "imgui_internal:2115",
-    "ImGuiMouseButton_": "imgui:1951",
-    "ImGuiMouseCursor_": "imgui:1961",
-    "ImGuiMouseSource": "imgui:1982",
-    "ImGuiMultiSelectFlags_": "imgui:3026",
-    "ImGuiMultiSelectIO": "imgui:3061",
-    "ImGuiMultiSelectState": "imgui_internal:1932",
-    "ImGuiMultiSelectTempData": "imgui_internal:1907",
-    "ImGuiNavItemData": "imgui_internal:1755",
-    "ImGuiNavLayer": "imgui_internal:1747",
-    "ImGuiNavMoveFlags_": "imgui_internal:1725",
-    "ImGuiNavRenderCursorFlags_": "imgui_internal:1710",
-    "ImGuiNextItemData": "imgui_internal:1355",
-    "ImGuiNextItemDataFlags_": "imgui_internal:1344",
-    "ImGuiNextWindowData": "imgui_internal:1317",
-    "ImGuiNextWindowDataFlags_": "imgui_internal:1300",
-    "ImGuiOldColumnData": "imgui_internal:1840",
-    "ImGuiOldColumnFlags_": "imgui_internal:1820",
-    "ImGuiOldColumns": "imgui_internal:1850",
-    "ImGuiOnceUponAFrame": "imgui:2720",
-    "ImGuiPayload": "imgui:2685",
-    "ImGuiPlatformIO": "imgui:3984",
-    "ImGuiPlatformImeData": "imgui:4041",
-    "ImGuiPlotType": "imgui_internal:1150",
-    "ImGuiPopupData": "imgui_internal:1472",
-    "ImGuiPopupFlags_": "imgui:1340",
-    "ImGuiPopupPositionPolicy": "imgui_internal:1464",
-    "ImGuiPtrOrIndex": "imgui_internal:1442",
-    "ImGuiScrollFlags_": "imgui_internal:1696",
-    "ImGuiSelectableFlagsPrivate_": "imgui_internal:1070",
-    "ImGuiSelectableFlags_": "imgui:1359",
-    "ImGuiSelectionBasicStorage": "imgui:3107",
-    "ImGuiSelectionExternalStorage": "imgui:3130",
-    "ImGuiSelectionRequest": "imgui:3081",
-    "ImGuiSelectionRequestType": "imgui:3073",
-    "ImGuiSeparatorFlags_": "imgui_internal:1092",
-    "ImGuiSettingsHandler": "imgui_internal:2011",
-    "ImGuiShrinkWidthItem": "imgui_internal:1435",
-    "ImGuiSizeCallbackData": "imgui:2676",
-    "ImGuiSliderFlagsPrivate_": "imgui_internal:1063",
-    "ImGuiSliderFlags_": "imgui:1934",
-    "ImGuiSortDirection": "imgui:1541",
-    "ImGuiStackLevelInfo": "imgui_internal:2133",
-    "ImGuiStorage": "imgui:2793",
-    "ImGuiStoragePair": "imgui:2776",
-    "ImGuiStyle": "imgui:2280",
-    "ImGuiStyleMod": "imgui_internal:922",
-    "ImGuiStyleVarInfo": "imgui_internal:906",
-    "ImGuiStyleVar_": "imgui:1817",
-    "ImGuiTabBar": "imgui_internal:2823",
-    "ImGuiTabBarFlagsPrivate_": "imgui_internal:2786",
-    "ImGuiTabBarFlags_": "imgui:1392",
-    "ImGuiTabItem": "imgui_internal:2804",
-    "ImGuiTabItemFlagsPrivate_": "imgui_internal:2794",
-    "ImGuiTabItemFlags_": "imgui:1416",
-    "ImGuiTable": "imgui_internal:2969",
-    "ImGuiTableBgTarget_": "imgui:2134",
-    "ImGuiTableCellData": "imgui_internal:2937",
-    "ImGuiTableColumn": "imgui_internal:2877",
-    "ImGuiTableColumnFlags_": "imgui:2081",
-    "ImGuiTableColumnSettings": "imgui_internal:3119",
-    "ImGuiTableColumnSortSpecs": "imgui:2156",
-    "ImGuiTableFlags_": "imgui:2028",
-    "ImGuiTableHeaderData": "imgui_internal:2946",
-    "ImGuiTableInstanceData": "imgui_internal:2956",
-    "ImGuiTableRowFlags_": "imgui:2119",
-    "ImGuiTableSettings": "imgui_internal:3143",
-    "ImGuiTableSortSpecs": "imgui:2146",
-    "ImGuiTableTempData": "imgui_internal:3095",
-    "ImGuiTextBuffer": "imgui:2755",
-    "ImGuiTextFilter": "imgui:2728",
-    "ImGuiTextFlags_": "imgui_internal:1110",
-    "ImGuiTextIndex": "imgui_internal:812",
-    "ImGuiTextRange": "imgui:2738",
-    "ImGuiTooltipFlags_": "imgui_internal:1116",
-    "ImGuiTreeNodeFlagsPrivate_": "imgui_internal:1083",
-    "ImGuiTreeNodeFlags_": "imgui:1301",
-    "ImGuiTreeNodeStackData": "imgui_internal:1396",
-    "ImGuiTypingSelectFlags_": "imgui_internal:1783",
-    "ImGuiTypingSelectRequest": "imgui_internal:1791",
-    "ImGuiTypingSelectState": "imgui_internal:1802",
-    "ImGuiViewport": "imgui:3958",
-    "ImGuiViewportFlags_": "imgui:3943",
-    "ImGuiViewportP": "imgui_internal:1960",
-    "ImGuiWindow": "imgui_internal:2651",
-    "ImGuiWindowBgClickFlags_": "imgui_internal:1294",
-    "ImGuiWindowFlags_": "imgui:1166",
-    "ImGuiWindowRefreshFlags_": "imgui_internal:1285",
-    "ImGuiWindowSettings": "imgui_internal:1997",
-    "ImGuiWindowStackData": "imgui_internal:1426",
-    "ImGuiWindowTempData": "imgui_internal:2597",
-    "ImRect": "imgui_internal:581",
-    "ImTextureData": "imgui:3510",
-    "ImTextureFormat": "imgui:3478",
-    "ImTextureRect": "imgui:3497",
+    "ImGuiGroupData": "imgui_internal:1177",
+    "ImGuiHoveredFlagsPrivate_": "imgui_internal:1021",
+    "ImGuiHoveredFlags_": "imgui:1446",
+    "ImGuiIDStackTool": "imgui_internal:2169",
+    "ImGuiIO": "imgui:2401",
+    "ImGuiInputEvent": "imgui_internal:1554",
+    "ImGuiInputEventAppFocused": "imgui_internal:1552",
+    "ImGuiInputEventKey": "imgui_internal:1550",
+    "ImGuiInputEventMouseButton": "imgui_internal:1549",
+    "ImGuiInputEventMousePos": "imgui_internal:1547",
+    "ImGuiInputEventMouseWheel": "imgui_internal:1548",
+    "ImGuiInputEventText": "imgui_internal:1551",
+    "ImGuiInputEventType": "imgui_internal:1524",
+    "ImGuiInputFlagsPrivate_": "imgui_internal:1620",
+    "ImGuiInputFlags_": "imgui:1684",
+    "ImGuiInputSource": "imgui_internal:1536",
+    "ImGuiInputTextCallbackData": "imgui:2642",
+    "ImGuiInputTextDeactivatedState": "imgui_internal:1215",
+    "ImGuiInputTextFlagsPrivate_": "imgui_internal:1029",
+    "ImGuiInputTextFlags_": "imgui:1251",
+    "ImGuiInputTextState": "imgui_internal:1237",
+    "ImGuiItemFlagsPrivate_": "imgui_internal:969",
+    "ImGuiItemFlags_": "imgui:1237",
+    "ImGuiItemStatusFlags_": "imgui_internal:993",
+    "ImGuiKey": "imgui:1555",
+    "ImGuiKeyData": "imgui:2393",
+    "ImGuiKeyOwnerData": "imgui_internal:1607",
+    "ImGuiKeyRoutingData": "imgui_internal:1581",
+    "ImGuiKeyRoutingTable": "imgui_internal:1595",
+    "ImGuiLastItemData": "imgui_internal:1385",
+    "ImGuiLayoutType_": "imgui_internal:1131",
+    "ImGuiListClipper": "imgui:2860",
+    "ImGuiListClipperData": "imgui_internal:1677",
+    "ImGuiListClipperFlags_": "imgui:2834",
+    "ImGuiListClipperRange": "imgui_internal:1664",
+    "ImGuiLocEntry": "imgui_internal:2057",
+    "ImGuiLocKey": "imgui_internal:2042",
+    "ImGuiLogFlags_": "imgui_internal:1138",
+    "ImGuiMenuColumns": "imgui_internal:1196",
+    "ImGuiMetricsConfig": "imgui_internal:2126",
+    "ImGuiMouseButton_": "imgui:1954",
+    "ImGuiMouseCursor_": "imgui:1964",
+    "ImGuiMouseSource": "imgui:1985",
+    "ImGuiMultiSelectFlags_": "imgui:3029",
+    "ImGuiMultiSelectIO": "imgui:3064",
+    "ImGuiMultiSelectState": "imgui_internal:1943",
+    "ImGuiMultiSelectTempData": "imgui_internal:1917",
+    "ImGuiNavItemData": "imgui_internal:1764",
+    "ImGuiNavLayer": "imgui_internal:1756",
+    "ImGuiNavMoveFlags_": "imgui_internal:1734",
+    "ImGuiNavRenderCursorFlags_": "imgui_internal:1719",
+    "ImGuiNextItemData": "imgui_internal:1363",
+    "ImGuiNextItemDataFlags_": "imgui_internal:1352",
+    "ImGuiNextWindowData": "imgui_internal:1325",
+    "ImGuiNextWindowDataFlags_": "imgui_internal:1308",
+    "ImGuiOldColumnData": "imgui_internal:1849",
+    "ImGuiOldColumnFlags_": "imgui_internal:1829",
+    "ImGuiOldColumns": "imgui_internal:1859",
+    "ImGuiOnceUponAFrame": "imgui:2723",
+    "ImGuiPayload": "imgui:2688",
+    "ImGuiPlatformIO": "imgui:3993",
+    "ImGuiPlatformImeData": "imgui:4056",
+    "ImGuiPlotType": "imgui_internal:1157",
+    "ImGuiPopupData": "imgui_internal:1481",
+    "ImGuiPopupFlags_": "imgui:1341",
+    "ImGuiPopupPositionPolicy": "imgui_internal:1473",
+    "ImGuiPtrOrIndex": "imgui_internal:1450",
+    "ImGuiScrollFlags_": "imgui_internal:1705",
+    "ImGuiSelectableFlagsPrivate_": "imgui_internal:1077",
+    "ImGuiSelectableFlags_": "imgui:1360",
+    "ImGuiSelectionBasicStorage": "imgui:3110",
+    "ImGuiSelectionExternalStorage": "imgui:3133",
+    "ImGuiSelectionRequest": "imgui:3084",
+    "ImGuiSelectionRequestType": "imgui:3076",
+    "ImGuiSeparatorFlags_": "imgui_internal:1099",
+    "ImGuiSettingsHandler": "imgui_internal:2022",
+    "ImGuiShrinkWidthItem": "imgui_internal:1443",
+    "ImGuiSizeCallbackData": "imgui:2679",
+    "ImGuiSliderFlagsPrivate_": "imgui_internal:1070",
+    "ImGuiSliderFlags_": "imgui:1937",
+    "ImGuiSortDirection": "imgui:1542",
+    "ImGuiStackLevelInfo": "imgui_internal:2144",
+    "ImGuiStorage": "imgui:2796",
+    "ImGuiStoragePair": "imgui:2779",
+    "ImGuiStyle": "imgui:2283",
+    "ImGuiStyleMod": "imgui_internal:928",
+    "ImGuiStyleVarInfo": "imgui_internal:912",
+    "ImGuiStyleVar_": "imgui:1819",
+    "ImGuiTabBar": "imgui_internal:2835",
+    "ImGuiTabBarFlagsPrivate_": "imgui_internal:2798",
+    "ImGuiTabBarFlags_": "imgui:1393",
+    "ImGuiTabItem": "imgui_internal:2816",
+    "ImGuiTabItemFlagsPrivate_": "imgui_internal:2806",
+    "ImGuiTabItemFlags_": "imgui:1417",
+    "ImGuiTable": "imgui_internal:2981",
+    "ImGuiTableBgTarget_": "imgui:2137",
+    "ImGuiTableCellData": "imgui_internal:2949",
+    "ImGuiTableColumn": "imgui_internal:2889",
+    "ImGuiTableColumnFlags_": "imgui:2084",
+    "ImGuiTableColumnSettings": "imgui_internal:3131",
+    "ImGuiTableColumnSortSpecs": "imgui:2159",
+    "ImGuiTableFlags_": "imgui:2031",
+    "ImGuiTableHeaderData": "imgui_internal:2958",
+    "ImGuiTableInstanceData": "imgui_internal:2968",
+    "ImGuiTableRowFlags_": "imgui:2122",
+    "ImGuiTableSettings": "imgui_internal:3155",
+    "ImGuiTableSortSpecs": "imgui:2149",
+    "ImGuiTableTempData": "imgui_internal:3107",
+    "ImGuiTextBuffer": "imgui:2758",
+    "ImGuiTextFilter": "imgui:2731",
+    "ImGuiTextFlags_": "imgui_internal:1117",
+    "ImGuiTextIndex": "imgui_internal:818",
+    "ImGuiTextRange": "imgui:2741",
+    "ImGuiTooltipFlags_": "imgui_internal:1123",
+    "ImGuiTreeNodeFlagsPrivate_": "imgui_internal:1090",
+    "ImGuiTreeNodeFlags_": "imgui:1302",
+    "ImGuiTreeNodeStackData": "imgui_internal:1404",
+    "ImGuiTypingSelectFlags_": "imgui_internal:1792",
+    "ImGuiTypingSelectRequest": "imgui_internal:1800",
+    "ImGuiTypingSelectState": "imgui_internal:1811",
+    "ImGuiViewport": "imgui:3967",
+    "ImGuiViewportFlags_": "imgui:3952",
+    "ImGuiViewportP": "imgui_internal:1971",
+    "ImGuiWindow": "imgui_internal:2663",
+    "ImGuiWindowBgClickFlags_": "imgui_internal:1302",
+    "ImGuiWindowFlags_": "imgui:1167",
+    "ImGuiWindowRefreshFlags_": "imgui_internal:1293",
+    "ImGuiWindowSettings": "imgui_internal:2008",
+    "ImGuiWindowStackData": "imgui_internal:1434",
+    "ImGuiWindowTempData": "imgui_internal:2609",
+    "ImRect": "imgui_internal:585",
+    "ImTextureData": "imgui:3517",
+    "ImTextureFormat": "imgui:3485",
+    "ImTextureRect": "imgui:3504",
    "ImTextureRef": "imgui:367",
-    "ImTextureStatus": "imgui:3485",
-    "ImVec1": "imgui_internal:555",
+    "ImTextureStatus": "imgui:3492",
+    "ImVec1": "imgui_internal:559",
    "ImVec2": "imgui:295",
-    "ImVec2i": "imgui_internal:563",
-    "ImVec2ih": "imgui_internal:571",
+    "ImVec2i": "imgui_internal:567",
+    "ImVec2ih": "imgui_internal:575",
    "ImVec4": "imgui:308",
-    "ImWcharClass": "imgui_internal:444",
-    "stbrp_context_opaque": "imgui_internal:3876"
+    "ImWcharClass": "imgui_internal:447",
+    "stbrp_context_opaque": "imgui_internal:3891"
  },
  "nonPOD": {
    "ImBitArray": true,
@@ -5362,6 +5387,7 @@
    "ImVec2i": true,
    "ImVec4": true
  },
+  "opaque_structs": [],
  "structs": {
    "ImBitVector": [
      {
@@ -6383,6 +6409,11 @@
        "name": "UnclipRect",
        "type": "ImRect"
      },
+      {
+        "name": "UnclipRects[2]",
+        "size": 2,
+        "type": "ImRect"
+      },
      {
        "name": "BoxSelectRectPrev",
        "type": "ImRect"
@@ -6519,6 +6550,10 @@
        "name": "WithinEndChildID",
        "type": "ImGuiID"
      },
+      {
+        "name": "WithinEndPopupID",
+        "type": "ImGuiID"
+      },
      {
        "name": "TestEngine",
        "type": "void*"
@@ -9049,10 +9084,6 @@
        "name": "BackupCursorMaxPos",
        "type": "ImVec2"
      },
-      {
-        "name": "LastSubmittedItem",
-        "type": "ImGuiSelectionUserData"
-      },
      {
        "name": "BoxSelectId",
        "type": "ImGuiID"
@@ -9427,6 +9458,18 @@
        "name": "Renderer_RenderState",
        "type": "void*"
      },
+      {
+        "name": "DrawCallback_ResetRenderState",
+        "type": "ImDrawCallback"
+      },
+      {
+        "name": "DrawCallback_SetSamplerLinear",
+        "type": "ImDrawCallback"
+      },
+      {
+        "name": "DrawCallback_SetSamplerNearest",
+        "type": "ImDrawCallback"
+      },
      {
        "name": "Textures",
        "template_type": "ImTextureData*",
@@ -9929,7 +9972,7 @@
      },
      {
        "name": "Colors[ImGuiCol_COUNT]",
-        "size": 60,
+        "size": 61,
        "type": "ImVec4"
      },
      {
--- a/generator/output/structs_and_enums.lua
+++ b/generator/output/structs_and_enums.lua
--- a/2
+++ b/2