Use correct starting index of index buffer. Fixes 2051 (#2052)

rh101 · web-flow · commit b4f83f4107f6 · 2024-07-24T21:02:19.000+08:00
diff --git a/extensions/ImGui/src/ImGui/imgui_impl_ax.cpp b/extensions/ImGui/src/ImGui/imgui_impl_ax.cpp
@@ -1840,7 +1840,6 @@ IMGUI_IMPL_API void ImGui_ImplAx_RenderDrawData(ImDrawData* draw_data)
     for (int n = 0; n < draw_data->CmdListsCount; n++)
     {
         const ImDrawList* cmd_list = draw_data->CmdLists[n];
-        size_t ibuffer_offset      = 0;
 
         // Upload vertex/index buffers
         const auto vsize = cmd_list->VtxBuffer.Size * sizeof(ImDrawVert);
@@ -1912,7 +1911,7 @@ IMGUI_IMPL_API void ImGui_ImplAx_RenderDrawData(ImDrawData* draw_data)
                         cmd->setVertexBuffer(vbuffer);
                         cmd->setDrawType(CustomCommand::DrawType::ELEMENT);
                         cmd->setPrimitiveType(PrimitiveType::TRIANGLE);
-                        cmd->setIndexDrawInfo(ibuffer_offset, pcmd->ElemCount);
+                        cmd->setIndexDrawInfo(pcmd->IdxOffset, pcmd->ElemCount);
                         renderer->addCommand(cmd.get());
                     }
                     else
@@ -1928,7 +1927,6 @@ IMGUI_IMPL_API void ImGui_ImplAx_RenderDrawData(ImDrawData* draw_data)
                     }
                 }
             }
-            ibuffer_offset += pcmd->ElemCount;
         }
     }
 
diff --git a/extensions/ImGui/src/ImGui/imgui_impl_ax_android.cpp b/extensions/ImGui/src/ImGui/imgui_impl_ax_android.cpp
@@ -609,7 +609,6 @@ IMGUI_IMPL_API void ImGui_ImplAx_RenderDrawData(ImDrawData* draw_data)
     for (int n = 0; n < draw_data->CmdListsCount; n++)
     {
         const ImDrawList* cmd_list = draw_data->CmdLists[n];
-        size_t ibuffer_offset      = 0;
 
         // Upload vertex/index buffers
         const auto vsize = cmd_list->VtxBuffer.Size * sizeof(ImDrawVert);
@@ -681,7 +680,7 @@ IMGUI_IMPL_API void ImGui_ImplAx_RenderDrawData(ImDrawData* draw_data)
                         cmd->setVertexBuffer(vbuffer);
                         cmd->setDrawType(CustomCommand::DrawType::ELEMENT);
                         cmd->setPrimitiveType(PrimitiveType::TRIANGLE);
-                        cmd->setIndexDrawInfo(ibuffer_offset, pcmd->ElemCount);
+                        cmd->setIndexDrawInfo(pcmd->IdxOffset, pcmd->ElemCount);
                         renderer->addCommand(cmd.get());
                     }
                     else
@@ -697,7 +696,6 @@ IMGUI_IMPL_API void ImGui_ImplAx_RenderDrawData(ImDrawData* draw_data)
                     }
                 }
             }
-            ibuffer_offset += pcmd->ElemCount;
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1840,7 +1840,6 @@ IMGUI_IMPL_API void ImGui_ImplAx_RenderDrawData(ImDrawData* draw_data)`
`1840`	`1840`	`for (int n = 0; n < draw_data->CmdListsCount; n++)`
`1841`	`1841`	`{`
`1842`	`1842`	`const ImDrawList* cmd_list = draw_data->CmdLists[n];`
`1843`		`- size_t ibuffer_offset = 0;`
`1844`	`1843`
`1845`	`1844`	`// Upload vertex/index buffers`
`1846`	`1845`	`const auto vsize = cmd_list->VtxBuffer.Size * sizeof(ImDrawVert);`
`@@ -1912,7 +1911,7 @@ IMGUI_IMPL_API void ImGui_ImplAx_RenderDrawData(ImDrawData* draw_data)`
`1912`	`1911`	`cmd->setVertexBuffer(vbuffer);`
`1913`	`1912`	`cmd->setDrawType(CustomCommand::DrawType::ELEMENT);`
`1914`	`1913`	`cmd->setPrimitiveType(PrimitiveType::TRIANGLE);`
`1915`		`- cmd->setIndexDrawInfo(ibuffer_offset, pcmd->ElemCount);`
	`1914`	`+ cmd->setIndexDrawInfo(pcmd->IdxOffset, pcmd->ElemCount);`
`1916`	`1915`	`renderer->addCommand(cmd.get());`
`1917`	`1916`	`}`
`1918`	`1917`	`else`
`@@ -1928,7 +1927,6 @@ IMGUI_IMPL_API void ImGui_ImplAx_RenderDrawData(ImDrawData* draw_data)`
`1928`	`1927`	`}`
`1929`	`1928`	`}`
`1930`	`1929`	`}`
`1931`		`- ibuffer_offset += pcmd->ElemCount;`
`1932`	`1930`	`}`
`1933`	`1931`	`}`
`1934`	`1932`
Original file line number	Diff line number	Diff line change
`@@ -609,7 +609,6 @@ IMGUI_IMPL_API void ImGui_ImplAx_RenderDrawData(ImDrawData* draw_data)`
`609`	`609`	`for (int n = 0; n < draw_data->CmdListsCount; n++)`
`610`	`610`	`{`
`611`	`611`	`const ImDrawList* cmd_list = draw_data->CmdLists[n];`
`612`		`- size_t ibuffer_offset = 0;`
`613`	`612`
`614`	`613`	`// Upload vertex/index buffers`
`615`	`614`	`const auto vsize = cmd_list->VtxBuffer.Size * sizeof(ImDrawVert);`
`@@ -681,7 +680,7 @@ IMGUI_IMPL_API void ImGui_ImplAx_RenderDrawData(ImDrawData* draw_data)`
`681`	`680`	`cmd->setVertexBuffer(vbuffer);`
`682`	`681`	`cmd->setDrawType(CustomCommand::DrawType::ELEMENT);`
`683`	`682`	`cmd->setPrimitiveType(PrimitiveType::TRIANGLE);`
`684`		`- cmd->setIndexDrawInfo(ibuffer_offset, pcmd->ElemCount);`
	`683`	`+ cmd->setIndexDrawInfo(pcmd->IdxOffset, pcmd->ElemCount);`
`685`	`684`	`renderer->addCommand(cmd.get());`
`686`	`685`	`}`
`687`	`686`	`else`
`@@ -697,7 +696,6 @@ IMGUI_IMPL_API void ImGui_ImplAx_RenderDrawData(ImDrawData* draw_data)`
`697`	`696`	`}`
`698`	`697`	`}`
`699`	`698`	`}`
`700`		`- ibuffer_offset += pcmd->ElemCount;`
`701`	`699`	`}`
`702`	`700`	`}`
`703`	`701`