commit e22e3f300af3b913e3209bde2a9dff91ed637807
author thedmd <michcic@gmail.com> Sat Jun 06 16:37:07 2020 +0200
committer ocornut <omarcornut@gmail.com> Sat Jun 06 18:54:53 2020 +0200
tree 57afa1b7ba2d0424b88190ea10f19b72a1a4add3
parent 78d5ccfb9012bdf9e25317aa11fc79e7e639c8fb

ImDrawList: Fixed an issue when draw command merging or cancelling while crossing the VtxOffset boundary would lead to draw command being emitted with wrong VtxOffset value.  (#3129, #3163, #3232)

docs/CHANGELOG.txt

diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
index e7ff09d..54e5a11 100644
--- a/docs/CHANGELOG.txt
+++ b/docs/CHANGELOG.txt
@@ -56,6 +56,9 @@
   BeginMenu()/EndMenu() or BeginPopup/EndPopup(). (#3223, #1207) [@rokups]
 - Drag and Drop: Fixed unintended fallback "..." tooltip display during drag operation when
   drag source uses _SourceNoPreviewTooltip flags. (#3160) [@rokups]
+- ImDrawList: Fixed an issue when draw command merging or cancelling while crossing the VtxOffset
+  boundary would lead to draw command being emitted with wrong VtxOffset value. (#3129, #3163, #3232)
+  [@thedmd, @Shironekoben, @sergeyn, @ocornut]
 - Misc, Freetype: Fix for rare case where FT_Get_Char_Index() succeed but FT_Load_Glyph() fails.
 - CI: Added CI test to verify we're never accidentally dragging libstdc++ (on some compiler setups,
   static constructors for non-pod data seems to drag in libstdc++ due to thread-safety concerns).

imgui.cpp

diff --git a/imgui.cpp b/imgui.cpp
index b74f44c..0c2156d 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -10267,7 +10267,7 @@
 
                 ImDrawIdx* idx_buffer = (draw_list->IdxBuffer.Size > 0) ? draw_list->IdxBuffer.Data : NULL;
                 char buf[300];
-                ImFormatString(buf, IM_ARRAYSIZE(buf), "DrawCmd: %4d triangles, Tex 0x%p, ClipRect (%4.0f,%4.0f)-(%4.0f,%4.0f)",
+                ImFormatString(buf, IM_ARRAYSIZE(buf), "DrawCmd:%5d triangles, Tex 0x%p, ClipRect (%4.0f,%4.0f)-(%4.0f,%4.0f)",
                     pcmd->ElemCount/3, (void*)(intptr_t)pcmd->TextureId,
                     pcmd->ClipRect.x, pcmd->ClipRect.y, pcmd->ClipRect.z, pcmd->ClipRect.w);
                 bool pcmd_node_open = ImGui::TreeNode((void*)(pcmd - draw_list->CmdBuffer.begin()), "%s", buf);

imgui_draw.cpp

diff --git a/imgui_draw.cpp b/imgui_draw.cpp
index 057ddb6..0e56b3f 100644
--- a/imgui_draw.cpp
+++ b/imgui_draw.cpp
@@ -460,11 +460,17 @@
     }
 
     // Try to merge with previous command if it matches, else use current command
-    ImDrawCmd* prev_cmd = CmdBuffer.Size > 1 ? curr_cmd - 1 : NULL;
-    if (curr_cmd->ElemCount == 0 && prev_cmd && memcmp(&prev_cmd->ClipRect, &curr_clip_rect, sizeof(ImVec4)) == 0 && prev_cmd->TextureId == GetCurrentTextureId() && prev_cmd->UserCallback == NULL)
-        CmdBuffer.pop_back();
-    else
-        curr_cmd->ClipRect = curr_clip_rect;
+    if (curr_cmd->ElemCount == 0 && CmdBuffer.Size > 1)
+    {
+        ImDrawCmd* prev_cmd = curr_cmd - 1;
+        if (memcmp(&prev_cmd->ClipRect, &curr_clip_rect, sizeof(ImVec4)) == 0 && prev_cmd->VtxOffset == _VtxCurrentOffset && prev_cmd->TextureId == GetCurrentTextureId() && prev_cmd->UserCallback == NULL)
+        {
+            CmdBuffer.pop_back();
+            return;
+        }
+    }
+
+    curr_cmd->ClipRect = curr_clip_rect;
 }
 
 void ImDrawList::UpdateTextureID()
@@ -479,11 +485,17 @@
     }
 
     // Try to merge with previous command if it matches, else use current command
-    ImDrawCmd* prev_cmd = CmdBuffer.Size > 1 ? curr_cmd - 1 : NULL;
-    if (curr_cmd->ElemCount == 0 && prev_cmd && prev_cmd->TextureId == curr_texture_id && memcmp(&prev_cmd->ClipRect, &GetCurrentClipRect(), sizeof(ImVec4)) == 0 && prev_cmd->UserCallback == NULL)
-        CmdBuffer.pop_back();
-    else
-        curr_cmd->TextureId = curr_texture_id;
+    if (curr_cmd->ElemCount == 0 && CmdBuffer.Size > 1)
+    {
+        ImDrawCmd* prev_cmd = curr_cmd - 1;
+        if (prev_cmd->TextureId == curr_texture_id && memcmp(&prev_cmd->ClipRect, &GetCurrentClipRect(), sizeof(ImVec4)) == 0 && prev_cmd->VtxOffset == _VtxCurrentOffset && prev_cmd->UserCallback == NULL)
+        {
+            CmdBuffer.pop_back();
+            return;
+        }
+    }
+
+    curr_cmd->TextureId = curr_texture_id;
 }
 
 #undef GetCurrentClipRect