Update ImGui.NET from 1.89.7.1 to 1.89.9.3 (#1758)

* Update ImGui.NET from 1.89.7.1 to 1.89.9.3 * Fix ImGuiVulkan build
dotnet · Nov 8, 2023 · 211a7e8 · 211a7e8
1 parent da7cae5
commit 211a7e8
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/src/Lab/Experiments/ImGuiVulkan/ImGuiVulkan.csproj b/src/Lab/Experiments/ImGuiVulkan/ImGuiVulkan.csproj
@@ -13,7 +13,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ImGui.NET" Version="1.89.7.1" />
+		<PackageReference Include="ImGui.NET" Version="1.89.9.3" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Lab/Experiments/ImGuiVulkan/Lib/ImGuiController.cs b/src/Lab/Experiments/ImGuiVulkan/Lib/ImGuiController.cs
@@ -830,7 +830,7 @@ private unsafe void RenderImDrawData(in ImDrawDataPtr drawDataPtr, in CommandBuf
                 }
                 for (int n = 0; n < drawData.CmdListsCount; n++)
                 {
-                    ImDrawList* cmd_list = drawData.CmdLists[n];
+                    ImDrawList* cmd_list = drawDataPtr.CmdLists[n];
                     Unsafe.CopyBlock(vtx_dst, cmd_list->VtxBuffer.Data.ToPointer(), (uint)cmd_list->VtxBuffer.Size * (uint)sizeof(ImDrawVert));
                     Unsafe.CopyBlock(idx_dst, cmd_list->IdxBuffer.Data.ToPointer(), (uint)cmd_list->IdxBuffer.Size * (uint)sizeof(ushort));
                     vtx_dst += cmd_list->VtxBuffer.Size;
@@ -896,7 +896,7 @@ private unsafe void RenderImDrawData(in ImDrawDataPtr drawDataPtr, in CommandBuf
             int indexOffset = 0;
             for (int n = 0; n < drawData.CmdListsCount; n++)
             {
-                ref ImDrawList* cmd_list = ref drawData.CmdLists[n];
+                ImDrawList* cmd_list = drawDataPtr.CmdLists[n];
                 for (int cmd_i = 0; cmd_i < cmd_list->CmdBuffer.Size; cmd_i++)
                 {
                     ref ImDrawCmd pcmd = ref cmd_list->CmdBuffer.Ref<ImDrawCmd>(cmd_i);

diff --git a/src/OpenGL/Extensions/Silk.NET.OpenGL.Extensions.ImGui/ImGuiController.cs b/src/OpenGL/Extensions/Silk.NET.OpenGL.Extensions.ImGui/ImGuiController.cs
@@ -391,7 +391,7 @@ private unsafe void RenderImDrawData(ImDrawDataPtr drawDataPtr)
             // Render command lists
             for (int n = 0; n < drawDataPtr.CmdListsCount; n++)
             {
-                ImDrawListPtr cmdListPtr = drawDataPtr.CmdListsRange[n];
+                ImDrawListPtr cmdListPtr = drawDataPtr.CmdLists[n];
 
                 // Upload vertex/index buffers
 

diff --git a/...penGL/Extensions/Silk.NET.OpenGL.Extensions.ImGui/Silk.NET.OpenGL.Extensions.ImGui.csproj b/...penGL/Extensions/Silk.NET.OpenGL.Extensions.ImGui/Silk.NET.OpenGL.Extensions.ImGui.csproj
@@ -19,7 +19,7 @@
         <ProjectReference Include="..\..\..\Input\Silk.NET.Input.Common\Silk.NET.Input.Common.csproj" />
         <ProjectReference Include="..\..\Silk.NET.OpenGL\Silk.NET.OpenGL.csproj" />
         <ProjectReference Include="..\..\..\Windowing\Silk.NET.Windowing.Common\Silk.NET.Windowing.Common.csproj" />
-        <PackageReference Include="ImGui.NET" Version="1.89.7.1" />
+        <PackageReference Include="ImGui.NET" Version="1.89.9.3" />
     </ItemGroup>
 
     <Import Project="..\..\..\..\build\props\common.props" />

diff --git a/...ns/Silk.NET.OpenGL.Legacy.Extensions.ImGui/Silk.NET.OpenGL.Legacy.Extensions.ImGui.csproj b/...ns/Silk.NET.OpenGL.Legacy.Extensions.ImGui/Silk.NET.OpenGL.Legacy.Extensions.ImGui.csproj
@@ -24,7 +24,7 @@
         <ProjectReference Include="..\..\..\Input\Silk.NET.Input.Common\Silk.NET.Input.Common.csproj" />
         <ProjectReference Include="..\..\Silk.NET.OpenGL.Legacy\Silk.NET.OpenGL.Legacy.csproj" />
         <ProjectReference Include="..\..\..\Windowing\Silk.NET.Windowing.Common\Silk.NET.Windowing.Common.csproj" />
-        <PackageReference Include="ImGui.NET" Version="1.89.7.1" />
+        <PackageReference Include="ImGui.NET" Version="1.89.9.3" />
     </ItemGroup>
 
     <Import Project="..\..\..\..\build\props\common.props" />

diff --git a/...L/Extensions/Silk.NET.OpenGLES.Extensions.ImGui/Silk.NET.OpenGLES.Extensions.ImGui.csproj b/...L/Extensions/Silk.NET.OpenGLES.Extensions.ImGui/Silk.NET.OpenGLES.Extensions.ImGui.csproj
@@ -23,7 +23,7 @@
         <ProjectReference Include="..\..\..\Input\Silk.NET.Input.Common\Silk.NET.Input.Common.csproj" />
         <ProjectReference Include="..\..\Silk.NET.OpenGLES\Silk.NET.OpenGLES.csproj" />
         <ProjectReference Include="..\..\..\Windowing\Silk.NET.Windowing.Common\Silk.NET.Windowing.Common.csproj" />
-        <PackageReference Include="ImGui.NET" Version="1.89.7.1" />
+        <PackageReference Include="ImGui.NET" Version="1.89.9.3" />
     </ItemGroup>
 
     <Import Project="..\..\..\..\build\props\common.props" />